[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail: [12905]
From:       pdontthink () users ! sourceforge ! net
Date:       2008-01-30 6:03:52
Message-ID: E1JK636-0000gy-6w () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]

Revision: 12905
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12905&view=rev
Author:   pdontthink
Date:     2008-01-29 22:03:51 -0800 (Tue, 29 Jan 2008)

Log Message:
-----------
Sorting strings should not be html-encoded, also strip out FWD: and FW: from subject \
sorting and repetitions of those or any other RE: type prefixes.  Thanks to Clayton \
Smith.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2008-01-30 \
                01:35:56 UTC (rev 12904)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2008-01-30 \
06:03:51 UTC (rev 12905) @@ -726,14 +726,14 @@
         if (!$allow_server_sort) {
            $from = parseAddress($from);
            if ($from[0][1]) {
-              $from = decodeHeader($from[0][1]);
+              $from = decodeHeader($from[0][1], true, false);
            } else {
               $from = $from[0][0];
            }
            $messages[$msgi]['FROM-SORT'] = $from;
-           $subject_sort = strtolower(decodeHeader($subject));
-           if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si", $subject_sort, \
                $matches)){
-                $messages[$msgi]['SUBJECT-SORT'] = $matches[2];
+           $subject_sort = strtolower(decodeHeader($subject, true, false));
+           if (preg_match("/^(?:(?:vedr|sv|re|aw|fw|fwd):\s*)*\s*(.*)$/si", \
$subject_sort, $matches)){ +                $messages[$msgi]['SUBJECT-SORT'] = \
$matches[1];  } else {
                $messages[$msgi]['SUBJECT-SORT'] = $subject_sort;
            }


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]