From eda64add262cf2c90f7fb3ef2b60694991e2ea4e Mon Sep 17 00:00:00 2001 From: aNiassy Date: Thu, 5 Jan 2012 13:39:14 +0000 Subject: [PATCH] [-] BO : added the "mailMethod" variable --- admin-dev/ajax_send_mail_test.php | 11 +++++------ js/sendMailTest.js | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin-dev/ajax_send_mail_test.php b/admin-dev/ajax_send_mail_test.php index 8f325819b..b247e22d0 100644 --- a/admin-dev/ajax_send_mail_test.php +++ b/admin-dev/ajax_send_mail_test.php @@ -30,6 +30,7 @@ include_once(dirname(__FILE__).'/../config/config.inc.php'); /* Getting cookie or logout */ require_once(dirname(__FILE__).'/init.php'); +$smtpChecked = (trim($_GET['mailMethod']) == 'smtp'); $smtpServer = $_POST['smtpSrv']; $content = urldecode($_POST['testMsg']); $subject = urldecode($_POST['testSubject']); @@ -40,10 +41,8 @@ $smtpLogin = $_POST['smtpLogin']; $smtpPassword = urldecode($_POST['smtpPassword']); $smtpPort = $_POST['smtpPort']; $smtpEncryption = $_POST['smtpEnc']; -if (isset($_POST['mailMethod'])) -{ - $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); -} + +$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); + diff --git a/js/sendMailTest.js b/js/sendMailTest.js index 57c92be72..a839b55ad 100644 --- a/js/sendMailTest.js +++ b/js/sendMailTest.js @@ -53,6 +53,7 @@ function verifyMail(testMsg, testSubject) type : "POST", data: { + "mailMethod" : (($("input[name=PS_MAIL_METHOD]:checked").val() == 2) ? "smtp" : "native"), "smtpSrv" : $("input[name=PS_MAIL_SERVER]").val(), "testEmail" : $("#testEmail").val(), "smtpLogin" : $("input[name=PS_MAIL_USER]").val(),