Hide QMail when not selected and hide sendmail when not available on the server

Fix #7559

diff --git a/settings/admin.php b/settings/admin.php
index 42477bfc1ca43506df1fc30661331ca560601c09..47028a701db66343ad591c7109a0c2b44f856e0c 100755 (executable)
--- 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 487da036e74c5dde4780b49d8d31c7e474fe0675..9f5f9f54ba332d3f3f21ba23a3b45fedacfc95bc 100644 (file)
--- 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';
+}
 
 ?>