greatly improved smtp error handling (doesn't trash messages if an error occurs)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1284 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index c98bd5a591d3405c20b4e32c1280cafd696319c6..4f8cd0b8b325023993c67e306c6609cd9830f16d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 1.1.0 -- DEVELOPMENT
 ----------------------------
+- Much improved SMTP error handling (patch by Jeff Evans)
 - Preferences are now cached instead of read in every page load.
 - Improved URL parser
 - Added ability to read HTML messages by default instead of plain text (Display Options)

diff --git a/functions/mime.php b/functions/mime.php
index daae91b7ee7ae5fe09ca971bb93fc34e1b09b145..b700aceb7da4ff11e2f1362a05a00b1e23b061c7 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -561,6 +561,7 @@
          if (isset($message->entities[0])) {
             $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
          }
+            $body .= "</TD></TR></TABLE>";
       } else {
          $body = formatAttachments ($message, -1, $message->header->mailbox, $id);
       }

diff --git a/functions/smtp.php b/functions/smtp.php
index 3b9e657911483b6bb39b18b66d598f02cbd18b0d..b033490ee210868615155363a8a97cc7eb0a7b98 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -343,7 +343,7 @@
          exit;
       }
       $tmp = fgets($smtpConnection, 1024);
-      errorCheck($tmp, $smtpConnection);
+      if (errorCheck($tmp, $smtpConnection)!=5) return(0);
 
       $to_list = getLineOfAddrs($to);
       $cc_list = getLineOfAddrs($cc);
@@ -352,51 +352,51 @@
       if (! isset ($use_authenticated_smtp) || $use_authenticated_smtp == false) {
          fputs($smtpConnection, "HELO $domain\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+      if (errorCheck($tmp, $smtpConnection)!=5) return(0);
       } else {
          fputs($smtpConnection, "EHLO $domain\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+         if (errorCheck($tmp, $smtpConnection)!=5) return(0);
 
          fputs($smtpConnection, "AUTH LOGIN\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+         if (errorCheck($tmp, $smtpConnection)!=5) return(0);
 
          fputs($smtpConnection, base64_encode ($username) . "\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+         if (errorCheck($tmp, $smtpConnection)!=5) return(0);
 
          fputs($smtpConnection, base64_encode ($OneTimePadDecrypt($key, $onetimepad)) . "\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+         if (errorCheck($tmp, $smtpConnection)!=5) return(0);
       }
 
       /** Ok, who is sending the message? */
       fputs($smtpConnection, "MAIL FROM: <$from_addr>\r\n");
       $tmp = fgets($smtpConnection, 1024);
-      errorCheck($tmp, $smtpConnection);
+      if (errorCheck($tmp, $smtpConnection)!=5) return(0);
 
       /** send who the recipients are */
       for ($i = 0; $i < count($to); $i++) {
          fputs($smtpConnection, "RCPT TO: $to[$i]\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+         if (errorCheck($tmp, $smtpConnection)!=5) return(0);
       }
       for ($i = 0; $i < count($cc); $i++) {
          fputs($smtpConnection, "RCPT TO: $cc[$i]\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+         if (errorCheck($tmp, $smtpConnection)!=5) return(0);
       }
       for ($i = 0; $i < count($bcc); $i++) {
          fputs($smtpConnection, "RCPT TO: $bcc[$i]\r\n");
          $tmp = fgets($smtpConnection, 1024);
-         errorCheck($tmp, $smtpConnection);
+         if (errorCheck($tmp, $smtpConnection)!=5) return(0);
       }
 
       /** Lets start sending the actual message */
       fputs($smtpConnection, "DATA\r\n");
       $tmp = fgets($smtpConnection, 1024);
-      errorCheck($tmp, $smtpConnection);
+      if (errorCheck($tmp, $smtpConnection)!=5) return(0);
 
       // Send the message
       $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject, $more_headers);
@@ -404,10 +404,15 @@
 
       fputs($smtpConnection, ".\r\n"); // end the DATA part
       $tmp = fgets($smtpConnection, 1024);
-      $num = errorCheck($tmp, $smtpConnection);
+      $num = errorCheck($tmp, $smtpConnection, verbose);
       if ($num != 250) {
-        $tmp = nl2br(htmlspecialchars($tmp));
-         echo "ERROR<BR>Message not sent!<BR>Reason given: $tmp<BR></BODY></HTML>";
+         $tmp = nl2br(htmlspecialchars($tmp));
+         displayPageHeader($color, 'None');
+         include ("../functions/display_messages.php");
+         $lines = nl2br(htmlspecialchars($lines));
+         $msg  = "Message not sent!<br>\nReason given: $tmp";
+         plain_error_message($msg, $color);
+         return(0);
       }
 
       fputs($smtpConnection, "QUIT\r\n"); // log off
@@ -469,14 +474,14 @@
                      $status = 0;
                      break;
 
-         case 235:   return; break;
+         case 235:   return(5); break;
          case 250:   $message = 'Requested mail action okay, completed';
                      $status = 5;
                      break;
          case 251:   $message = 'User not local; will forward';
                      $status = 5;
                      break;
-         case 334:   return; break;
+         case 334:   return(5); break;
          case 450:   $message = 'Requested mail action not taken:  mailbox unavailable';
                      $status = 0;
                      break;
@@ -512,16 +517,12 @@
 
       if ($status == 0) {
          displayPageHeader($color, 'None');
-         echo '<TT>';
-         echo "<br><b><font color=\"$color[1]\">ERROR</font></b><br><br>";
-         echo "&nbsp;&nbsp;&nbsp;<B>Error Number: </B>$err_num<BR>";
-         echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Reason: </B>$message<BR>";
+                include ("../functions/display_messages.php");
          $lines = nl2br(htmlspecialchars($lines));
-         echo "<B>Server Response: </B>$lines<BR>";
-         echo '<BR>MAIL NOT SENT';
-         echo '</TT></BODY></HTML>';
-         exit;
+                $msg  = $message . "<br>\nServer replied: $lines";
+                plain_error_message($msg, $color);
       }
+      if ($verbose == "") return $status;
       return $err_num;
    }
 

diff --git a/src/compose.php b/src/compose.php
index eb6dbcf86da664b403f48c6d5a0bbf45cf932f68..1389e1ff24dd81588f2046ccde9acff2ec13922e 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -424,8 +424,8 @@
          // Set $default_charset to correspond with the user's selection
         // of language interface.
         set_my_charset();
-        sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id);
-         header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
+         if (sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id) == 0) {showInputForm(); exit();}
+//         header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
       } else {
          //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
          displayPageHeader($color, $mailbox);