Merge pull request #8840 from owncloud/share_settings
by default don't show option to send mail notifications for shares
This commit is contained in:
commit
cfc1d5623e
|
@ -118,7 +118,7 @@ $tmpl = new OCP\Template('files', 'index', 'user');
|
||||||
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
|
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
|
||||||
$tmpl->assign('isPublic', false);
|
$tmpl->assign('isPublic', false);
|
||||||
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
|
$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("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
|
||||||
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
|
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
|
||||||
$tmpl->assign('appNavigation', $nav);
|
$tmpl->assign('appNavigation', $nav);
|
||||||
|
|
|
@ -82,7 +82,7 @@ $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links
|
||||||
$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
|
$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
|
||||||
$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', '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('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('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
|
||||||
$tmpl->assign('forms', array());
|
$tmpl->assign('forms', array());
|
||||||
foreach($forms as $form) {
|
foreach($forms as $form) {
|
||||||
|
|
|
@ -291,8 +291,7 @@ if (!$_['internetconnectionworking']) {
|
||||||
<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
|
<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
|
||||||
<input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
|
<input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
|
||||||
value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
|
value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
|
||||||
<label for="allowMailNotification"><?php p($l->t('Allow mail notification'));?></label><br/>
|
<label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
|
||||||
<em><?php p($l->t('Allow users to send mail notification for shared files')); ?></em>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
Loading…
Reference in New Issue