CVS: squirrelmail/functions imap_messages.php,1.66,1.67 mailbox_display.php,1.171,1.172 mime.php,1.128,1.129 smtp.php,1.129,1.130

[Pontus U. <ul...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv31058

Modified Files:
	imap_messages.php mailbox_display.php mime.php smtp.php 
Log Message:
Added code for priority.
Sysadmins can allow/disallow users to send e-mail messages with priority
using the conf.pl script.


Index: imap_messages.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_messages.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -w -r1.66 -r1.67
--- imap_messages.php	2001/10/29 14:48:02	1.66
+++ imap_messages.php	2001/11/04 11:57:08	1.67
@@ -492,6 +492,11 @@
                 $hdr->date = time();
             $i++;
          }
+	 /** X-PRIORITY **/
+         else if (strtolower(substr($read[$i], 0, 11)) == "x-priority:") {
+            $hdr->priority = trim(substr($read[$i], 11));
+            $i++;
+         }
          else {
             $i++;
          }

Index: mailbox_display.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mailbox_display.php,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -w -r1.171 -r1.172
--- mailbox_display.php	2001/11/03 23:49:22	1.171
+++ mailbox_display.php	2001/11/04 11:57:08	1.172
@@ -21,6 +21,7 @@
       global $checkall;
       global $color, $msgs, $msort;
       global $sent_folder, $draft_folder;
+      global $default_use_priority;
       global $message_highlight_list;
       global $index_order;
 
@@ -138,17 +139,19 @@
                   echo "A\n";
                   $stuff = true;
                }
-               if (ereg('(5)',substr($msg['PRIORITY'],0,1))) {
-                  echo "<font color=$color[8]>v</font>\n";
-                  $stuff = true;
-               }
                if ($msg['TYPE0'] == 'multipart') {
                   echo "+\n";
                   $stuff = true;
                }
+	       if ($default_use_priority) {
                if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) {
                   echo "<font color=$color[1]>!</font>\n";
                   $stuff = true;
+                  }
+                  if (ereg('(5)',substr($msg['PRIORITY'],0,1))) {
+                     echo "<font color=$color[8]>?</font>\n";
+                     $stuff = true;
+                  }
                }
                if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) {
                   echo "<font color=\"$color[1]\">D</font>\n";

Index: mime.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mime.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -w -r1.128 -r1.129
--- mime.php	2001/11/01 00:39:47	1.128
+++ mime.php	2001/11/04 11:57:08	1.129
@@ -24,6 +24,7 @@
       var $cc = array(), $bcc = array(), $reply_to = '', $subject = '';
       var $id = 0, $mailbox = '', $description = '', $filename = '';
       var $entity_id = 0, $message_id = 0, $name = '';
+      // var $priority = "";
    }
 
    class message {

Index: smtp.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/smtp.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -w -r1.129 -r1.130
--- smtp.php	2001/10/30 13:43:09	1.129
+++ smtp.php	2001/11/04 11:57:08	1.130
@@ -569,9 +569,10 @@
       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;
+      global $default_use_priority;
       global $more_headers;
       $more_headers = Array();
 
@@ -593,6 +594,9 @@
             $more_headers['References']  = $hdr->message_id;
          }
       }
+      if ($default_use_priority) {
+	$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
@@ -626,4 +630,24 @@
       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;
+   }
 ?>
\ No newline at end of file