diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 2fb645db6a9..ef6307ae532 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -223,13 +223,13 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') print ''.$langs->trans("MAIN_MAIL_SENDMODE").''; $listofmethods=array(); $listofmethods['mail']='PHP mail function'; - if ($conf->global->MAIN_FEATURES_LEVEL > 0) $listofmethods['smtps']='SMTPS library ('.$langs->trans("Experimental").')'; + $listofmethods['smtps']='SMTP/SMTPS socket library'; print $html->select_array('MAIN_MAIL_SENDMODE',$listofmethods,$conf->global->MAIN_MAIL_SENDMODE); print ''; // Server $var=!$var; - if ($linuxlike) + if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE != 'smtps') { print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").''; } @@ -240,7 +240,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Port $var=!$var; - if ($linuxlike) + if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE != 'smtps') { print ''.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").''; }