Merge pull request #1610 from marcellintacite/improve-error-messages

refactor(backend): improve error messages to be more usefull

Author: kroky

modules/smtp/hm-smtp.php

@@ -264,7 +264,7 @@ function capabilities($ehlo_response) {
     function connect() {
         $certfile = false;
         $certpass = false;
-        $result = 'An error occurred connecting to the SMTP server';
+        $result = "We couldn't connect to the SMTP server. Please check your internet connection or server settings, and try again.";
         $server = $this->server;
 
         if ($this->tls) {
@@ -283,7 +283,9 @@ function connect() {
         else {
             $this->debug[] = 'Could not connect to the SMTP server';
             $this->debug[] = 'fsockopen errors #'.$errorno.'. '.$errorstr;
-            $result = 'Could not connect to the configured SMTP server';
+            // Log technical details for debugging
+            error_log("SMTP connection failed to {$this->server}:{$this->port} - Error #{$errorno}: {$errorstr}");
+            $result = "Unable to connect to the SMTP server. Please check your internet connection or server settings, and try again.";
         }
         $this->banner = $this->get_response();
         $command = 'EHLO '.$this->hostname;
@@ -295,7 +297,9 @@ function connect() {
             $this->send_command($command);
             $response = $this->get_response();
             if ($this->compare_response($response, '220') != 0) {
-                $result = 'An error occurred during the STARTTLS command';
+                // Log technical details for debugging
+                error_log("SMTP STARTTLS command failed. Expected 220, got: " . print_r($response, true));
+                $result = "We couldn't secure the connection to the SMTP server (STARTTLS failed). Please try again later.";
             }
             if(isset($certfile) && $certfile) {
                 stream_context_set_option($this->handle, 'tls', 'local_cert', $certfile);
@@ -310,7 +314,9 @@ function connect() {
             $this->capabilities($response);
         }
         if($this->compare_response($response,'250') != 0) {
-            $result = 'An error occurred during the EHLO command';
+            // Log technical details for debugging
+            error_log("SMTP EHLO command failed. Expected 250, got: " . print_r($response, true));
+            $result = "We couldn't complete the connection to the SMTP server (EHLO command failed). Please try again.";
         }
         else {
             if($this->auth) {
@@ -352,7 +358,7 @@ function authenticate($username, $password, $mech) {
             if ($result) {
                 return 'Authentication successful';
             }
-            return 'Authentication failed';
+            return "Login to the email server failed. Please check your username and password";
         } else {
             switch ($mech) {
                 case 'external':
@@ -419,13 +425,15 @@ function authenticate($username, $password, $mech) {
             }
         }
         if (!isset($result)) {
-            $result = 'An error occurred authenticating to the SMTP server';
+            $result = "We couldn't log in to the SMTP server. Please check your username and password.";
             $res = $this->get_response();
             if ($this->compare_response($res, '235') == 0) {
                 $this->state = 'authed';
                 $result = false;
             } else {
-                $result = 'Authorization failure';
+                // Log technical details for debugging
+                error_log("SMTP authentication failed. Expected 235, got: " . print_r($res, true));
+                $result = "Login to the SMTP server was not authorized. Please check your username and password, and try again.";
                 if (isset($res[0][1])) {
                     $result .= ': '.implode(' ', $res[0][1]);
                 }
@@ -568,7 +576,7 @@ function send_message($from, $recipients, $message, $from_params = '', $recipien
         $this->send_command($command);
         $res = $this->get_response();
         $bail = false;
-        $result = 'An error occurred sending the message';
+        $result = "Sorry, we couldn't send your message through the SMTP server right now. Please check your connection and try again.";
         if(is_array($recipients)) {
             if ($recipients_params) {
                 $recipients_params = ' ' . $recipients_params;
@@ -598,7 +606,9 @@ function send_message($from, $recipients, $message, $from_params = '', $recipien
             $this->send_command($command);
             $res = $this->get_response();
             if ($this->compare_response($res, '354') != 0) {
-                $result = 'An error occurred during the DATA command';
+                // Log technical details for debugging
+                error_log("SMTP DATA command failed. Expected 354, got: " . print_r($res, true));
+                $result = "Sorry, we couldn't send your message right now. The SMTP server didn't accept the message for delivery (DATA command failed). Please try again later.";
             }
             else {
                 $this->send_command($message);
@@ -610,12 +620,16 @@ function send_message($from, $recipients, $message, $from_params = '', $recipien
                     $result = false;
                 }
                 else {
-                    $result = 'An error occurred sending the message DATA';
+                    // Log technical details for debugging
+                    error_log("SMTP message delivery failed. Expected 250, got: " . print_r($res, true));
+                    $result = "Your message could not be sent. The SMTP server did not confirm delivery. Please try again later.";
                 }
             }
         }
         else {
-            $result = 'An error occurred during the RCPT command';
+            // Log technical details for debugging
+            error_log("SMTP RCPT command failed for one or more recipients");
+            $result = "There was an error sending your message. One or more of the recipient addresses may be invalid (RCPT command failed). Please check the email addresses and try again.";
         }
         return $result;
     }