mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-22 05:31:58 +02:00
Code Issues Releases Wiki Activity

Trim SMTP username/password during save and skip the rest of the SMTP test if connection fails.

Browse Source
This commit is contained in:
Cameron 2018-12-26 14:13:57 -08:00
parent 7abf393117
commit e49c53492e
1 changed files with 7 additions and 3 deletions

10
e107_admin/mailout.php

@ -1014,6 +1014,10 @@ class mailout_main_ui extends e_admin_ui
if(!$smtp->connect($pref['smtp_server'], $port))
{
$mes->addError('Connect failed using '.$pref['smtp_server'] .' on port '.$port);
$content = ob_get_contents();
ob_end_clean();
print_a($content);
return null;
}
//Say hello
if(!$smtp->hello(gethostname()))
@ -1474,9 +1478,9 @@ class mailout_main_ui extends e_admin_ui
}
$temp['bulkmailer'] = $tp->filter($_POST['bulkmailer']);
$temp['smtp_server'] = $tp->toDB($_POST['smtp_server']);
$temp['smtp_username'] = $tp->toDB($_POST['smtp_username']);
$temp['smtp_password'] = $tp->toDB($_POST['smtp_password']);
$temp['smtp_server'] = $tp->toDB(trim($_POST['smtp_server']));
$temp['smtp_username'] = $tp->toDB(trim($_POST['smtp_username']));
$temp['smtp_password'] = $tp->toDB(trim($_POST['smtp_password']));
$temp['smtp_port'] = intval($_POST['smtp_port']);
$smtp_opts = array();