diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-03 16:42:44 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-03 16:42:44 +0200 |
| commit | cfc1d5623ed7d51da81b785f0ea871d0dc7c73a8 (patch) | |
| tree | 3c4a7f54b58b2a3c1b8a8bbe8a7f215de05851bb | |
| parent | 714b04d06c34dfa2a8206ed8cdab448a5978a6d7 (diff) | |
| parent | 5097bcc16d3dea2c4aa66699bbbb00b1734a2967 (diff) | |
| download | nextcloud-server-cfc1d5623ed7d51da81b785f0ea871d0dc7c73a8.tar.gz nextcloud-server-cfc1d5623ed7d51da81b785f0ea871d0dc7c73a8.zip | |
Merge pull request #8840 from owncloud/share_settings
by default don't show option to send mail notifications for shares
| -rw-r--r-- | apps/files/index.php | 2 | ||||
| -rwxr-xr-x | settings/admin.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin.php | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index ba46866ab19..bc74e17aee1 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -118,7 +118,7 @@ $tmpl = new OCP\Template('files', 'index', 'user'); $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']); $tmpl->assign('isPublic', false); $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles()); -$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes')); +$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'no')); $tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes')); $tmpl->assign("encryptionInitStatus", $encryptionInitStatus); $tmpl->assign('appNavigation', $nav); diff --git a/settings/admin.php b/settings/admin.php index fc76d3d74ab..d2be04fcd1d 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -82,7 +82,7 @@ $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links $tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); $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('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no')); $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 c8ca031ec98..8ed22e98b52 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -291,8 +291,7 @@ if (!$_['internetconnectionworking']) { <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 users to send mail notification for shared files')); ?></em> + <label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/> </td> </tr> <tr> |