diff --git a/Application/Controller/Admin/MailConfigCheck.php b/Application/Controller/Admin/MailConfigCheck.php index e481b8a..f71df29 100644 --- a/Application/Controller/Admin/MailConfigCheck.php +++ b/Application/Controller/Admin/MailConfigCheck.php @@ -32,6 +32,7 @@ class MailConfigCheck extends AdminDetailsController { $this->checkDataAreSet(); $this->addTplParam('shop', Registry::getConfig()->getActiveShop()); + $this->addTplParam('recipient', $this->testMailAddress); return parent::render(); } @@ -73,13 +74,31 @@ class MailConfigCheck extends AdminDetailsController { try { $shop = Registry::getConfig()->getActiveShop(); + $config = Registry::getConfig(); $mail = oxNew(Email::class); - $mail->setRecipient($this->testMailAddress); + $mail->setRecipient( + trim(Registry::getRequest()->getRequestEscapedParameter('recipient')) ?: $this->testMailAddress + ); $mail->setBody('.'); $mail->setFrom($shop->getFieldData('oxowneremail')); + + $currentDebug = $config->getConfigParam('iDebug'); + $config->setConfigParam('iDebug', 6); + $mail->setSmtp(); + + ob_start(); $mail->send(); + $communication = ob_get_contents(); + ob_end_clean(); + + $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) { Registry::getUtilsView()->addErrorToDisplay($e); } diff --git a/Application/views/de/translations.php b/Application/views/de/translations.php index e6569ce..4e6e59d 100644 --- a/Application/views/de/translations.php +++ b/Application/views/de/translations.php @@ -33,7 +33,7 @@ return [ 'D3_MAILCHECKER_CFGCHECK_SHOPSEND_PHPMAILER' => 'PhpMailer', 'D3_MAILCHECKER_CFGCHECK_SHOPSEND_PHPMAILER_DESC' => 'Der Versand über den PhpMailer sollte dringend vermieden werden, da solche Mails meist als Spam eingestuft werden. Wenn Sie alle SMTP-Daten eingegeben haben, prüfen Sie mögliche Anmeldeprobleme im SMTP-Check.', 'D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP' => 'SMTP', - 'D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP_DESC' => 'Alles in bester Ordnung. Bitte prüfen Sie noch die nötigen SPF-Einträge für Ihre Domain(s).', + 'D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP_DESC' => 'Alles in bester Ordnung. Bitte prüfen Sie noch die nötigen Einstellungen im Tab "Authorisierung Check" für Ihre Domain(s).', 'D3_MAILCHECKER_CFGCHECK_STARTCHECK' => 'Konfiguration testen', 'D3_MAILCHECKER_SMTPCHECK_DESC1' => 'Wenn trotz passend eingegebenen Daten kein Mailversand über SMTP erfolgt, kann hier der Anmeldeversuch am Postausgangsserver nachvollzogen werden. Eventuell auftretende Meldungen werden gezeigt.', diff --git a/Application/views/en/translations.php b/Application/views/en/translations.php index df15e2b..c505fef 100644 --- a/Application/views/en/translations.php +++ b/Application/views/en/translations.php @@ -28,7 +28,7 @@ return [ "D3_MAILCHECKER_CFGCHECK_SHOPSEND_PHPMAILER" => "PhpMailer", "D3_MAILCHECKER_CFGCHECK_SHOPSEND_PHPMAILER_DESC" => "Sending via PhpMailer should be avoided as such emails are usually classified as spam. Once you have entered all SMTP data, check possible login problems in the SMTP check.", "D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP" => "SMTP", - "D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP_DESC" => "Everything is fine. Please check the necessary SPF entries for your domain(s).", + "D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP_DESC" => "Everything is fine. Please check the necessary settings for your domain(s) in the \"Authentication Check\" tab .", "D3_MAILCHECKER_CFGCHECK_STARTCHECK" => "Test configuration", "D3_MAILCHECKER_SMTPCHECK_DESC1" => "If no mail is sent via SMTP despite the appropriate data entered, the attempt to log in to the outgoing mail server can be repeated here. Any messages that may occur are shown.", "D3_MAILCHECKER_SMTPCHECK_DESC2" => "New connections can also be tested here in advance.", diff --git a/views/smarty/admin/mailconfigcheck.tpl b/views/smarty/admin/mailconfigcheck.tpl index 3accf55..a81790f 100644 --- a/views/smarty/admin/mailconfigcheck.tpl +++ b/views/smarty/admin/mailconfigcheck.tpl @@ -5,6 +5,14 @@ span.btn { cursor: default; } + + .communicationoutput { + background-color: black; + color: white; + max-height: 500px; + overflow: auto; + margin-top: 30px; + } [{assign var="readonly" value="readonly disabled"}] @@ -52,11 +60,16 @@ [{oxmultilang ident="D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP_DESC"}] [{/if}] + +
+ [{$communication}] +
[{else}]
[{$oViewConf->getHiddenSid()}] +
[{/if}] diff --git a/views/twig/admin/mailConfigCheck.html.twig b/views/twig/admin/mailConfigCheck.html.twig index ab216f4..369f2d6 100644 --- a/views/twig/admin/mailConfigCheck.html.twig +++ b/views/twig/admin/mailConfigCheck.html.twig @@ -5,6 +5,14 @@ span.btn { cursor: default; } + + .communicationoutput { + background-color: black; + color: white; + max-height: 500px; + overflow: auto; + margin-top: 30px; + } {% set readonly = "readonly disabled" %} @@ -52,11 +60,16 @@ {{ translate({ ident: "D3_MAILCHECKER_CFGCHECK_SHOPSEND_SMTP_DESC" }) }} {% endif %} + +
+ {{ communication|raw }} +
{% else %}
{{ oViewConf.getHiddenSid()|raw }} +
{% endif %}