Merged in bugfix/HOR-2944 (pull request #5617)
HOR-2944 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
@@ -473,13 +473,15 @@ class EmailServer
|
|||||||
$arrayResult[$arrayMailTestName[1]] = $this->testConnectionByStep($arrayDataAux);
|
$arrayResult[$arrayMailTestName[1]] = $this->testConnectionByStep($arrayDataAux);
|
||||||
$arrayResult[$arrayMailTestName[1]]["title"] = \G::LoadTranslation("ID_EMAIL_SERVER_TEST_CONNECTION_VERIFYING_MAIL");
|
$arrayResult[$arrayMailTestName[1]]["title"] = \G::LoadTranslation("ID_EMAIL_SERVER_TEST_CONNECTION_VERIFYING_MAIL");
|
||||||
|
|
||||||
if ((int)($arrayData["MESS_TRY_SEND_INMEDIATLY"]) == 1) {
|
if ((int)($arrayData["MESS_TRY_SEND_INMEDIATLY"]) == 1 && $arrayData['MAIL_TO'] != '') {
|
||||||
$arrayResult[$arrayMailTestName[2]] = $this->testConnectionByStep($arrayData);
|
$arrayResult[$arrayMailTestName[2]] = $this->testConnectionByStep($arrayData);
|
||||||
$arrayResult[$arrayMailTestName[2]]["title"] = \G::LoadTranslation("ID_EMAIL_SERVER_TEST_CONNECTION_SENDING_EMAIL", array($arrayData["MAIL_TO"]));
|
$arrayResult[$arrayMailTestName[2]]["title"] = \G::LoadTranslation("ID_EMAIL_SERVER_TEST_CONNECTION_SENDING_EMAIL", array($arrayData["MAIL_TO"]));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "PHPMAILER":
|
case "PHPMAILER":
|
||||||
for ($step = 1; $step <= 5; $step++) {
|
$numSteps = ($arrayData['MAIL_TO'] != '') ? count($arrayPhpMailerTestName) :
|
||||||
|
count($arrayPhpMailerTestName) - 1;
|
||||||
|
for ($step = 1; $step <= $numSteps; $step++) {
|
||||||
$arrayResult[$arrayPhpMailerTestName[$step]] = $this->testConnectionByStep($arrayData, $step);
|
$arrayResult[$arrayPhpMailerTestName[$step]] = $this->testConnectionByStep($arrayData, $step);
|
||||||
|
|
||||||
switch ($step) {
|
switch ($step) {
|
||||||
|
|||||||
Reference in New Issue
Block a user