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 fad2f502e187b2cc586f7decf6c32cc43af8988d..fbc9baeb551345657dbc1f549faa7eeff5750bbe 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -38,7 +38,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
         }
         else {
                 $search_string = '';
-               $count = count($multi_search);
+        $count = count($multi_search);
                 for ($x=0;$x<$count;$x++) {
                        $search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" ';
                 }
@@ -173,14 +173,27 @@ 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) );
-
-#              echo '<table width=100%>';
+                -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);
@@ -188,7 +201,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
                        echo '</td></tr>';
         }
         echo '</table></td></tr></table></form>';
-               $count_all += count($msgs);
+               $count_all = count($msgs);
     }
                return $count_all;
 }