Add a comment to the X-Priority header (Highest,Normal,Lowest).

This is common in other clients, and some SpamAssassin rule triggers
on the absence of such.

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

diff --git a/ChangeLog b/ChangeLog
index fec652b849579a664eaaeb5365eb1a2a743b04a6..b765cb901828e5f9457bd8f445aff5899ef52456 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,8 @@ Version 1.5.1 -- CVS
   - Fix non selectable inbox.
   - Add src/configtest.php script which checks for common errors in the config.
   - Improve display of some unparsable/absent dates (#891354).
-  
+  - Add comment (Highest,Normal,Lowest) to X-Priority header.
+    Some SpamAssassin rule triggers on the absence of such a comment.
 
 Version 1.5.0
 --------------------

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index f87f513be7a4ad7c8343f0a7280077daf0374cc6..ec35af1cdc41dda1fdf4f7ea9ccb0f2750e19b5c 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -459,13 +459,17 @@ class Deliver {
             $header[] = 'Disposition-Notification-To: '.$dnt. $rn;
         }
         if ($rfc822_header->priority) {
-            $prio = $rfc822_header->priority;
-            $header[] = 'X-Priority: '. $prio. $rn;
-            switch($prio)
+            switch($rfc822_header->priority)
             {
-            case 1: $header[] = 'Importance: High'. $rn; break;
-            case 3: $header[] = 'Importance: Normal'. $rn; break;
-            case 5: $header[] = 'Importance: Low'. $rn; break;
+            case 1:
+               $header[] = 'X-Priority: 1 (Highest)'.$rn;
+               $header[] = 'Importance: High'. $rn; break;
+            case 3:
+               $header[] = 'X-Priority: 3 (Normal)'.$rn;
+               $header[] = 'Importance: Normal'. $rn; break;
+            case 5:
+               $header[] = 'X-Priority: 5 (Lowest)'.$rn;
+               $header[] = 'Importance: Low'. $rn; break;
             default: break;
             }
         }