Improve IMAP error logging

daniel-lerch · Jul 10, 2020 · 625791b · 625791b
1 parent 81d1a71
commit 625791b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/locallang/locallang.de.php b/locallang/locallang.de.php
@@ -2025,7 +2025,8 @@
 'mailing_header_recipient' => "Empfänger",
 'mailing_rec_name' => "Empfänger",
 'mailing_number_of_recipients' => "Anzahl Empfänger",
-'mailing_error_imap' => "IMAP-Fehler: Verbindung zum Mailserver fehlgeschlagen.",
+'mailing_error_imap' => "IMAP-Fehler: ",
+'mailing_error_imap_default' => "Verbindung zum Mailserver fehlgeschlagen.",
 'mailing_mylist' => "Meine Liste",
 'mailing_group' => "Gruppe",
 'mailing_smallgroup' => "Kleingruppe",

diff --git a/locallang/locallang.en.php b/locallang/locallang.en.php
@@ -1840,7 +1840,8 @@
 'mailing_header_recipient' => 'Recipient',
 'mailing_rec_name' => 'Recipients',
 'mailing_number_of_recipients' => 'Number of recipients',
-'mailing_error_imap' => 'IMAP error. Connection to mailserver failed.',
+'mailing_error_imap' => 'IMAP error: ',
+'mailing_error_imap_default' => 'Connection to mailserver failed.',
 'mailing_mylist' => 'My list',
 'mailing_group' => 'Group',
 'mailing_smallgroup' => 'Small group',

diff --git a/locallang/locallang.fr.php b/locallang/locallang.fr.php
@@ -3,6 +3,7 @@
 *  Copyright notice
 *
 *  (c) 2003-2015 Renzo Lauper (renzo@churchtool.org)
+*  (c) 2019-2020 Daniel Lerch
 *  All rights reserved
 *
 *  This script is part of the kOOL project. The kOOL project is
@@ -981,7 +982,8 @@
 'mailing_error_7' => "L'alias e-mail n'est pas unique",
 'mailing_error_8' => "Trop de destinataires",
 'mailing_error_9' => "Aucun accès",
-'mailing_error_imap' => "Erreur-IMAP : échec de la connexion au serveur de la messagerie",
+'mailing_error_imap' => "Erreur-IMAP: ",
+'mailing_error_imap_default' => "échec de la connexion au serveur de la messagerie",
 'mailing_errormail_subject' => "Message d'erreur",
 'mailing_errormail_text_1' => "Identifiant-groupe inconnu '@_RECIPIENT@'",
 'mailing_errormail_text_10' => "Droits d'accès insuffisants pour envoyer un email groupé aux membres de ce groupe",

diff --git a/mailing.php b/mailing.php
@@ -208,6 +208,9 @@ function ko_mailing_main ($test = false, $mail_id_in = null, $recipient_in = nul
 
 	//Exit if connection to IMAP failed
 	if($imap == FALSE) {
+		$last_error = imap_last_error();
+		$comment = getLL('mailing_error_imap') . (($last_error == false) ? getLL('mailing_error_imap_default') : $last_error);
+		if ($verbose) print $comment . PHP_EOL;
 		db_insert_data('ko_log', array('type' => 'mailing_error', 'comment' => getLL('mailing_error_imap'), 'date' => date('Y-m-d H:i:s')));
 		return;
 	}
@@ -439,7 +442,7 @@ function ko_mailing_main ($test = false, $mail_id_in = null, $recipient_in = nul
 					} else {
 						if(sizeof($groups) == 1) {
 							$group = array_shift($groups);
-							if ($verbose) print "Mail alias matches group $group[id]" . PHP_EOL;
+							if ($verbose) print "Mail alias matches group $group[name] (id $group[id])" . PHP_EOL;
 							$error = ko_mailing_check_group($login, $group['id'], '', $no_mod, $unsetLogin);
 							if($error) {
 								ko_mailing_error($login, $error, $mail, $to);