diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-30 13:53:49 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-30 13:53:49 +0200 |
| commit | 77adaee6457c3e17d0f0b32c74da4cdbfce60164 (patch) | |
| tree | fc793d2965d0a9541a183f620a63dae3ea2bfb0b /settings | |
| parent | 0a23ac18bc1f74cea98eed2c37aa03c99fd957f7 (diff) | |
| download | nextcloud-server-77adaee6457c3e17d0f0b32c74da4cdbfce60164.tar.gz nextcloud-server-77adaee6457c3e17d0f0b32c74da4cdbfce60164.zip | |
enable user to inform recipients about a shared file by mail
Diffstat (limited to 'settings')
| -rwxr-xr-x | settings/admin.php | 5 | ||||
| -rw-r--r-- | settings/templates/admin.php | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/settings/admin.php b/settings/admin.php index 869729a9e41..38b77a615dd 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..22cf946803e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -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('style="display:none"');?>> + <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); }?> |