Initialize $output

[squirrelmail.git] / src / search.php

diff --git a/src/search.php b/src/search.php
index 8d77d2b1e994cc444f241a143e04b472eb3ff43f..3acc5b1262274dc0fea371b4eb4e21e19dcd48c4 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -12,7 +12,7 @@
 require_once('../src/validate.php');
 require_once('../functions/imap.php');
 require_once('../functions/imap_search.php');
-require_once('../functions/imap_utf7_decode_local.php');
+require_once('../functions/imap_mailbox.php');
 require_once('../functions/array.php');
 require_once('../functions/strings.php');
 
@@ -159,6 +159,34 @@ function save_recent($save_index, $username, $data_dir) {
     }
 }
 
+function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $where, $what, $usecache = false, $newsort = false) {
+    global $sort, $color;
+    
+    $msort = calc_msort($msgs, $sort);
+    if ($cnt > 0) {
+       if ( $mailbox == 'INBOX' ) {
+           $showbox = _("INBOX");
+       } else {
+            $showbox = imap_utf7_decode_local($mailbox);
+       }
+       echo html_tag( 'div', '<b><big>' . _("Folder:") . ' '. $showbox.'</big></b>','center') . "\n";
+
+
+       $msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt);
+
+       mail_message_listing_beginning($imapConnection, $mailbox, $sort, 
+                                       $msg_cnt_str, '', 1);
+
+
+       printHeader($mailbox, 6, $color, false);
+
+       displayMessageArray($imapConnection, $cnt, 1, 
+                         $msort, $mailbox, $sort, $color, $cnt, $where, $what);
+
+       mail_message_listing_end($cnt, '', $msg_cnt_str, $color); 
+    }
+}                            
+
 /* ------------------------ main ------------------------ */
 
 /*  reset these arrays on each page load just in case  */
@@ -173,12 +201,6 @@ $recent_count = getPref($data_dir, $username, 'search_memory', 0);
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $boxes = sqimap_mailbox_list($imapConnection);
 
-if (isset($newsort)) {
-    printSearchMessages('',$mailbox, '', $imapConnection, true, $newsort);
-}
-
-
-
 /*  set current mailbox to INBOX if none was selected or if page
     was called to search all folders.  */
 if ( !isset($mailbox) || $mailbox == 'None' || $mailbox == '' ) {
@@ -318,38 +340,6 @@ if ($recent_count > 0) {
     echo '</table></td></tr></table><br>';
 }
 
-function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $usecache = false, $newsort = false) {
-    global $sort, $color;
-
-    if (!$usecache) {
-       if (!isset($search_msgs) || !session_is_registered('search_msgs')) {
-          $search_msgs = array();
-          $search_msgs[$mailbox] = $msgs;    
-          session_register('search_msgs');
-       } else {
-          $old_search_msgs = $search_msgs;
-          session_unregister('search_msgs');
-          $old_search_msgs[$mailbox] = $msgs;
-          $search_msgs = $old_search_msgs;
-          session_register('search_msgs');
-       }
-    } else {
-//       if (session_is_registered('search_msgs')) {
-//          global $search_msgs;
-          $msgs = $search_msgs[$mailbox];
-//       } else {
-//          $msgs = $search_msgs[$mailbox];
-//       }
-    }
-    if ($newsort) {
-      $cnt = count($msgs);
-      $sort = $newsort;
-    }
-    $msort = calc_msort($msgs, $sort, $cnt, true);
-    displayMessageArray($imapConnection, $cnt, 1, 
-                            $msgs, $msort, $mailbox, $sort, $color, 
-                            $cnt, true);
-}                            
 
 if (isset($newsort)) {
     $sort = $newsort;
@@ -457,20 +447,19 @@ if ($search_all == 'all') {
             sqimap_mailbox_select($imapConnection, $mailbox);
             $msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
            $count_all = count($msgs);
-            printSearchMessages($msgs, $mailbox, $count_all, $imapConnection);
+            printSearchMessages($msgs, $mailbox, $count_all, $imapConnection, 
+                               $where, $what, false, false);
             array_push($perbox_count, $count_all);
         }
     }
     for ($i=0;$i<count($perbox_count);$i++) {
-        if ($perbox_count[$i] != "") {
-            $count_all = "found";
+        if ($perbox_count[$i]) {
+            $count_all = true;
             break;
         }
     }
-    if ($count_all != "found") {
-        echo '<br><b>' .
-             _("No Messages found") .
-             '</b><br>';
+    if (!$count_all) {
+       echo '<br><center>' . _("No Messages Found") . '</center>';
     }
 }
 
@@ -481,7 +470,12 @@ else {
         . html_tag( 'div', '<b>' . _("Search Results") . '</b>', 'center' ) . "\n";
         sqimap_mailbox_select($imapConnection, $mailbox);
         $msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
-        printSearchMessages($msgs, $mailbox, count($msgs), $imapConnection);
+       if (count($msgs)) {
+           printSearchMessages($msgs, $mailbox, count($msgs), $imapConnection,
+                              $where, $what, false, false);
+       } else {
+           echo '<br><center>' . _("No Messages Found") . '</center>';
+       }
     }
 }