Changeset 1f020b5 in github

Timestamp:

Jan 31, 2008 9:34:50 AM (5 years ago)

Author:

svncommit <devs@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

9ac70f0

Parents:

39fd695

Message:

Remember search results (closes #1483883).

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (3 diffs)
• program/steps/mail/func.inc (modified) (1 diff)
• program/steps/mail/search.inc (modified) (1 diff)
• program/steps/mail/show.inc (modified) (2 diffs)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/01/31 (robin)
+- Remember search results (closes #1483883), patch by the_glu
 
 2008/01/08 (tomekp)

program/js/app.js

@@ -150 +150 @@
         // enable mail commands
         this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', true);
+
+        if (this.env.search_text != null && document.getElementById('quicksearchbox') != null)
+          document.getElementById('quicksearchbox').value = this.env.search_text;
         
         if (this.env.action=='show' || this.env.action=='preview')
@@ -498 +501 @@
         if (this.task=='mail')
           {
-          if (this.env.search_request<0 || (this.env.search_request && props != this.env.mailbox))
+          if (this.env.search_request<0 || (props != '' && (this.env.search_request && props != this.env.mailbox)))
             this.reset_qsearch();
 
@@ -1200 +1203 @@
       add_url = '&_safe=1';
 
+    // also send search request to get the right messages
+    if (this.env.search_request)
+      add_url += '&_search='+this.env.search_request;
+
     if (id)
       {

program/steps/mail/func.inc

@@ -49 +49 @@
 // set message set for search result
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
+  {
   $IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
+  $OUTPUT->set_env('search_request', $_REQUEST['_search']);
+  $OUTPUT->set_env('search_text', $_SESSION['last_text_search']);
+  }
 
 

program/steps/mail/search.inc

@@ -90 +90 @@
   {
     $_SESSION['search'][$search_request] = $IMAP->get_search_set();
+    $_SESSION['last_text_search'] = $str;
     rcmail_js_message_list($result_h);
     $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));

program/steps/mail/show.inc

@@ -81 +81 @@
   }
 
-  $next = $prev = -1;
+  // set message set for search result
+  if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
+    {
+    $IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
+    $OUTPUT->set_env('search_request', $_REQUEST['_search']);
+    }
+
+  $next = $prev = $first = $last = -1;
   // get previous, first, next and last message UID
-  if (!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') && 
-      $IMAP->get_capability('sort')) 
+  if ((!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') &&
+      $IMAP->get_capability('sort') ) && !(!empty($_REQUEST['_search']) &&
+      isset($_SESSION['search'][$_REQUEST['_search']])) )
     {
     // Only if we use custom sorting
@@ -94 +102 @@
     $next = isset($a_msg_index[$MESSAGE['index']+1]) ? $a_msg_index[$MESSAGE['index']+1] : -1 ;
     $last = count($a_msg_index)>0 ? $a_msg_index[count($a_msg_index)-1] : -1;
+    }
+  elseif (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
+    {
+      $search_data = $_SESSION['search'][$_REQUEST['_search']];
+      $result = $IMAP->search(NULL, $search_data[0], $search_data[1],$search_data[3]);
+      $result = array_reverse($result);
+      foreach ($result as $key=>$rid)
+        {
+        $result[$key] = $IMAP->get_uid($rid);
+        if ($MESSAGE['UID'] == $result[$key])
+          $seq = $key;
+        }
+      $prev = isset($result[$seq-1]) ? $result[$seq-1] : -1 ;
+      $first = count($result)>0 ? $result[0] : -1;
+      $next = isset($result[$seq+1]) ? $result[$seq+1] : -1 ;
+      $last = count($result)>0 ? $result[count($result)-1] : -1;
+      $MESSAGE['index'] = $seq;
     }
   else