From f7f9c28b5388f97fd391f1e156c4ac2e97c04f15 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 1 Aug 2024 10:42:41 +0200 Subject: [PATCH] don't use iDebug = 6 for getting SMTP logs because of different error handling --- Application/Controller/Admin/MailConfigCheck.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Application/Controller/Admin/MailConfigCheck.php b/Application/Controller/Admin/MailConfigCheck.php index 253004d..4ea18fc 100644 --- a/Application/Controller/Admin/MailConfigCheck.php +++ b/Application/Controller/Admin/MailConfigCheck.php @@ -74,8 +74,7 @@ class MailConfigCheck extends AdminDetailsController { try { $shop = Registry::getConfig()->getActiveShop(); - $config = Registry::getConfig(); - + $mail = oxNew(Email::class); $mail->setRecipient( trim(Registry::getRequest()->getRequestEscapedParameter('recipient')) ?: $this->testMailAddress @@ -83,8 +82,7 @@ class MailConfigCheck extends AdminDetailsController $mail->setBody('.'); $mail->setFrom($shop->getFieldData('oxowneremail')); - $currentDebug = $config->getConfigParam('iDebug'); - $config->setConfigParam('iDebug', 6); + $mail->set("SMTPDebug", true); // don't set via iDebug = 6 because different handling $mail->setSmtp(); ob_start(); @@ -95,8 +93,6 @@ class MailConfigCheck extends AdminDetailsController $re = '/(^|\)(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\s)/m'; $subst = "$1"; $communication = preg_replace($re, $subst, $communication); - - $config->setConfigParam('iDebug', $currentDebug); $this->addTplParam('mailer', $mail->getMailer()); $this->addTplParam('communication', $communication); } catch (Exception $e) {