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 /settings | |
| 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 'settings')
| -rw-r--r-- | settings/admin.php | 1 | ||||
| -rw-r--r-- | settings/templates/admin.php | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php index bb5f47b36a9..56484f25b26 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -66,6 +66,7 @@ $template->assign('allowLinks', $appConfig->getValue('core', 'shareapi_allow_lin $template->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); $template->assign('allowPublicUpload', $appConfig->getValue('core', 'shareapi_allow_public_upload', 'yes')); $template->assign('allowResharing', $appConfig->getValue('core', 'shareapi_allow_resharing', 'yes')); +$template->assign('allowPublicMailNotification', $appConfig->getValue('core', 'shareapi_allow_public_notification', 'no')); $template->assign('allowMailNotification', $appConfig->getValue('core', 'shareapi_allow_mail_notification', 'no')); $template->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly()); $databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a2380a92650..d04351c2d6c 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -271,10 +271,15 @@ if ($_['suggestedOverwriteWebroot']) { <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> /> <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/> + <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/> + <input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification" + value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> /> + <label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/> + <input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> /> <label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/> @@ -302,7 +307,7 @@ if ($_['suggestedOverwriteWebroot']) { <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('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 users to send mail notification for shared files'));?></label><br/> + <label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files to other users'));?></label><br/> </p> <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>"> <input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" |