diff options
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 42477bfc1ca..47028a701db 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -20,6 +20,11 @@ $htaccessworking=OC_Util::isHtAccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3; +// Should we display sendmail as an option? +if (ini_get('sendmail_path') || file_exists('/usr/sbin/sendmail') || file_exists('/var/qmail/bin/sendmail')) { + $tmpl->assign('sendmail_is_available', true); +} + $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 )); $tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' )); $tmpl->assign('mail_from_address', OC_Config::getValue( "mail_from_address", '' )); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 487da036e74..9f5f9f54ba3 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'; +} ?> |