diff options
| author | kondou <kondou@ts.unde.re> | 2014-03-21 20:23:31 +0100 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2014-03-21 20:23:31 +0100 |
| commit | dda7129a243c7ebdbcdf9c2b5dbf167542402bc2 (patch) | |
| tree | d03dff6783ebabb6273a19ed59a6b9b3731e923e /settings/templates/admin.php | |
| parent | 556c6eca2397eaa03c4503822d647c8b6cb5e70e (diff) | |
| parent | 4be0b3f6cce540282c6745d6bf3d2a0fa4ac65b4 (diff) | |
| download | nextcloud-server-dda7129a243c7ebdbcdf9c2b5dbf167542402bc2.tar.gz nextcloud-server-dda7129a243c7ebdbcdf9c2b5dbf167542402bc2.zip | |
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
Diffstat (limited to 'settings/templates/admin.php')
| -rw-r--r-- | settings/templates/admin.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index bb402f9f78e..9092d2833fd 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -26,11 +26,15 @@ $mail_smtpsecure = array( ); $mail_smtpmode = array( - 'sendmail', - 'smtp', - 'qmail', 'php', + 'smtp', ); +if ($_['sendmail_is_available']) { + $mail_smtpmode[] = 'sendmail'; +} +if ($_['mail_smtpmode'] == 'qmail') { + $mail_smtpmode[] = 'qmail'; +} ?> @@ -216,7 +220,6 @@ if (!$_['internetconnectionworking']) { <em><?php p($l->t('Allow users to share items to the public with links')); ?></em> </td> </tr> - <?php if (!\OCP\App::isEnabled('files_encryption')) { ?> <tr> <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>> <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" @@ -225,7 +228,6 @@ if (!$_['internetconnectionworking']) { <em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em> </td> </tr> - <?php } ?> <tr> <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" |