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

[-] BO : added the "mailMethod" variable

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12186 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aNiassy committed 2012-01-05 13:39:14 +00:00
1 parent 76bc20a9ab
commit 402678e118
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/ajax_send_mail_test.php
+5 -6
View File
@@ -30,6 +30,7 @@ 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($_GET['mailMethod']) == 'smtp');
$smtpServer = $_POST['smtpSrv']; $smtpServer = $_POST['smtpSrv'];
$content = urldecode($_POST['testMsg']); $content = urldecode($_POST['testMsg']);
$subject = urldecode($_POST['testSubject']); $subject = urldecode($_POST['testSubject']);
@@ -40,10 +41,8 @@ $smtpLogin = $_POST['smtpLogin'];
$smtpPassword = urldecode($_POST['smtpPassword']); $smtpPassword = urldecode($_POST['smtpPassword']);
$smtpPort = $_POST['smtpPort']; $smtpPort = $_POST['smtpPort'];
$smtpEncryption = $_POST['smtpEnc']; $smtpEncryption = $_POST['smtpEnc'];
if (isset($_POST['mailMethod']))
{ $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));
$smtpChecked = (trim($_POST['mailMethod']) == 'smtp'); 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);
}
js/sendMailTest.js
+1
View File
@@ -53,6 +53,7 @@ function verifyMail(testMsg, testSubject)
type : "POST", type : "POST",
data: data:
{ {
"mailMethod" : (($("input[name=PS_MAIL_METHOD]:checked").val() == 2) ? "smtp" : "native"),
"smtpSrv" : $("input[name=PS_MAIL_SERVER]").val(), "smtpSrv" : $("input[name=PS_MAIL_SERVER]").val(),
"testEmail" : $("#testEmail").val(), "testEmail" : $("#testEmail").val(),
"smtpLogin" : $("input[name=PS_MAIL_USER]").val(), "smtpLogin" : $("input[name=PS_MAIL_USER]").val(),