thomascube
2007-09-11 4845a1ea952f4affda3546abd7dfa02d24fc818c
Fixed message search issues

2 files modified
10 ■■■■ changed files
program/include/rcube_imap.inc 8 ●●●● patch | view | raw | blame | history
program/steps/mail/search.inc 2 ●●● patch | view | raw | blame | history
program/include/rcube_imap.inc
@@ -287,7 +287,7 @@
      
    $this->search_subject = $subject;
    $this->search_string = $str;
    $this->search_set = is_array($msgs) ? $msgs : NULL;
    $this->search_set = (array)$msgs;
    $this->search_charset = $charset;
    }
@@ -439,8 +439,8 @@
      $mailbox = $this->mailbox;
      
    // count search set
    if ($this->search_set && $mailbox == $this->mailbox && $mode == 'ALL')
      return count($this->search_set);
    if ($this->search_string && $mailbox == $this->mailbox && $mode == 'ALL')
      return count((array)$this->search_set);
    $a_mailbox_cache = $this->get_cache('messagecount');
    
@@ -522,7 +522,7 @@
      return array();
    // use saved message set
    if ($this->search_set && $mailbox == $this->mailbox)
    if ($this->search_string && $mailbox == $this->mailbox)
      return $this->_list_header_set($mailbox, $this->search_set, $page, $sort_field, $sort_order);
    if ($sort_field!=NULL)
program/steps/mail/search.inc
@@ -78,7 +78,7 @@
{
  // Get the headers
  $result_h = $IMAP->list_header_set($mbox, $result, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
  $count = count($result_h);
  $count = $IMAP->messagecount();
  // save search results in session
  if (!is_array($_SESSION['search']))