Some rearranging

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

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index bcc94e38e899252a67548c64e7e4aacd674d9606..70d9b08dbcd13afdb1e650e31a5dc8e47e5258ba 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -89,7 +89,7 @@
       global $squirrelmail_language, $color;
 
       /* Get the small headers for each message in $msg_list */
       global $squirrelmail_language, $color;
 
       /* Get the small headers for each message in $msg_list */

-
+      $sid = sqimap_session_id();

       $maxmsg = sizeof($msg_list);
       $msgs_str = sqimap_message_list_squisher($msg_list);
       $results = array();
       $maxmsg = sizeof($msg_list);
       $msgs_str = sqimap_message_list_squisher($msg_list);
       $results = array();


@@ -104,38 +104,37 @@
          $id2index[$msg_list[$i]] = $i;
       }
 
          $id2index[$msg_list[$i]] = $i;
       }
 

-
-      $query = sqimap_session_id() . " FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n";
+      $query = "$sid FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n";

       fputs ($imap_stream, $query);
       fputs ($imap_stream, $query);

-      $readin_list = sqimap_read_data_list($imap_stream, sqimap_session_id(), true, $response, $message);
+      $readin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);

 
 
       foreach ($readin_list as $r) {
          if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
             set_up_language($squirrelmail_language);
 
 
       foreach ($readin_list as $r) {
          if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
             set_up_language($squirrelmail_language);

-            echo "<br><b><font color=$color[2]>\n";
-            echo _("ERROR : Could not complete request.");
-            echo "</b><br>\n";
-            echo _("Unknown response from IMAP server: ");
-            echo $r[0] . "</font><br>\n";
-            exit;
-         }
-         if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {
+            echo '<br><b><font color=$color[2]>' .
+                 _("ERROR : Could not complete request.") .
+                 '</b><br>' .
+                 _("Unknown response from IMAP server: ") . ' 1.' .
+                 $r[0] . "</font><br>\n";
+            // exit;
+         } else if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {

             set_up_language($squirrelmail_language);
             set_up_language($squirrelmail_language);

-            echo "<br><b><font color=$color[2]>\n";
-            echo _("ERROR : Could not complete request.");
-            echo "</b><br>\n";
-            echo _("Unknown message number in reply from server: ");
-            echo $regs[1] . "</font><br>\n";
-            exit;
+            echo '<br><b><font color=$color[2]>' .
+                 _("ERROR : Could not complete request.") .
+                 '</b><br>' .
+                 _("Unknown message number in reply from server: ") .
+                 $regs[1] . "</font><br>\n";
+            // exit;
+         } else {
+            $read_list[$id2index[$regs[1]]] = $r;

          }
          }

-         $read_list[$id2index[$regs[1]]] = $r;

       }
       arsort($read_list);
       
       }
       arsort($read_list);
       

-      $query = sqimap_session_id() . " FETCH $msgs_str RFC822.SIZE\r\n";
+      $query = "$sid FETCH $msgs_str RFC822.SIZE\r\n";

       fputs ($imap_stream, $query);
       fputs ($imap_stream, $query);

-      $sizesin_list = sqimap_read_data_list($imap_stream, sqimap_session_id(), true, $response, $message);
+      $sizesin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);

       
       foreach ($sizesin_list as $r) {
          if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
       
       foreach ($sizesin_list as $r) {
          if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {


@@ -143,7 +142,7 @@
             echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Could not complete request.");
             echo "</b><br>\n";
             echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Could not complete request.");
             echo "</b><br>\n";

-            echo _("Unknown response from IMAP server: ");
+            echo _("Unknown response from IMAP server: ") . ' 2.';

             echo $r[0] . "</font><br>\n";
             exit;
          }
             echo $r[0] . "</font><br>\n";
             exit;
          }


@@ -202,8 +201,8 @@
             
          }
          if (trim($date) == "") {
             
          }
          if (trim($date) == "") {

-            fputs($imap_stream, sqimap_session_id() . " FETCH $msg_list[$msgi] INTERNALDATE\r\n");
-            $readdate = sqimap_read_data($imap_stream, sqimap_session_id(), true, $response, $message);
+            fputs($imap_stream, "$sid FETCH $msg_list[$msgi] INTERNALDATE\r\n");
+            $readdate = sqimap_read_data($imap_stream, $sid, true, $response, $message);

             if (eregi(".*INTERNALDATE \"(.*)\".*", $readdate[0], $regs)) {
                $date_list = explode(" ", trim($regs[1]));
                $date_list[0] = str_replace("-", " ", $date_list[0]);
             if (eregi(".*INTERNALDATE \"(.*)\".*", $readdate[0], $regs)) {
                $date_list = explode(" ", trim($regs[1]));
                $date_list[0] = str_replace("-", " ", $date_list[0]);

diff --git a/functions/imap_search.php b/functions/imap_search.php
index b5eb0e3e18137bf178ba51f8a8d47aac27e79627..a546b4e649801647573716a264e8f41ea7abc5e1 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -143,7 +143,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
                 if (!isset ($msg)) { $msg = ""; }
          mail_message_listing_beginning($imapConnection, 
             "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=".urlencode($search_where)."&what=".urlencode($search_what),
                 if (!isset ($msg)) { $msg = ""; }
          mail_message_listing_beginning($imapConnection, 
             "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=".urlencode($search_where)."&what=".urlencode($search_what),

-             '', -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
+             $mailbox, -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',

              '&nbsp;');
          
  
              '&nbsp;');
          
  


@@ -151,8 +151,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
             printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
             $j++;
          }
             printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
             $j++;
          }

-         echo "</table>";
-         echo "</tr></td></table>";
+         echo '</table></tr></td></table>';

       }
    }
 
       }
    }