wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix #7559
This commit is contained in:
Joas Schilling 2014-03-05 14:53:20 +01:00
parent 36d7c0b6a7
commit 0285d5b6e2
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
settings/admin.php
View file

@ -20,6 +20,11 @@ $htaccessworking=OC_Util::isHtAccessWorking();
$entries=OC_Log_Owncloud::getEntries(3); $entries=OC_Log_Owncloud::getEntries(3);
$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 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('loglevel', OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' )); $tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' ));
$tmpl->assign('mail_from_address', OC_Config::getValue( "mail_from_address", '' )); $tmpl->assign('mail_from_address', OC_Config::getValue( "mail_from_address", '' ));

10
settings/templates/admin.php
View file

@ -26,11 +26,15 @@ $mail_smtpsecure = array(
); );
$mail_smtpmode = array( $mail_smtpmode = array(
'sendmail',
'smtp',
'qmail',
'php', 'php',
'smtp',
); );
if ($_['sendmail_is_available']) {
$mail_smtpmode[] = 'sendmail';
}
if ($_['mail_smtpmode'] == 'qmail') {
$mail_smtpmode[] = 'qmail';
}
?> ?>