Added a conversion from < to &lt; when viewing "non-HTML" email for

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index 2be15ca8378bd1dea5819c140142ecc93b050a1d..bda8525e3282b50517a76b8c7d7f96d834dc9f24 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -76,7 +76,7 @@
       if (isMultipart()) {
          foreach ($attachments as $info)
         {
-           if (isset($info['type']))
+           if (isset($info['type']) && $filetype != "")
               $filetype = $info['type'];
             else
                $filetype = 'application/octet-stream';
@@ -564,7 +564,7 @@
       return $err_num;
    }
 
-   function sendMessage($t, $c, $b, $subject, $body, $reply_id) {
+   function sendMessage($t, $c, $b, $subject, $body, $reply_id, $prio = 3) {
       global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad;
       global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort;
       $more_headers = Array();
@@ -585,6 +585,7 @@
             $more_headers['References']  = $hdr->message_id;
          }
       }
+      $more_headers = array_merge($more_headers, createPriorityHeaders($prio));
 
       // In order to remove the problem of users not able to create
       // messages with "." on a blank line, RFC821 has made provision
@@ -617,5 +618,25 @@
         
       return $length;
    }
-
+   
+   function createPriorityHeaders($prio) {
+      $prio_headers = Array();
+      $prio_headers["X-Priority"] = $prio;
+
+      switch($prio) {
+        case 1: $prio_headers["Importance"] = "High";
+                $prio_headers["X-MSMail-Priority"] = "High";
+                break;
+
+        case 3: $prio_headers["Importance"] = "Normal";
+                $prio_headers["X-MSMail-Priority"] = "Normal";
+                break;
+
+        case 5:
+               $prio_headers["Importance"] = "Low";
+               $prio_headers["X-MSMail-Priority"] = "Low";
+               break;
+      }
+      return  $prio_headers;
+   }
 ?>