diff options
author | Vincent Petry <pvince81@owncloud.com> | 2014-03-12 21:32:38 +0400 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-03-12 21:32:38 +0400 |
commit | 5fcfb2ef84d21691545d946fd2f244889dedab0a (patch) | |
tree | de9dfa3e1be305f6f0f57cbd6053c86b7e0474b2 /settings | |
parent | b92be2ef1cb59f251a6d48953f4cb8d5e0eb734f (diff) | |
parent | efbca04ab42112e617b81153c68ae51f29241663 (diff) |
Merge pull request #7564 from owncloud/issue/7559
Hide QMail when not selected and hide SendMail when not available on the server
Diffstat (limited to 'settings')
-rwxr-xr-x | settings/admin.php | 19 | ||||
-rw-r--r-- | settings/templates/admin.php | 10 |
2 files changed, 26 insertions, 3 deletions
diff --git a/settings/admin.php b/settings/admin.php index 42477bfc1ca..80b038d2ef6 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 (findBinaryPath('sendmailsendmail')) { + $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", '' )); @@ -61,3 +66,17 @@ foreach($forms as $form) { $tmpl->append('forms', $form); } $tmpl->printPage(); + +/** + * Try to find a programm + * + * @param string $program + * @return null|string + */ +function findBinaryPath($program) { + exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode); + if ($returnCode === 0 && count($output) > 0) { + return escapeshellcmd($output[0]); + } + return null; +} diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 8f786ba76ef..5ed42eab0ff 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'; +} ?> |