Toma. Zupan <tomaz.zupan@orpo.si>

[squirrelmail.git] / functions / imap_search.php

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 566189555096340ef8f702b23f9db6c1465c3f2c..fbc9baeb551345657dbc1f549faa7eeff5750bbe 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -17,7 +17,7 @@ require_once('../functions/array.php');
 require_once('../functions/mailbox_display.php');
 require_once('../functions/mime.php');
 
-function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color, $search_position = '') {
+function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color, $search_position = '', $search_all, $count_all) {
 
     global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
     global $pos;
@@ -31,19 +31,19 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
 #  account for multiple search terms
 
         $multi_search = array ();
-        $search_what = ereg_replace("[ ]{2,}", " ", $search_what);
-        $multi_search = split (" ", $search_what);
+        $search_what = ereg_replace("[ ]{2,}", ' ', $search_what);
+        $multi_search = split (' ', $search_what);
         if (count($multi_search)==1) {
-                $search_string = $search_where . " " . "\"" . $multi_search[0] . "\"";
+                $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
         }
         else {
-                $search_string = "";
-               $count = count($multi_search);
+                $search_string = '';
+        $count = count($multi_search);
                 for ($x=0;$x<$count;$x++) {
-                       $search_string = $search_string . " " . $search_where . " " . "\"" . $multi_search[$x] . "\"";
+                       $search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" ';
                 }
         }
-       $search_string = ereg_replace("^ ", "", $search_string);
+       $search_string = trim($search_string);
 
 # now use $search_string in the imap search
 
@@ -57,7 +57,8 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
     /* Read Data Back From IMAP */
     $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
     if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
-        $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"";
+        // $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"";
+        $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
         $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
     }
 
@@ -78,9 +79,18 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
 
     /* If nothing is found * SEARCH should be the first error else echo errors */
     if (isset($errors) && strstr($errors,"* SEARCH")) {
+               if ($search_all != "all") {
         echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
         return;
-    } else if (isset($errors)) {
+               }
+               else {
+        return;
+               }
+    }
+//     else if ($search_all == 'all') {
+//             return;
+//     }
+       else if (isset($errors)) {
         echo "<!-- ".$errors." -->";
     }
 
@@ -109,7 +119,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
 
     $j = 0;
     while ($j < count($messagelist)) {
-            $date[$j] = ereg_replace('  ', ' ', $date[$j]);
+            $date[$j] = str_replace('  ', ' ', $date[$j]);
             $tmpdate = explode(" ", trim($date[$j]));
 
             $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate);
@@ -163,22 +173,37 @@ 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&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+        if ($search_all != 'all') {
+           if ( !isset( $start_msg ) ) {
+               $start_msg =0;
+           }
+           if ( !isset( $sort ) ) {
+                $sort = 0;
+           }
+            mail_message_listing_beginning( $imapConnection,
+                "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
             $mailbox,
-            -1,
-            '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
-            get_selectall_link($start_msg, $sort) );
-
-
+                -1,
+                '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b></tr><tr>'.
+            get_selectall_link($start_msg, $sort));
+        }
+        else {
+            mail_message_listing_beginning( $imapConnection,
+                "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+            $mailbox,
+                -1,
+                '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b></tr><tr>');
+        }
+               echo "<b><big><center>$mailbox</center></big></b>";
         while ($j < count($msgs)) {
             printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
             $j++;
+                       echo '</td></tr>';
         }
         echo '</table></td></tr></table></form>';
-
+               $count_all = count($msgs);
     }
+               return $count_all;
 }
 
 ?>