diff options
Diffstat (limited to 'settings')
| -rwxr-xr-x | settings/admin.php | 5 | ||||
| -rw-r--r-- | settings/templates/admin.php | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/settings/admin.php b/settings/admin.php index dd36790907d..120f15bec19 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -33,16 +33,17 @@ $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enable // Check if connected using HTTPS if (OC_Request::serverProtocol() === 'https') { - $connectedHTTPS = true; + $connectedHTTPS = true; } else { $connectedHTTPS = false; -} +} $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS); $tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); $tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes')); $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); +$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes')); $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global')); $tmpl->assign('forms', array()); foreach($forms as $form) { diff --git a/settings/templates/admin.php b/settings/templates/admin.php index e54586b80df..72e93e78dac 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -128,7 +128,7 @@ if (!$_['internetconnectionworking']) { </td> </tr> <tr> - <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>> + <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> <input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/> @@ -137,7 +137,7 @@ if (!$_['internetconnectionworking']) { </tr> <?php if (!\OCP\App::isEnabled('files_encryption')) { ?> <tr> - <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>> + <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>> <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/> @@ -146,7 +146,7 @@ if (!$_['internetconnectionworking']) { </tr> <?php } ?> <tr> - <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>> + <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/> @@ -154,7 +154,7 @@ if (!$_['internetconnectionworking']) { </td> </tr> <tr> - <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>> + <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> /> <label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/> @@ -163,6 +163,14 @@ if (!$_['internetconnectionworking']) { <label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/> </td> </tr> + <tr> + <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> + <input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification" + value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> /> + <label for="allowMailNotification"><?php p($l->t('Allow mail notification'));?></label><br/> + <em><?php p($l->t('Allow user to send mail notification for shared files')); ?></em> + </td> + </tr> </table> </fieldset> @@ -223,7 +231,7 @@ endfor;?> </td> <td> <?php if(is_int($entry->time)){ - p(OC_Util::formatDate($entry->time)); + p(OC_Util::formatDate($entry->time)); } else { p($entry->time); }?> |