From d83a883a1c6819870449d2c54f4128a73dd618aa Mon Sep 17 00:00:00 2001 From: Anojh Thayaparan Date: Mon, 28 Jan 2019 03:31:05 -0800 Subject: [PATCH 1/4] Implements error handling #11 Prints IMAP errors and alerts to the nextcloud log. Signed-off-by: Anojh Thayaparan --- lib/imap.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/imap.php b/lib/imap.php index a412da2..9d725bc 100644 --- a/lib/imap.php +++ b/lib/imap.php @@ -67,8 +67,14 @@ class OC_User_IMAP extends \OCA\user_external\Base { } $mbox = @imap_open($this->mailbox, $username, $password, OP_HALFOPEN, 1); - imap_errors(); - imap_alerts(); + OC::$server->getLogger()->error( + 'ERROR: IMAP Error: ' . print_r(imap_errors(), true), + ['app' => 'user_external'] + ); + OC::$server->getLogger()->error( + 'ERROR: IMAP Warning: ' . print_r(imap_alerts(), true), + ['app' => 'user_external'] + ); if($mbox !== false) { imap_close($mbox); $uid = mb_strtolower($uid); From ba19fc9515831bcf15542694e604d52ce986f0c3 Mon Sep 17 00:00:00 2001 From: Anojh Thayaparan Date: Mon, 28 Jan 2019 10:26:20 -0800 Subject: [PATCH 2/4] change imap_alerts to warning Signed-off-by: Anojh Thayaparan --- lib/imap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/imap.php b/lib/imap.php index 9d725bc..b68b124 100644 --- a/lib/imap.php +++ b/lib/imap.php @@ -71,8 +71,8 @@ class OC_User_IMAP extends \OCA\user_external\Base { 'ERROR: IMAP Error: ' . print_r(imap_errors(), true), ['app' => 'user_external'] ); - OC::$server->getLogger()->error( - 'ERROR: IMAP Warning: ' . print_r(imap_alerts(), true), + OC::$server->getLogger()->warning( + 'WARNING: IMAP Warning: ' . print_r(imap_alerts(), true), ['app' => 'user_external'] ); if($mbox !== false) { From 58dd7465b9ca06c76c93e12879d950bc3d7d91e0 Mon Sep 17 00:00:00 2001 From: Anojh Thayaparan Date: Wed, 30 Jan 2019 08:10:11 -0800 Subject: [PATCH 3/4] check for errors before printing Signed-off-by: Anojh Thayaparan --- lib/imap.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/imap.php b/lib/imap.php index b68b124..5e8dd75 100644 --- a/lib/imap.php +++ b/lib/imap.php @@ -67,14 +67,20 @@ class OC_User_IMAP extends \OCA\user_external\Base { } $mbox = @imap_open($this->mailbox, $username, $password, OP_HALFOPEN, 1); - OC::$server->getLogger()->error( - 'ERROR: IMAP Error: ' . print_r(imap_errors(), true), - ['app' => 'user_external'] - ); - OC::$server->getLogger()->warning( - 'WARNING: IMAP Warning: ' . print_r(imap_alerts(), true), - ['app' => 'user_external'] - ); + $imapErrors = imap_errors(); + $imapAlerts = imap_alerts(); + if (!empty($imapErrors) { + OC::$server->getLogger()->error( + 'ERROR: IMAP Error: ' . print_r($imapErrors, true), + ['app' => 'user_external'] + ); + } + if (!empty($imapAlerts)) { + OC::$server->getLogger()->warning( + 'WARNING: IMAP Warning: ' . print_r($imapAlerts, true), + ['app' => 'user_external'] + ); + } if($mbox !== false) { imap_close($mbox); $uid = mb_strtolower($uid); From 61e0a282041ac0d6925ecce6d06f8fd931613d25 Mon Sep 17 00:00:00 2001 From: Anojh Thayaparan Date: Wed, 30 Jan 2019 12:45:59 -0800 Subject: [PATCH 4/4] fix closing brace Signed-off-by: Anojh Thayaparan --- lib/imap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/imap.php b/lib/imap.php index 5e8dd75..3193eb8 100644 --- a/lib/imap.php +++ b/lib/imap.php @@ -69,7 +69,7 @@ class OC_User_IMAP extends \OCA\user_external\Base { $mbox = @imap_open($this->mailbox, $username, $password, OP_HALFOPEN, 1); $imapErrors = imap_errors(); $imapAlerts = imap_alerts(); - if (!empty($imapErrors) { + if (!empty($imapErrors)) { OC::$server->getLogger()->error( 'ERROR: IMAP Error: ' . print_r($imapErrors, true), ['app' => 'user_external']