dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : #PSTEST-316 : Bug fixed : Warnings are not displayed anymore after a wrong configuration mail

Browse Source
This commit is contained in:
mBertholino
2012-01-04 15:41:40 +00:00
parent da65db4318
commit d5d34ce565
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/ajax_send_mail_test.php
+6 -3
View File
@@ -30,7 +30,6 @@ include_once(dirname(__FILE__).'/../config/config.inc.php');
/* Getting cookie or logout */ /* Getting cookie or logout */
require_once(dirname(__FILE__).'/init.php'); require_once(dirname(__FILE__).'/init.php');
$smtpChecked = (trim($_POST['mailMethod']) == 'smtp');
$smtpServer = $_POST['smtpSrv']; $smtpServer = $_POST['smtpSrv'];
$content = $_POST['testMsg']; $content = $_POST['testMsg'];
$subject = $_POST['testSubject']; $subject = $_POST['testSubject'];
@@ -41,6 +40,10 @@ $smtpLogin = $_POST['smtpLogin'];
$smtpPassword = $_POST['smtpPassword']; $smtpPassword = $_POST['smtpPassword'];
$smtpPort = $_POST['smtpPort']; $smtpPort = $_POST['smtpPort'];
$smtpEncryption = $_POST['smtpEnc']; $smtpEncryption = $_POST['smtpEnc'];
$result = Mail::sendMailTest(Tools::htmlentitiesUTF8($smtpChecked), Tools::htmlentitiesUTF8($smtpServer), Tools::htmlentitiesUTF8($content), Tools::htmlentitiesUTF8($subject), Tools::htmlentitiesUTF8($type), Tools::htmlentitiesUTF8($to), Tools::htmlentitiesUTF8($from), Tools::htmlentitiesUTF8($smtpLogin), Tools::htmlentitiesUTF8($smtpPassword), Tools::htmlentitiesUTF8($smtpPort), Tools::htmlentitiesUTF8($smtpEncryption)); if (isset($_POST['mailMethod']))
die($result === true ? 'ok' : $result); {
$smtpChecked = (trim($_POST['mailMethod']) == 'smtp');
$result = Mail::sendMailTest(Tools::htmlentitiesUTF8($smtpChecked), Tools::htmlentitiesUTF8($smtpServer), Tools::htmlentitiesUTF8($content), Tools::htmlentitiesUTF8($subject), Tools::htmlentitiesUTF8($type), Tools::htmlentitiesUTF8($to), Tools::htmlentitiesUTF8($from), Tools::htmlentitiesUTF8($smtpLogin), Tools::htmlentitiesUTF8($smtpPassword), Tools::htmlentitiesUTF8($smtpPort), Tools::htmlentitiesUTF8($smtpEncryption));
die($result === true ? 'ok' : $result);
}