fix for non server side sorting on internal date

Modified the subject sort to strip out the [mailinglist] entries before we
start sorting.

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

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 6364be498914a4480c7593582a0bde714a50e91c..4edca163d763f72303a3b9e2fc7841205e843f71 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -243,7 +243,7 @@ function get_squirrel_sort ($imap_stream, $sSortField, $reverse = false) {
       case 'SUBJECT':
         array_walk($msgs, create_function('&$v,&$k',
               '$v["SUBJECT"] = strtolower(decodeHeader(trim($v["SUBJECT"])));
       case 'SUBJECT':
         array_walk($msgs, create_function('&$v,&$k',
               '$v["SUBJECT"] = strtolower(decodeHeader(trim($v["SUBJECT"])));

-               $v["SUBJECT"] = (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si", $v["SUBJECT"], $matches)) ?
+               $v["SUBJECT"] = (preg_match("/^(vedr|sv|re|aw|\[\w\]):\s*(.*)$/si", $v["SUBJECT"], $matches)) ?

                                   $matches[2] : $v["SUBJECT"];'));
         foreach ($msgs as $item) {
             $msort["$item[ID]"] = $item['SUBJECT'];
                                   $matches[2] : $v["SUBJECT"];'));
         foreach ($msgs as $item) {
             $msort["$item[ID]"] = $item['SUBJECT'];


@@ -272,7 +272,7 @@ function get_squirrel_sort ($imap_stream, $sSortField, $reverse = false) {
         //array_walk($msgs, create_function('&$v,$k',
         //    '$v["RFC822.SIZE"] = getTimeStamp(explode(" ",$v["RFC822.SIZE"]));'));
         foreach ($msgs as $item) {
         //array_walk($msgs, create_function('&$v,$k',
         //    '$v["RFC822.SIZE"] = getTimeStamp(explode(" ",$v["RFC822.SIZE"]));'));
         foreach ($msgs as $item) {

-            $msort[$item['ID']] = $item['SIZE'];
+            $msort[$item['ID']] = $item[$sSortField];

         }
         if ($reverse) {
             arsort($msort,SORT_NUMERIC);
         }
         if ($reverse) {
             arsort($msort,SORT_NUMERIC);