diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-09 14:05:52 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-09 14:05:52 +0100 |
| commit | bfcd5a3802030ca97836aca1e658aec434162922 (patch) | |
| tree | 201c6b78cc22e61f7eb02ee3cffb5aa83068be3b /apps/files | |
| parent | f53f25eafe2e7cad28eabccd7ca5acebab488170 (diff) | |
| parent | 539c0aeb04f3210654972548f51f8cf61fce49ae (diff) | |
| download | nextcloud-server-bfcd5a3802030ca97836aca1e658aec434162922.tar.gz nextcloud-server-bfcd5a3802030ca97836aca1e658aec434162922.zip | |
Merge pull request #11214 from owncloud/issue/10836
Add an option to disallow sending sharing emails to non-owncloud users
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/index.php | 1 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index 6635d70d008..929bc5e79da 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -120,6 +120,7 @@ $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', 'no')); +$tmpl->assign("mailPublicNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_public_notification', 'no')); $tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes')); $tmpl->assign("encryptionInitStatus", $encryptionInitStatus); $tmpl->assign('appNavigation', $nav); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index b52effb1e78..222a996aae3 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -15,5 +15,6 @@ <input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" /> <input type="hidden" name="encryptedInitStatus" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" /> <input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" /> +<input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" /> <input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" /> <?php endif; |