- fixed bugs in sorting by from and subject

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index bce1cd62dea3b347534925414102c0989df2e314..4c273614e558e85069bcdaf065cf4aee734667b6 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -147,9 +147,9 @@
          
          /* Make an RFC822 Received: line */
          if (isset($REMOTE_HOST))
-            $received_from = "$REMOTE_HOST ($username@[$REMOTE_ADDR])";
+            $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
          else
-            $received_from = "$REMOTE_ADDR ($username@[$REMOTE_ADDR])";
+            $received_from = $REMOTE_ADDR;
     
          if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) {
             if ($HTTP_X_FORWARDED_FOR == "")
@@ -157,9 +157,10 @@
             $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)";
          }            
     
-         $header = "Received: from $received_from\r\n";
-         $header .= "  by $SERVER_NAME with HTTP;\r\n";
-         $header .= "  $date\r\n";
+         $header  = "Received: from $received_from\r\n";
+         $header .= "        (SquirrelMail authenticated user $username)\r\n";
+         $header .= "        by $SERVER_NAME with HTTP;\r\n";
+         $header .= "        $date\r\n";
          
          /* Insert the rest of the header fields */
          $header .= "Message-ID: $message_id\r\n";
@@ -480,7 +481,7 @@
          writeBody ($imap_stream, $body); 
          sqimap_append_done ($imap_stream);
       }   
-
+      sqimap_logout($imap_stream); 
       // Delete the files uploaded for attaching (if any).
       deleteAttachments();
    }