Changeset 3106 in subversion

Timestamp:

Nov 13, 2009 9:27:04 AM (4 years ago)

Author:

alec

Message:

• Threads (just a beginning)

Location:

branches/devel-threads

Files:

• THREADS (added)
• config/main.inc.php.dist (modified) (2 diffs)
• index.php (modified) (1 diff)
• program/include/rcube_imap.php (modified) (26 diffs)
• program/include/rcube_shared.inc (modified) (1 diff)
• program/js/app.js (modified) (33 diffs)
• program/js/list.js (modified) (11 diffs)
• program/lib/imap.inc (modified) (8 diffs)
• program/localization/en_US/labels.inc (modified) (3 diffs)
• program/steps/mail/check_recent.inc (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (16 diffs)
• program/steps/mail/list.inc (modified) (3 diffs)
• program/steps/mail/move_del.inc (modified) (3 diffs)
• program/steps/mail/search.inc (modified) (2 diffs)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/manage_folders.inc (modified) (7 diffs)
• program/steps/settings/save_prefs.inc (modified) (1 diff)
• skins/default/functions.js (modified) (4 diffs)
• skins/default/images/icons/columnpicker.gif (added)
• skins/default/images/icons/unread_children.png (added)
• skins/default/mail.css (modified) (3 diffs)
• skins/default/templates/mail.html (modified) (3 diffs)

branches/devel-threads/config/main.inc.php.dist

@@ -77 +77 @@
 $rcmail_config['imap_root'] = null;
 $rcmail_config['imap_delimiter'] = null;
+
+// The default IMAP message THREAD retrieval algorithm.
+// A common one for threading would be REFERENCES.
+// Make sure that your IMAP server supports this!
+$rcmail_config['imap_thread_algorithm'] = 'REFERENCES';
+
+// 0 - Do not expand threads
+// 1 - Expand all threads automatically
+// 2 - Expand only threads with unread messages
+$rcmail_config['autoexpand_threads'] = 0;
 
 // Automatically add this domain to user names for login
@@ -342 +352 @@
 
 // default sort col
-$rcmail_config['message_sort_col'] = 'date';
+$rcmail_config['message_sort_col'] = 'default';
 
 // default sort order

branches/devel-threads/index.php

@@ -227 +227 @@
     'subscribe'     => 'manage_folders.inc',
     'unsubscribe'   => 'manage_folders.inc',
+    'enable-threading'  => 'manage_folders.inc',
+    'disable-threading' => 'manage_folders.inc',
     'add-identity'  => 'edit_identity.inc',
   )

branches/devel-threads/program/include/rcube_imap.php

@@ -49 +49 @@
   var $list_page = 1;
   var $page_size = 10;
-  var $sort_field = 'date';
+  var $sort_field = '';
   var $sort_order = 'DESC';
-  var $index_sort = true;
   var $delimiter = NULL;
-  var $caching_enabled = FALSE;
+  var $threading = false;
+  var $caching_enabled = false;
   var $default_charset = 'ISO-8859-1';
   var $struct_charset = NULL;
@@ -64 +64 @@
   var $uid_id_map = array();
   var $msg_headers = array();
-  var $skip_deleted = FALSE;
+  var $skip_deleted = false;
   var $search_set = NULL;
   var $search_string = '';
   var $search_charset = '';
-  var $search_sort_field = '';  
+  var $search_sort_field = '';
+  var $search_threads = false;
   var $debug_level = 1;
   var $error_code = 0;
+  var $db_header_fields = array('idx', 'uid', 'subject', 'from', 'to', 'cc', 'date', 'size');
   var $options = array('auth_method' => 'check');
   
@@ -309 +311 @@
    * @param  string  Sorting field
    */
-  function set_search_set($str=null, $msgs=null, $charset=null, $sort_field=null)
+  function set_search_set($str=null, $msgs=null, $charset=null, $sort_field=null, $threads=false)
     {
     if (is_array($str) && $msgs == null)
@@ -320 +322 @@
     $this->search_charset = $charset;
     $this->search_sort_field = $sort_field;
+    $this->search_threads = $threads;
     }
 
@@ -329 +332 @@
   function get_search_set()
     {
-    return array($this->search_string, $this->search_set, $this->search_charset, $this->search_sort_field);
+    return array($this->search_string,
+        $this->search_set,
+        $this->search_charset,
+        $this->search_sort_field,
+        $this->search_threads,
+        );
     }
 
@@ -355 +363 @@
     {
     return iil_C_GetCapability($this->conn, strtoupper($cap));
+    }
+
+
+  /**
+   * Sets threading flag to the best supported THREAD algorithm
+   *
+   * @param  boolean  TRUE to enable and FALSE
+   * @return string   Algorithm or false if THREAD is not supported
+   * @access public
+   */
+  function set_threading($enable=false)
+    {
+    $this->threading = false;
+    
+    if ($enable) {
+      if ($this->get_capability('THREAD=REFS'))
+        $this->threading = 'REFS';
+      else if ($this->get_capability('THREAD=REFERENCES'))
+        $this->threading = 'REFERENCES';
+      else if ($this->get_capability('THREAD=ORDEREDSUBJECT'))
+        $this->threading = 'ORDEREDSUBJECT';
+      }
+      
+    return $this->threading;
     }
 
@@ -490 +522 @@
     if (empty($mailbox))
       $mailbox = $this->mailbox;
-      
+
     // count search set
-    if ($this->search_string && $mailbox == $this->mailbox && $mode == 'ALL' && !$force)
-      return count((array)$this->search_set);
-
+    if ($this->search_string && $mailbox == $this->mailbox && ($mode == 'ALL' || $mode == 'THREADS') && !$force) {
+      if ($this->search_threads)
+        return $mode == 'ALL' ? count((array)$this->search_set['depth']) : count((array)$this->search_set['tree']);
+      else
+        return count((array)$this->search_set);
+      }
+    
     $a_mailbox_cache = $this->get_cache('messagecount');
     
@@ -501 +537 @@
       return $a_mailbox_cache[$mailbox][$mode];
 
+    if ($mode == 'THREADS')
+      $count = $this->_threadcount($mailbox);
+
     // RECENT count is fetched a bit different
-    if ($mode == 'RECENT')
+    else if ($mode == 'RECENT')
        $count = iil_C_CheckForRecent($this->conn, $mailbox);
 
@@ -536 +575 @@
 
     return (int)$count;
+    }
+
+
+  /**
+   * Private method for getting nr of threads
+   *
+   * @access  private
+   * @see     rcube_imap::messagecount()
+   */
+  private function _threadcount($mailbox)
+    {
+    if (!empty($this->cache['__threads']))
+      return count($this->cache['__threads']['tree']);
+    
+    list ($thread_tree, $msg_depth, $has_children) = $this->_fetch_threads($mailbox);
+
+//    $this->update_thread_cache($mailbox, $thread_tree, $msg_depth, $has_children);
+    return count($thread_tree);  
     }
 
@@ -573 +630 @@
       return $this->_list_header_set($mailbox, $page, $sort_field, $sort_order, $slice);
 
+    if ($this->threading)
+      return $this->_list_thread_headers($mailbox, $page, $sort_field, $sort_order, $recursive, $slice);
+
     $this->_set_sort_order($sort_field, $sort_order);
 
@@ -599 +659 @@
     $a_msg_headers = array();
 
-    // use message index sort for sorting by Date (for better performance)
-    if ($this->index_sort && $this->sort_field == 'date')
+    // use message index sort as default sorting (for better performance)
+    if (!$this->sort_field)
       {
         if ($this->skip_deleted) {
@@ -675 +735 @@
 
   /**
+   * Private method for listing message headers using threads
+   *
+   * @access  private
+   * @see     rcube_imap::list_headers
+   */
+  private function _list_thread_headers($mailbox, $page=NULL, $sort_field=NULL, $sort_order=NULL, $recursive=FALSE, $slice=0)
+    {
+    $this->_set_sort_order($sort_field, $sort_order);
+
+    $page = $page ? $page : $this->list_page;
+//    $cache_key = $mailbox.'.msg';
+//    $cache_status = $this->check_cache_status($mailbox, $cache_key);
+
+    // get all threads (default sort order)
+    list ($thread_tree, $msg_depth, $has_children) = $this->_fetch_threads($mailbox);
+
+    if (empty($thread_tree))
+      return array();
+
+    $msg_index = $this->_sort_threads($mailbox, $thread_tree);
+
+    return $this->_fetch_thread_headers($mailbox, $thread_tree, $msg_depth, $has_children,
+        $msg_index, $page, $lice);
+    }
+
+
+  /**
+   * Private method for fetching threads data
+   *
+   * @param   string   Mailbox/folder name
+   * @return  array    Array with thread data
+   * @access  private
+   */
+  private function _fetch_threads($mailbox)
+    {
+    if (empty($this->cache['__threads'])) {
+      // get all threads
+      list ($thread_tree, $msg_depth, $has_children) = iil_C_Thread($this->conn,
+        $mailbox, $this->threading, $this->skip_deleted ? 'UNDELETED' : '');
+    
+      // add to internal (fast) cache
+      $this->cache['__threads'] = array();
+      $this->cache['__threads']['tree'] = $thread_tree;
+      $this->cache['__threads']['depth'] = $msg_depth;
+      $this->cache['__threads']['has_children'] = $has_children;
+      }
+
+    return array(
+      $this->cache['__threads']['tree'],
+      $this->cache['__threads']['depth'],
+      $this->cache['__threads']['has_children'],
+      );
+    }
+
+
+  /**
+   * Private method for fetching threaded messages headers
+   *
+   * @access  private
+   */
+  private function _fetch_thread_headers($mailbox, $thread_tree, $msg_depth, $has_children, $msg_index, $page, $slice=0)
+    {
+    $cache_key = $mailbox.'.msg';
+    // now get IDs for current page
+    $max = max($msg_index);
+    list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
+    $msg_index = array_slice($msg_index, $begin, $end-$begin);
+
+    if ($slice)
+      $msg_index = array_slice($msg_index, ($this->sort_order == 'DESC' ? 0 : -$slice), $slice);
+
+    if ($this->sort_order == 'DESC')
+      $msg_index = array_reverse($msg_index);
+
+    // flatten threads array
+    // @TODO: fetch children only in expanded mode
+    $all_ids = array();
+    foreach($msg_index as $root) {
+      $all_ids[] = $root;
+      if (!empty($thread_tree[$root]))
+        $all_ids = array_merge($all_ids, array_keys_recursive($thread_tree[$root]));
+      }
+
+    // fetch reqested headers from server
+    $this->_fetch_headers($mailbox, $all_ids, $a_msg_headers, $cache_key);
+
+    // return empty array if no messages found
+    if (!is_array($a_msg_headers) || empty($a_msg_headers))
+      return array();
+    
+    // use this class for message sorting
+    $sorter = new rcube_header_sorter();
+    $sorter->set_sequence_numbers($all_ids);
+    $sorter->sort_headers($a_msg_headers);
+
+    // Set depth, has_children and unread_children fields in headers
+    $this->_set_thread_flags($a_msg_headers, $msg_depth, $has_children);
+
+    return array_values($a_msg_headers);
+    }
+
+
+  /**
+   * Private method for setting threaded messages flags:
+   * depth, has_children and unread_children
+   *
+   * @param  array   Reference to headers array indexed by message ID
+   * @param  array   Array of messages depth indexed by message ID
+   * @param  array   Array of messages children flags indexed by message ID
+   * @return array   Message headers array indexed by message ID
+   * @access private
+   */
+  private function _set_thread_flags(&$headers, $msg_depth, $msg_children)
+    {
+    $parents = array();
+
+    foreach ($headers as $idx => $header) {
+      $id = $header->id;
+      $depth = $msg_depth[$id];
+      $parents = array_slice($parents, 0, $depth);
+
+      if (!empty($parents)) {
+        $headers[$idx]->parent_uid = end($parents);
+        if (!$header->seen)
+          $headers[$parents[0]]->unread_children = true;
+        }
+      array_push($parents, $header->uid);
+
+      $headers[$idx]->depth = $depth;
+      $headers[$idx]->has_children = $msg_children[$id];
+      }
+    }
+
+
+  /**
    * Private method for listing a set of message headers (search results)
    *
@@ -691 +886 @@
       return array();
 
+    // use saved messages from searching
+    if ($this->threading)
+      return $this->_list_thread_header_set($mailbox, $page, $sort_field, $sort_order, $slice);
+
     $msgs = $this->search_set;
     $a_msg_headers = array();
@@ -698 +897 @@
     $this->_set_sort_order($sort_field, $sort_order);
 
-    // quickest method
-    if ($this->index_sort && $this->search_sort_field == 'date' && $this->sort_field == 'date')
+    // quickest method (default sorting)
+    if (!$this->search_sort_field && !$this->sort_field)
       {
       if ($sort_order == 'DESC')
@@ -720 +919 @@
       return array_values($a_msg_headers);
       }
+
     // sorted messages, so we can first slice array and then fetch only wanted headers
-    if ($this->get_capability('sort') && (!$this->index_sort || $this->sort_field != 'date')) // SORT searching result
+    if ($this->get_capability('sort')) // SORT searching result
       {
       // reset search set if sorting field has been changed
@@ -749 +949 @@
       return array_values($a_msg_headers);
       }
-    else { // SEARCH searching result, need sorting
+    else { // SEARCH result, need sorting
       $cnt = count($msgs);
       // 300: experimantal value for best result
-      if (($cnt > 300 && $cnt > $this->page_size) || ($this->index_sort && $this->sort_field == 'date')) {
+      if (($cnt > 300 && $cnt > $this->page_size) || !$this->sort_field) {
         // use memory less expensive (and quick) method for big result set
         $a_index = $this->message_index('', $this->sort_field, $this->sort_order);
@@ -791 +991 @@
         }
       }
+    }
+
+
+  /**
+   * Private method for listing a set of threaded message headers (search results)
+   *
+   * @param   string   Mailbox/folder name
+   * @param   int      Current page to list
+   * @param   string   Header field to sort by
+   * @param   string   Sort order [ASC|DESC]
+   * @param   boolean  Number of slice items to extract from result array
+   * @return  array    Indexed array with message header objects
+   * @access  private
+   * @see     rcube_imap::list_header_set()
+   */
+  private function _list_thread_header_set($mailbox, $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
+    {
+    $thread_tree = $this->search_set['tree'];
+    $msg_depth = $this->search_set['depth'];
+    $has_children = $this->search_set['children'];
+    $a_msg_headers = array();
+
+    $page = $page ? $page : $this->list_page;
+    $start_msg = ($page-1) * $this->page_size;
+
+    $this->_set_sort_order($sort_field, $sort_order);
+
+    $msg_index = $this->_sort_threads($mailbox, $thread_tree, array_keys($msg_depth));
+
+    return $this->_fetch_thread_headers($mailbox, $thread_tree, $msg_depth, $has_children, $msg_index, $page, $slice=0);
     }
 
@@ -891 +1121 @@
       $this->cache[$key] = array();
       
-      // use message index sort for sorting by Date
-      if ($this->index_sort && $this->sort_field == 'date')
+      // use message index sort as default sorting
+      if (!$this->sort_field)
         {
         $msgs = $this->search_set;
@@ -943 +1173 @@
       }
 
-    // use message index sort for sorting by Date
-    if ($this->index_sort && $this->sort_field == 'date')
+    // use message index sort as default sorting
+    if (!$this->sort_field)
       {
       if ($this->skip_deleted) {
@@ -1082 +1312 @@
       }
 
-    $this->set_search_set($str, $results, $charset, $sort_field);
+    $this->set_search_set($str, $results, $charset, $sort_field, (bool) $this->threading);
 
     return $results;
@@ -1102 +1332 @@
       $criteria = 'UNDELETED '.$criteria;
 
-    if ($sort_field && $this->get_capability('sort') && (!$this->index_sort || $sort_field != 'date')) {
+    if ($this->threading) {
+      list ($thread_tree, $msg_depth, $has_children) = iil_C_Thread($this->conn,
+            $mailbox, $this->threading, $criteria, $charset);
+
+      $a_messages = array(
+        'tree'  => $thread_tree,
+        'depth' => $msg_depth,
+        'children' => $has_children
+        );
+      }
+    else if ($sort_field && $this->get_capability('sort')) {
       $charset = $charset ? $charset : $this->default_charset;
       $a_messages = iil_C_Sort($this->conn, $mailbox, $sort_field, $criteria, FALSE, $charset);
@@ -1115 +1355 @@
     
         // I didn't found that SEARCH always returns sorted IDs
-        if ($this->index_sort && $this->sort_field == 'date')
+        if (!$this->sort_field)
           sort($a_messages);
         }
@@ -1129 +1369 @@
   
   /**
+   * Sort thread
+   *
+   * @param  array Unsorted thread tree (iil_C_Thread() result)
+   * @param  array Message IDs if we know what we need (e.g. search result)
+   * @return array Sorted roots IDs
+   * @access private
+   */
+  private function _sort_threads($mailbox, $thread_tree, $ids=NULL)
+    {
+    // THREAD=ORDEREDSUBJECT:   sorting by sent date of root message
+    // THREAD=REFERENCES:       sorting by sent date of root message
+    // THREAD=REFS:             sorting by the most recent date in each thread
+    // default sorting
+    if (!$this->sort_field || ($this->sort_field == 'date' && $this->threading == 'REFS')) {
+        return array_keys($thread_tree);
+      }
+    // here we'll implement REFS sorting, for performance reason
+    else { // ($sort_field == 'date' && $this->threading != 'REFS')
+      // use SORT command
+      if ($this->get_capability('sort')) {
+        $a_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field,
+            !empty($ids) ? $ids : ($this->skip_deleted ? 'UNDELETED' : ''));
+        }
+      else {
+        // fetch specified headers for all messages and sort them
+        $a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, !empty($ids) ? $ids : "1:*",
+            $this->sort_field, $this->skip_deleted);
+        asort($a_index); // ASC
+        $a_index = array_values($a_index);
+        }
+
+        return $this->_sort_thread_refs($thread_tree, $a_index);
+      }
+/*
+    // other sorting, we'll sort roots only
+    else {
+      // use SORT command for root messages sorting
+      if ($this->get_capability('sort')) {
+        $msg_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field, array_keys($thread_tree));
+        }
+      else {
+        // fetch specified headers for all root messages and sort
+        $a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox,
+            array_keys($thread_tree), $this->sort_field, $this->skip_deleted);
+        asort($a_index); // ASC
+        $msg_index = array_keys($a_index);
+        }
+      }
+*/
+    return array();
+    }
+
+
+  /**
+   * THREAD=REFS sorting implementation
+   *
+   * @param  array   Thread tree array (message identifiers as keys)
+   * @param  array   Array of sorted message identifiers
+   * @return array   Array of sorted roots messages
+   * @access private
+   */
+  private function _sort_thread_refs($tree, $index)
+    {
+    if (empty($tree))
+      return array();
+    
+    $index = array_combine(array_values($index), $index);
+
+    // assign roots
+    foreach ($tree as $idx => $val) {
+      $index[$idx] = $idx;
+      if (!empty($val)) {
+        $idx_arr = array_keys_recursive($tree[$idx]);
+        foreach ($idx_arr as $subidx)
+          $index[$subidx] = $idx;
+        }
+      }
+
+    $index = array_values($index);  
+
+    // create sorted array of roots
+    $msg_index = array();
+    if ($this->sort_order != 'DESC') {
+      foreach ($index as $idx)
+        if (!isset($msg_index[$idx]))
+          $msg_index[$idx] = $idx;
+      $msg_index = array_values($msg_index);
+      }
+    else {
+      for ($x=count($index)-1; $x>=0; $x--)
+        if (!isset($msg_index[$index[$x]]))
+          $msg_index[$index[$x]] = $index[$x];
+      $msg_index = array_reverse($msg_index);
+      }
+
+    return $msg_index;
+    }
+
+
+  /**
    * Refresh saved search set
    *
@@ -1136 +1476 @@
     {
     if (!empty($this->search_string))
-      $this->search_set = $this->search('', $this->search_string, $this->search_charset, $this->search_sort_field);
+      $this->search_set = $this->search('', $this->search_string, $this->search_charset,
+            $this->search_sort_field, $this->search_threads);
       
     return $this->get_search_set();
@@ -2365 +2706 @@
     {
     $cache_key = "$key:$from:$to:$sort_field:$sort_order";
-    $db_header_fields = array('idx', 'uid', 'subject', 'from', 'to', 'cc', 'date', 'size');
     
     $config = rcmail::get_instance()->config;
 
-    // use idx sort for sorting by Date with index_sort=true or for unknown field
-    if (($sort_field == 'date' && $this->index_sort)
-      || !in_array($sort_field, $db_header_fields)) {
+    // use idx sort as default sorting
+    if (!$sort_field || !in_array($sort_field, $this->db_header_fields)) {
       $sort_field = 'idx';
       }
@@ -2448 +2787 @@
       return $sa_message_index[$key];
 
-    // use idx sort for sorting by Date with index_sort=true
-    if ($sort_field == 'date' && $this->index_sort)
+    // use idx sort as default
+    if (!$sort_field || !in_array($sort_field, $this->db_header_fields))
       $sort_field = 'idx';
     

branches/devel-threads/program/include/rcube_shared.inc

@@ -682 +682 @@
 
 /**
+ * Get all keys from array (recursive)
+ * 
+ * @param array Input array
+ * @return array
+ */
+function array_keys_recursive($array)
+{
+  $keys = array();
+  
+  if (!empty($array))
+    foreach ($array as $key => $child) {
+      $keys[] = $key;
+      if ($children = array_keys_recursive($child))
+        $keys = array_merge($keys, $children);
+    }
+  return $keys;
+}
+
+
+/**
  * mbstring replacement functions
  */

branches/devel-threads/program/js/app.js

@@ -163 +163 @@
         if (this.gui_objects.messagelist)
           {
-          this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {multiselect:true, draggable:true, keyboard:true, dblclick_time:this.dblclick_time});
+          this.message_list = new rcube_list_widget(this.gui_objects.messagelist,
+            {multiselect:true, multiexpand:true, draggable:true, keyboard:true, dblclick_time:this.dblclick_time});
           this.message_list.row_init = function(o){ p.init_message_row(o); };
           this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
@@ -180 +181 @@
           else
             this.message_list.focus();
+
+          switch (this.env.autoexpand_threads) {
+            case 2: this.message_list.expand_unread(); break;
+            case 1: this.message_list.expand_all(); break;
+            }
+          this.message_list.expand(null);
           }
-          
+
         if (this.env.coltypes)
           this.set_message_coltypes(this.env.coltypes);
@@ -244 +251 @@
           }
 
-        if (this.env.messagecount)
+        if (this.env.messagecount) {
           this.enable_command('select-all', 'select-none', 'expunge', true);
+          this.enable_command('expand-all', 'collapse-all', this.env.threading);
+        }
 
         if (this.purge_mailbox_test())
@@ -334 +343 @@
         }
         else if (this.env.action=='folders')
-          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);
+          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', 'enable-threading', 'disable-threading', true);
 
         if (this.gui_objects.identitieslist)
@@ -425 +434 @@
       row.flagged = this.env.messages[uid].flagged ? true : false;
       row.forwarded = this.env.messages[uid].forwarded ? true : false;
+      row.has_children = this.env.messages[uid].has_children ? true : false;
+      row.depth = this.env.messages[uid].depth ? this.env.messages[uid].depth : 0;
+      row.unread_children = this.env.messages[uid].unread_children;
+      row.parent_uid = this.env.messages[uid].parent_uid;
+//      row.expanded = this.env.autoexpand && row.has_children ? true : false;
       }
 
@@ -441 +455 @@
       var found;
       if((found = find_in_array('flag', this.env.coltypes)) >= 0)
-        this.set_env('flagged_col', found+1);
+        this.set_env('flagged_col', found);
       }
 
@@ -454 +468 @@
       
     this.triggerEvent('insertrow', { uid:uid, row:row });
+
+    // expando is handled here rather than in rcube_list_widget so that the
+    // expanded state may be persisted in this.env.messages
+    var expando = document.getElementById('rcmexpando' + uid);
+    if (expando != null) 
+      {
+      var p = this;
+      expando.onmousedown = function(e) { return p.message_list.expand_row(e, uid); };
+      }
   };
 
@@ -617 +640 @@
         var sort_order, sort_col = props;
 
-        if (this.env.sort_col==sort_col)
+        if (this.env.sort_col==sort_col)
           sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
-        else
+        else
           sort_order = 'ASC';
-        
+                     
         // set table header class
         $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
-        $('#rcm'+sort_col).addClass('sorted'+sort_order);
+        if (sort_col)
+          $('#rcm'+sort_col).addClass('sorted'+sort_order);
 
         // save new sort properties
@@ -744 +768 @@
         // mail task
         if (this.task=='mail')
-          this.delete_messages();
+        {
+          if (this.delete_messages() && this.env.threading)
+          {
+            // It is very hard to re-thread message list if some messages were removed from
+            // the middle of a thread (we need to fully implement RFC5256 algorythm, because
+            // we are a "disconnected client" if we re-threading without a servers help)
+            // Reload message list
+            this.list_mailbox(this.env.mailbox, this.env.current_page);
+          }
+        }
         // addressbook task
         else if (this.task=='addressbook')
@@ -758 +791 @@
       case 'moveto':
         if (this.task == 'mail')
+        {
           this.move_messages(props);
+          if (this.env.threadeding)
+          {
+            // The same as for 'delete'
+            this.list_mailbox(this.env.mailbox, this.env.current_page);
+          }
+        }
         else if (this.task == 'addressbook' && this.drag_active)
           this.copy_contact(null, props);
@@ -846 +886 @@
       case 'select-none':
         this.message_list.clear_selection();
+        break;
+
+      case 'expand-all':
+        this.message_list.expand_all();
+        break;
+
+      case 'collapse-all':
+        this.message_list.collapse_all();
         break;
 
@@ -1109 +1157 @@
         this.unsubscribe_folder(props);
         break;
-        
+
+      case 'enable-threading':
+        this.enable_threading(props);
+        break;
+
+      case 'disable-threading':
+        this.disable_threading(props);
+        break;
+
       case 'create-folder':
         this.create_folder(props);
@@ -1443 +1499 @@
       clearTimeout(this.preview_timer);
 
-    var selected = list.selection.length==1;
+    var selected = list.get_single_selection() != null;
 
     // Hide certain command buttons when Drafts folder is selected
@@ -1547 +1603 @@
         {
         this.set_message(id, 'unread', false);
+        this.update_parents(id, 'read');
         if (this.env.unread_counts[this.env.mailbox])
           {
@@ -1732 +1789 @@
   };
 
+  // update parents in a thread
+  this.update_parents = function(uid, flag)
+  {
+    var r = this.message_list.rows[uid];
+    if (r.parent_uid) {
+      var p = this.message_list.rows[r.parent_uid];
+      if (flag == 'read' && p.unread_children > 0) {
+        p.unread_children--;
+      } else if (flag == 'unread') {
+        p.unread_children++;
+      } else {
+        return;
+      }
+      this.set_message_icon(r.parent_uid);
+      this.update_parents(r.parent_uid, flag);
+    }
+  };
+
   // set message icon
   this.set_message_icon = function(uid)
@@ -1740 +1815 @@
     if (!rows[uid])
       return false;
-
-    if (rows[uid].deleted && this.env.deletedicon)
+    if (!rows[uid].unread && rows[uid].unread_children > 0 && this.env.unreadchildrenicon) {
+      icn_src = this.env.unreadchildrenicon;
+    }
+    else if (rows[uid].deleted && this.env.deletedicon)
       icn_src = this.env.deletedicon;
     else if (rows[uid].replied && this.env.repliedicon)
@@ -1789 +1866 @@
       rows[uid].flagged = status;
 
-    this.env.messages[uid] = rows[uid];
+//    this.env.messages[uid] = rows[uid];
     }
 
@@ -1874 +1951 @@
 
     // if config is set to flag for deletion
-    if (this.env.flag_for_deletion)
+    if (this.env.flag_for_deletion) {
       this.mark_message('delete');
+      return false;
+      }
     // if there isn't a defined trash mailbox or we are in it
     else if (!this.env.trash_mailbox || String(this.env.mailbox).toLowerCase() == String(this.env.trash_mailbox).toLowerCase()) 
@@ -1890 +1969 @@
         this.move_messages(this.env.trash_mailbox);
       }
+
+    return true;
   };
 
@@ -1942 +2023 @@
     var a_uids = new Array();
     var r_uids = new Array();
-    var selection = this.message_list ? this.message_list.get_selection() : new Array();
+    var selection = this.message_list ? this.message_list.get_selection('mark') : new Array();
 
     if (uid)
@@ -2002 +2083 @@
 
     this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+
+    for (var i=0; i<a_uids.length; i++)
+      this.update_parents(a_uids[i], flag);
   };
 
@@ -2119 +2203 @@
       }
   };
-  
+
   
   /*********************************************************/
@@ -3469 +3553 @@
       this.http_post('unsubscribe', '_mbox='+urlencode(folder));
     };
-    
+
+  this.enable_threading = function(folder)
+    {
+    if (folder)
+      this.http_post('enable-threading', '_mbox='+urlencode(folder));
+    };
+
+  this.disable_threading = function(folder)
+    {
+    if (folder)
+      this.http_post('disable-threading', '_mbox='+urlencode(folder));
+    };
+    
+
   // helper method to find a specific mailbox row ID
   this.get_folder_row_id = function(folder)
@@ -3785 +3882 @@
       {
       col = this.coltypes[n];
-      if ((cell = thead.rows[0].cells[n+1]) && (col=='from' || col=='to'))
+      if ((cell = thead.rows[0].cells[n]) && (col=='from' || col=='to'))
         {
         // if we have links for sorting, it's a bit more complicated...
@@ -3800 +3897 @@
         }
       else if (col == 'subject' && this.message_list)
-        this.message_list.subject_col = n+1;
+        this.message_list.subject_col = n;
       }
   };
@@ -3818 +3915 @@
     var even = rowcount%2;
     
-    this.env.messages[uid] = {
+    var message = this.env.messages[uid] = {
       deleted: flags.deleted?1:0,
       replied: flags.replied?1:0,
       unread: flags.unread?1:0,
       forwarded: flags.forwarded?1:0,
-      flagged:flags.flagged?1:0
-    };
+      flagged: flags.flagged?1:0,
+      has_children: flags.has_children?1:0,
+      depth: flags.depth?flags.depth:0,
+      unread_children: flags.unread_children,
+      parent_uid: flags.parent_uid,
+    }
 
     var css_class = 'message'
@@ -3839 +3940 @@
     
     var icon = this.env.messageicon;
-    if (flags.deleted && this.env.deletedicon)
+    if (!flags.unread && flags.unread_children > 0 && this.env.unreadchildrenicon)
+      icon = this.env.unreadchildrenicon;
+    else if (flags.deleted && this.env.deletedicon)
       icon = this.env.deletedicon;
     else if (flags.replied && this.env.repliedicon)
@@ -3852 +3955 @@
     else if(flags.unread && this.env.unreadicon)
       icon = this.env.unreadicon;
-    
-    // add icon col
-    var col = document.createElement('td');
-    col.className = 'icon';
-    col.innerHTML = icon ? '<img src="'+icon+'" alt="" />' : '';
-    row.appendChild(col);
-                  
+    var tree = '';
+
+    if (this.env.threading)
+      {
+      // XXX: This assumes that div width is hardcoded to 15px,
+      // Chris did it a bit differently in an original patch, he was adding so much divs as depth is
+      // I replaced logic in list.js:drag_mouse_move() so subject text is picked defferently, so
+      // either method of could be used (that was only the one problem I noted with these added divs).
+      // The same is true for an offline list (program/steps/mail/func.inc:rcmail_message_list()).
+      // Bubble
+      var width = message.depth * 15;
+      if (width)
+        tree += '<div id="rcmtab' + uid + '" class="branch" style="width:' + width + 'px;">&nbsp</div>';
+      if (message.has_children && !message.depth)
+        tree += '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">&nbsp;</div>';
+      else
+        tree += '<div class="leaf">&nbsp;</div>';
+      if (message.depth)
+        row.style.display = 'none';
+      }
+
+    tree += icon ? '<img src="'+icon+'" alt="" />' : '';
+
     // add each submitted col
     for (var n = 0; n < this.coltypes.length; n++) {
@@ -3864 +3983 @@
       col = document.createElement('td');
       col.className = String(c).toLowerCase();
-            
-      if (c=='flag') {
+
+      var html;
+      if (c=='flag')
+        {
         if (flags.flagged && this.env.flaggedicon)
-          col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
+          html = '<img src="'+this.env.flaggedicon+'" alt="" />';
         else if(!flags.flagged && this.env.unflaggedicon)
-          col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
-        }
+          html = '<img src="'+this.env.unflaggedicon+'" alt="" />';
+      }
       else if (c=='attachment')
-        col.innerHTML = (attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '&nbsp;');
+        html = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '&nbsp;';
       else
-        col.innerHTML = cols[c];
+        html = cols[c];
+        if (n == 0)
+          html = tree + html;
+      col.innerHTML = html;
 
       row.appendChild(col);
@@ -3888 +4012 @@
       }
     };
+
 
   // messages list handling in background (for performance)
@@ -4238 +4363 @@
           this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 
             'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment', 
-            'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
+            'purge', 'expunge', 'select-all', 'select-none', 'sort', 'expand-all',
+            'colapse-all', false);
         }
         break;
@@ -4250 +4376 @@
           this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
           this.enable_command('purge', this.purge_mailbox_test());
-          
+         
+          this.enable_command('expand-all', 'collapse-all', this.env.threading && this.env.messagecount);
+
           if (response.action == 'list')
             this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
@@ -4381 +4509 @@
 }  // end object rcube_webmail
 
-
 // copy event engine prototype
 rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;

branches/devel-threads/program/js/list.js

@@ -38 +38 @@
   this.shiftkey = false;
   this.multiselect = false;
+  this.multiexpand = false;
   this.multi_selecting = false;
   this.draggable = false;
@@ -77 +78 @@
     {
       row = this.list.tBodies[0].childNodes[r];
-      while (row && (row.nodeType != 1 || row.style.display == 'none'))
+      while (row && row.nodeType != 1)
       {
         row = row.nextSibling;
@@ -320 +321 @@
 
 
+expand_row: function(e, id)
+{
+  var row = this.rows[id];
+  var evtarget = rcube_event.get_target(e);
+  var mod_key = rcube_event.get_modifier(e);
+  // Don't select this message
+  this.dont_select = true;
+  // Don't treat double click on the expando as double click on the message.
+  row.clicked = 0;
+  if (row.expanded)
+  {
+    evtarget.className = "collapsed";
+    if (mod_key == CONTROL_KEY || this.multiexpand)
+      this.collapse_all(row);
+    else
+      this.collapse(row);
+  }
+  else
+  {
+    evtarget.className = "expanded";
+    if (mod_key == CONTROL_KEY || this.multiexpand)
+      this.expand_all(row);
+    else
+     this.expand(row);
+  }
+},
+
+collapse: function(row)
+{
+  row.expanded = false;
+  var depth = row.depth;
+  var new_row = row ? row.obj.nextSibling : null;
+  var r;
+
+  while (new_row)
+  {
+    if (new_row.nodeType == 1)
+    {
+      var r = this.rows[new_row.uid];
+      if (r && r.depth <= depth)
+        break;
+      new_row.style.display = 'none';
+    }
+    new_row = new_row.nextSibling;
+  }
+
+  return false;
+},
+
+
+expand: function(row)
+{
+  var depth, new_row;
+  var last_expanded_parent_depth;
+
+  if (row)
+  {
+    row.expanded = true;
+    depth = row.depth;
+    new_row = row.obj.nextSibling;
+  }
+  else
+  {
+    var tbody = this.list.tBodies[0];
+    new_row = tbody.firstChild;
+    depth = 0;
+    last_expanded_parent_depth = 0;
+  }
+
+  while (new_row)
+  {
+    if (new_row.nodeType == 1)
+    {
+      var r = this.rows[new_row.uid];
+      if (r)
+      {
+        if (row && r.depth <= depth)
+          break;
+        if (r.parent_uid)
+        {
+          var p = this.rows[r.parent_uid];
+          if (p && p.expanded)
+          {
+            if ((row && p == row) || last_expanded_parent_depth >= p.depth - 1)
+            {
+              last_expanded_parent_depth = p.depth;
+              new_row.style.display = 'table-row';
+              new_row.expanded = true;
+            }
+          }
+          else
+            if (row && (! p || p.depth <= depth))
+              break;
+        }
+      }
+    }
+    new_row = new_row.nextSibling;
+  }
+
+  return false;
+},
+
+
+collapse_all: function(row)
+{
+  var depth, new_row;
+  var r;
+
+  if (row)
+  {
+    row.expanded = false;
+    depth = row.depth;
+    new_row = row.obj.nextSibling;
+    // don't collapse sub-root tree in multiexpand mode 
+    if (depth && this.multiexpand)
+      return false; 
+  }
+  else
+  {
+    var tbody = this.list.tBodies[0];
+    new_row = tbody.firstChild;
+    depth = 0;
+  }
+
+  while (new_row) {
+    if (new_row.nodeType == 1)
+    {
+      var r = this.rows[new_row.uid];
+      if (row && r.depth <= depth)
+        break;
+      if (row || r.depth)
+        new_row.style.display = 'none';
+      if (r.has_children) {
+        r.expanded = false;
+        var expando = document.getElementById('rcmexpando' + r.uid);
+        if (expando)
+          expando.className = 'collapsed';
+      }
+    }
+    new_row = new_row.nextSibling;
+  }
+
+  return false;
+},
+
+expand_all: function(row)
+{
+  var depth, new_row;
+  var r;
+
+  if (row)
+  {
+    row.expanded = true;
+    depth = row.depth;
+    new_row = row.obj.nextSibling;
+  }
+  else
+  {
+    var tbody = this.list.tBodies[0];
+    new_row = tbody.firstChild;
+    depth = 0;
+  }
+
+  while (new_row)
+  {
+    if (new_row.nodeType == 1)
+    {
+      var r = this.rows[new_row.uid];
+      if (row && r.depth <= depth)
+        break;
+      new_row.style.display = 'table-row';
+      if (r.has_children)
+      {
+        r.expanded = true;
+        var expando = document.getElementById('rcmexpando' + r.uid);
+        if (expando)
+          expando.className = 'expanded';
+      }
+    }
+    new_row = new_row.nextSibling;
+  }
+  return false;
+},
+
+expand_unread: function()
+{
+  var tbody = this.list.tBodies[0];
+  new_row = tbody.firstChild;
+  var r;
+  var p;
+
+  while (new_row) {
+    if (new_row.nodeType == 1)
+    {
+      r = this.rows[new_row.uid];
+      p = this.rows[r.parent_uid];
+      if ((r.has_children && r.unread_children > 0) || (!r.has_children && r.unread))
+      {
+        new_row.style.display = 'table-row';
+        if (r.has_children)
+        {
+          r.expanded = true;
+          var expando = document.getElementById('rcmexpando' + r.uid);
+          if (expando)
+            expando.className = 'expanded';
+        }
+      }
+      else if (p && p.unread_children > 0)
+      {
+        // Show all neighbours with the same parent at the same depth level (parent is expanded)
+        new_row.style.display = 'table-row';
+      }
+    }
+    new_row = new_row.nextSibling;
+  }
+  return false;
+},
+
+
 /**
  * get first/next/previous/last rows that are not hidden
@@ -496 +716 @@
     if ((this.rows[n].obj.rowIndex >= i) && (this.rows[n].obj.rowIndex <= j))
     {
-      if (!this.in_selection(n))
+      if (!this.in_selection(n)) {
         this.highlight_row(n, true);
+      }
     }
     else
     {
-      if  (this.in_selection(n) && !control)
+      if  (this.in_selection(n) && !control) {
         this.highlight_row(n, true);
+      }
     }
   }
@@ -517 +739 @@
       return true;
 
-  return false;    
+  return false;
 },
 
@@ -568 +790 @@
   
   for (var n in this.rows)
-    this.highlight_row(n, true);    
+    this.highlight_row(n, true);
 
   // trigger event if selection changed
@@ -686 +908 @@
       rcube_event.cancel(e);
       return this.use_arrow_key(keyCode, mod_key);
+    case 61:
+    case 107: // Plus sign on a numeric keypad (fc11 + firefox 3.5.2)
+    case 109:
+    case 32:
+      // Stop propagation
+      rcube_event.cancel(e);
+      var ret = this.use_plusminus_key(keyCode, mod_key);
+      this.key_pressed = keyCode;
+      this.triggerEvent('keypress');
+      return ret;
     default:
       this.shiftkey = e.shiftKey;
@@ -713 +945 @@
     case 63233:
     case 63232:
+    case 61:
+    case 107:
+    case 109:
+    case 32:
       if (!rcube_event.get_modifier(e) && this.focused)
         return rcube_event.cancel(e);
@@ -747 +983 @@
 
 /**
+ * Special handling method for +/- keys
+ */
+use_plusminus_key: function(keyCode, mod_key)
+{
+  var selected_row = this.rows[this.last_selected];
+  if (!selected_row)
+    return;
+
+  if (keyCode == 32)
+    keyCode = selected_row.expanded ? 109 : 61;
+  if (keyCode == 61 || keyCode == 107)
+    if (mod_key == CONTROL_KEY || this.multiexpand)
+      this.expand_all(selected_row);
+    else
+     this.expand(selected_row);
+  else
+    if (mod_key == CONTROL_KEY || this.multiexpand)
+      this.collapse_all(selected_row);
+    else
+      this.collapse(selected_row);
+
+  var expando = document.getElementById('rcmexpando' + selected_row.uid);
+  if (expando)
+    expando.className = selected_row.expanded?'expanded':'collapsed';
+
+  return false;
+},
+
+
+/**
  * Try to scroll the list to make the specified row visible
  */
@@ -780 +1046 @@
       this.draglayer = $('<div>').attr('id', 'rcmdraglayer').css({ position:'absolute', display:'none', 'z-index':2000 }).appendTo(document.body);
 
-    // get subjects of selectedd messages
+    // get subjects of selected messages
     var names = '';
-    var c, i, node, subject, obj;
+    var c, i, subject, obj;
     for(var n=0; n<this.selection.length; n++)
     {
@@ -791 +1057 @@
       }
 
-      if (this.rows[this.selection[n]].obj)
+      if (obj = this.rows[this.selection[n]].obj)
       {
-        obj = this.rows[this.selection[n]].obj;
         subject = '';
 
-        for(c=0, i=0; i<obj.childNodes.length; i++)
+        for (c=0, i=0; i<obj.childNodes.length; i++)
         {
-          if (obj.childNodes[i].nodeName == 'TD')
+          if (obj.childNodes[i].nodeName == 'TD')
           {
-            if (((node = obj.childNodes[i].firstChild) && (node.nodeType==3 || node.nodeName=='A')) &&
-              (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c)))
-            {
-              if (n == 0) {
-                if (node.nodeType == 3)
-                  this.drag_start_pos = $(obj.childNodes[i]).offset();
-                else
-                  this.drag_start_pos = $(node).offset();
+            if (n == 0)
+              this.drag_start_pos = $(obj.childNodes[i]).offset();
+
+            if (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c))
+            {
+              var node, tmp_node, nodes = obj.childNodes[i].childNodes;
+              // find text node
+              for (m=0; m<nodes.length; m++) {
+                if ((tmp_node = obj.childNodes[i].childNodes[m]) && (tmp_node.nodeType==3 || tmp_node.nodeName=='A'))
+                  node = tmp_node;
               }
+              
+              if (!node)
+                break;
+
               subject = node.nodeType==3 ? node.data : node.innerHTML;
               // remove leading spaces

branches/devel-threads/program/lib/imap.inc

@@ -174 +174 @@
         var $junk = false;
         var $flagged = false;
+        var $has_children = false;
+        var $depth = 0;
+        var $unread_children = 0;
         var $others = array();
-}
-
-/**
- * @todo Change class vars to public/private
- */
-class iilThreadHeader
-{
-        var $id;
-        var $sbj;
-        var $irt;
-        var $mid;
 }
 
@@ -865 +857 @@
         $fields = array('ARRIVAL' => 1,'CC' => 1,'DATE' => 1,
         'FROM' => 1, 'SIZE' => 1, 'SUBJECT' => 1, 'TO' => 1);
-        
+
         if (!$fields[$field]) {
             return false;
@@ -877 +869 @@
         $is_uid = $is_uid ? 'UID ' : '';
         
-        if (!empty($add)) {
+        // message IDs
+        if (is_array($add))
+                $add = iil_CompressMessageSet(join(',', $add));
+
+        if (!empty($add))
             $add = " $add";
-        }
 
         $command  = 's ' . $is_uid . 'SORT (' . $field . ') ';
@@ -909 +904 @@
 function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field='', $skip_deleted=true) {
 
-        list($from_idx, $to_idx) = explode(':', $message_set);
-        if (empty($message_set) ||
-                (isset($to_idx) && $to_idx != '*' && (int)$from_idx > (int)$to_idx)) {
-                return false;
-        }
-
+        if (is_array($message_set)) {
+                if (!($message_set = iil_CompressMessageSet(join(',', $message_set))))
+                        return false;
+        } else {
+                list($from_idx, $to_idx) = explode(':', $message_set);
+                if (empty($message_set) ||
+                        (isset($to_idx) && $to_idx != '*' && (int)$from_idx > (int)$to_idx)) {
+                        return false;
+                }
+        }
+        
         $index_field = empty($index_field) ? 'DATE' : strtoupper($index_field);
         
@@ -1012 +1012 @@
         } while (!iil_StartsWith($line, $key, true));
 
-/*
-        //check number of elements...
-        if (is_numeric($from_idx) && is_numeric($to_idx)) {
-                //count how many we should have
-                $should_have = $to_idx - $from_idx + 1;
-                
-                //if we have less, try and fill in the "gaps"
-                if (count($result) < $should_have) {
-                        for ($i=$from_idx; $i<=$to_idx; $i++) {
-                                if (!isset($result[$i])) {
-                                        $result[$i] = '';
-                                }
-                        }
-                }
-        }
-*/
         return $result; 
 }
@@ -1103 +1087 @@
 }
 
-function iil_SortThreadHeaders($headers, $index_a, $uids) {
-        asort($index_a);
-        $result = array();
-        foreach ($index_a as $mid=>$foobar) {
-                $uid = $uids[$mid];
-                $result[$uid] = $headers[$uid];
-        }
-        return $result;
-}
-
-function iil_C_FetchThreadHeaders(&$conn, $mailbox, $message_set) {
-        global $clock;
-        global $index_a;
-        
-        list($from_idx, $to_idx) = explode(':', $message_set);
-        if (empty($message_set) || (isset($to_idx)
-        && (int)$from_idx > (int)$to_idx)) {
-                return false;
-        }
-
-        $result = array();
-        $uids   = iil_C_FetchUIDs($conn, $mailbox);
-        $debug  = false;
-        
-        $message_set = iil_CompressMessageSet($message_set);
-    
-        /* if we're missing any, get them */
-        if ($message_set) {
-                /* FETCH date,from,subject headers */
-                $key        = 'fh';
-                $fp         = $conn->fp;
-                $request    = $key . " FETCH $message_set ";
-                $request   .= "(BODY.PEEK[HEADER.FIELDS (SUBJECT MESSAGE-ID IN-REPLY-TO)])";
-                $mid_to_id  = array();
-                if (!iil_PutLine($fp, $request)) {
-                    return false;
-                }
-                do {
-                        $line = chop(iil_ReadLine($fp, 1024));
-                        if ($debug) {
-                            echo $line . "\n";
-                        }
-                        if (preg_match('/\{[0-9]+\}$/', $line)) {
-                                $a       = explode(' ', $line);
-                                $new = array();
-
-                                $new_thhd = new iilThreadHeader;
-                                $new_thhd->id = $a[1];
-                                do {
-                                        $line = chop(iil_ReadLine($fp, 1024), "\r\n");
-                                        if (iil_StartsWithI($line, 'Message-ID:')
-                                                || (iil_StartsWithI($line,'In-Reply-To:'))
-                                                || (iil_StartsWithI($line,'SUBJECT:'))) {
-
-                                                $pos        = strpos($line, ':');
-                                                $field_name = substr($line, 0, $pos);
-                                                $field_val  = substr($line, $pos+1);
-
-                                                $new[strtoupper($field_name)] = trim($field_val);
-
-                                        } else if (preg_match('/^\s+/', $line)) {
-                                                $new[strtoupper($field_name)] .= trim($line);
-                                        }
-                                } while ($line[0] != ')');
-                
-                                $new_thhd->sbj = $new['SUBJECT'];
-                                $new_thhd->mid = substr($new['MESSAGE-ID'], 1, -1);
-                                $new_thhd->irt = substr($new['IN-REPLY-TO'], 1, -1);
-                                
-                                $result[$uids[$new_thhd->id]] = $new_thhd;
-                        }
-                } while (!iil_StartsWith($line, 'fh'));
-        }
-        
-        /* sort headers */
-        if (is_array($index_a)) {
-                $result = iil_SortThreadHeaders($result, $index_a, $uids);      
-        }
-        
-        //echo 'iil_FetchThreadHeaders:'."\n";
-        //print_r($result);
-        
-        return $result;
-}
-
-function iil_C_BuildThreads2(&$conn, $mailbox, $message_set, &$clock) {
-        global $index_a;
-
-        list($from_idx, $to_idx) = explode(':', $message_set);
-        if (empty($message_set) || (isset($to_idx)
-                && (int)$from_idx > (int)$to_idx)) {
-                return false;
-        }
-    
-        $result    = array();
-        $roots     = array();
-        $root_mids = array();
-        $sub_mids  = array();
-        $strays    = array();
-        $messages  = array();
-        $fp        = $conn->fp;
-        $debug     = false;
-        
-        $sbj_filter_pat = '/[a-z]{2,3}(\[[0-9]*\])?:(\s*)/i';
-        
-        /*  Do "SELECT" command */
-        if (!iil_C_Select($conn, $mailbox)) {
-            return false;
-        }
-    
-        /* FETCH date,from,subject headers */
-        $mid_to_id = array();
-        $messages  = array();
-        $headers   = iil_C_FetchThreadHeaders($conn, $mailbox, $message_set);
-        if ($clock) {
-            $clock->register('fetched headers');
-        }
-    
-        if ($debug) {
-            print_r($headers);
-        }
-    
-        /* go through header records */
-        foreach ($headers as $header) {
-                //$id = $header['i'];
-                //$new = array('id'=>$id, 'MESSAGE-ID'=>$header['m'], 
-                //                      'IN-REPLY-TO'=>$header['r'], 'SUBJECT'=>$header['s']);
-                $id  = $header->id;
-                $new = array('id' => $id, 'MESSAGE-ID' => $header->mid, 
-                        'IN-REPLY-TO' => $header->irt, 'SUBJECT' => $header->sbj);
-
-                /* add to message-id -> mid lookup table */
-                $mid_to_id[$new['MESSAGE-ID']] = $id;
-                
-                /* if no subject, use message-id */
-                if (empty($new['SUBJECT'])) {
-                    $new['SUBJECT'] = $new['MESSAGE-ID'];
-                }
-        
-                /* if subject contains 'RE:' or has in-reply-to header, it's a reply */
-                $sbj_pre = '';
-                $has_re = false;
-                if (preg_match($sbj_filter_pat, $new['SUBJECT'])) {
-                    $has_re = true;
-                }
-                if ($has_re || $new['IN-REPLY-TO']) {
-                    $sbj_pre = 'RE:';
-                }
-        
-                /* strip out 're:', 'fw:' etc */
-                if ($has_re) {
-                    $sbj = preg_replace($sbj_filter_pat, '', $new['SUBJECT']);
-                } else {
-                    $sbj = $new['SUBJECT'];
-                }
-                $new['SUBJECT'] = $sbj_pre.$sbj;
-                
-                
-                /* if subject not a known thread-root, add to list */
-                if ($debug) {
-                    echo $id . ' ' . $new['SUBJECT'] . "\t" . $new['MESSAGE-ID'] . "\n";
-                }
-                $root_id = $roots[$sbj];
-                
-                if ($root_id && ($has_re || !$root_in_root[$root_id])) {
-                        if ($debug) {
-                            echo "\tfound root: $root_id\n";
-                        }
-                        $sub_mids[$new['MESSAGE-ID']] = $root_id;
-                        $result[$root_id][]           = $id;
-                } else if (!isset($roots[$sbj]) || (!$has_re && $root_in_root[$root_id])) {
-                        /* try to use In-Reply-To header to find root 
-                                unless subject contains 'Re:' */
-                        if ($has_re&&$new['IN-REPLY-TO']) {
-                                if ($debug) {
-                                    echo "\tlooking: ".$new['IN-REPLY-TO']."\n";
-                                }
-                                //reply to known message?
-                                $temp = $sub_mids[$new['IN-REPLY-TO']];
-                                
-                                if ($temp) {
-                                        //found it, root:=parent's root
-                                        if ($debug) {
-                                            echo "\tfound parent: ".$new['SUBJECT']."\n";
-                                        }
-                                        $result[$temp][]              = $id;
-                                        $sub_mids[$new['MESSAGE-ID']] = $temp;
-                                        $sbj                          = '';
-                                } else {
-                                        //if we can't find referenced parent, it's a "stray"
-                                        $strays[$id] = $new['IN-REPLY-TO'];
-                                }
-                        }
-                        
-                        //add subject as root
-                        if ($sbj) {
-                                if ($debug) {
-                                    echo "\t added to root\n";
-                                }
-                                $roots[$sbj]                  = $id;
-                                $root_in_root[$id]            = !$has_re;
-                                $sub_mids[$new['MESSAGE-ID']] = $id;
-                                $result[$id]                  = array($id);
-                        }
-                        if ($debug) {
-                            echo $new['MESSAGE-ID'] . "\t" . $sbj . "\n";
-                        }
-                }
-        }
-        
-        //now that we've gone through all the messages,
-        //go back and try and link up the stray threads
-        if (count($strays) > 0) {
-                foreach ($strays as $id=>$irt) {
-                        $root_id = $sub_mids[$irt];
-                        if (!$root_id || $root_id==$id) {
-                            continue;
-                        }
-                        $result[$root_id] = array_merge($result[$root_id],$result[$id]);
-                        unset($result[$id]);
-                }
-        }
-        
-        if ($clock) {
-            $clock->register('data prepped');
-        }
-    
-        if ($debug) {
-            print_r($roots);
-        }
-
-        return $result;
-}
-
-function iil_SortThreads(&$tree, $index, $sort_order = 'ASC') {
-        if (!is_array($tree) || !is_array($index)) {
-            return false;
-        }
-    
-        //create an id to position lookup table
-        $i = 0;
-        foreach ($index as $id=>$val) {
-                $i++;
-                $index[$id] = $i;
-        }
-        $max = $i+1;
-        
-        //for each tree, set array key to position
-        $itree = array();
-        foreach ($tree as $id=>$node) {
-                if (count($tree[$id])<=1) {
-                        //for "threads" with only one message, key is position of that message
-                        $n         = $index[$id];
-                        $itree[$n] = array($n=>$id);
-                } else {
-                        //for "threads" with multiple messages, 
-                        $min   = $max;
-                        $new_a = array();
-                        foreach ($tree[$id] as $mid) {
-                                $new_a[$index[$mid]] = $mid;            //create new sub-array mapping position to id
-                                $pos                 = $index[$mid];
-                                if ($pos&&$pos<$min) {
-                                    $min = $index[$mid];        //find smallest position
-                                }
-                        }
-                        $n = $min;      //smallest position of child is thread position
-                        
-                        //assign smallest position to root level key
-                        //set children array to one created above
-                        ksort($new_a);
-                        $itree[$n] = $new_a;
-                }
-        }
-        
-        //sort by key, this basically sorts all threads
-        ksort($itree);
-        $i   = 0;
-        $out = array();
-        foreach ($itree as $k=>$node) {
-                $out[$i] = $itree[$k];
-                $i++;
-        }
-        
-        return $out;
-}
-
-function iil_IndexThreads(&$tree) {
-        /* creates array mapping mid to thread id */
-        
-        if (!is_array($tree)) {
-            return false;
-        }
-    
-        $t_index = array();
-        foreach ($tree as $pos=>$kids) {
-                foreach ($kids as $kid) $t_index[$kid] = $pos;
-        }
-        
-        return $t_index;
-}
-
 function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false, $bodystr=false, $add='')
 {
@@ -1416 +1099 @@
                 return false;
         }
+
+        if (is_array($message_set))
+                $message_set = join(',', $message_set);
 
         $message_set = iil_CompressMessageSet($message_set);
@@ -1858 +1544 @@
 }
 
+// Don't be tempted to change $str to pass by reference to speed this up - it will slow it down by about
+// 7 times instead :-) See comments on http://uk2.php.net/references and this article:
+// http://derickrethans.nl/files/phparch-php-variables-article.pdf
+function iil_ParseThread($str, $begin, $end, $root, $parent, $depth, &$depthmap, &$haschildren) {
+        $node = array();
+        if ($str[$begin] != '(') {
+                $stop = $begin + strspn($str, "1234567890", $begin, $end - $begin);
+                $msg = substr($str, $begin, $stop - $begin);
+                if ($msg == 0)
+                    return $node;
+                if (is_null($root))
+                        $root = $msg;
+                $depthmap[$msg] = $depth;
+                $haschildren[$msg] = false;
+                if (!is_null($parent))
+                        $haschildren[$parent] = true;
+                if ($stop + 1 < $end)
+                        $node[$msg] = iil_ParseThread($str, $stop + 1, $end, $root, $msg, $depth + 1, $depthmap, $haschildren);
+                else
+                        $node[$msg] = array();
+        } else {
+                $off = $begin;
+                while ($off < $end) {
+                        $start = $off;
+                        $off++;
+                        $n = 1;
+                        while ($n > 0) {
+                                $p = strpos($str, ')', $off);
+                                if ($p === false) {
+                                        error_log('Mismatched brackets parsing IMAP THREAD response:');
+                                        error_log(substr($str, ($begin < 10) ? 0 : ($begin - 10), $end - $begin + 20));
+                                        error_log(str_repeat(' ', $off - (($begin < 10) ? 0 : ($begin - 10))));
+                                        return $node;
+                                }
+                                $p1 = strpos($str, '(', $off);
+                                if ($p1 !== false && $p1 < $p) {
+                                        $off = $p1 + 1;
+                                        $n++;
+                                } else {
+                                        $off = $p + 1;
+                                        $n--;
+                                }
+                        }
+                        $node += iil_ParseThread($str, $start + 1, $off - 1, $root, $parent, $depth, $depthmap, $haschildren);
+                }
+        }
+        
+        return $node;
+}
+
+function iil_C_Thread(&$conn, $folder, $algorithm='REFERENCES', $criteria='',
+    $encoding='US-ASCII') {
+
+        if (iil_C_Select($conn, $folder)) {
+        
+                $encoding = $encoding ? trim($encoding) : 'US-ASCII';
+                $algorithm = $algorithm ? trim($algorithm) : 'REFERENCES';
+                $criteria = $criteria ? 'ALL '.trim($criteria) : 'ALL';
+                
+                iil_PutLineC($conn->fp, "thrd1 THREAD $algorithm $encoding $criteria");
+                do {
+                        $line = trim(iil_ReadLine($conn->fp, 10000));
+                        if (eregi("^\* THREAD", $line)) {
+                                $str = trim(substr($line, 8));
+                                $depthmap = array();
+                                $haschildren = array();
+                                $tree = iil_ParseThread($str, 0, strlen($str), null, null, 0, $depthmap, $haschildren);
+                        }
+                } while (!iil_StartsWith($line, 'thrd1', true));
+
+                $result_code = iil_ParseResult($line);
+                if ($result_code == 0) {
+                    return array($tree, $depthmap, $haschildren);
+                }
+                $conn->error = 'iil_C_Thread: ' . $line . "\n";
+                return false;   
+        }
+        $conn->error = "iil_C_Thread: Couldn't select \"$folder\"\n";
+        return false;
+}
+
 function iil_C_Search(&$conn, $folder, $criteria) {
 

branches/devel-threads/program/localization/en_US/labels.inc

@@ -57 +57 @@
 $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 
@@ -154 +155 @@
 $labels['invert'] = 'Invert';
 $labels['filter'] = 'Filter';
+
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['collapse-all'] = 'Collapse All';
+
+$labels['autoexpand_threads'] = 'Autoexpand threads';
+$labels['do_expand'] = 'All threads';
+$labels['dont_expand'] = 'None';
+$labels['expand_only_unread'] = 'Only with unread messages';
 
 $labels['compact'] = 'Compact';
@@ -319 +329 @@
 $labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Messages';
+$labels['threaded'] = 'Threaded';
 $labels['create']  = 'Create';
 $labels['createfolder']  = 'Create new folder';

branches/devel-threads/program/steps/mail/check_recent.inc

@@ -29 +29 @@
       if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && isset($_SESSION['search'][$search_request])) {
         $_SESSION['search'][$search_request] = $IMAP->refresh_search();
-        $all_count = $IMAP->messagecount();
+        $all_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
       } else {
-        $all_count = $IMAP->messagecount(NULL, 'ALL', TRUE);
+        $all_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL', TRUE);
       }
       
@@ -56 +56 @@
         continue;
 
-      // use SEARCH/SORT to find recent messages
-      $search_str = 'RECENT';
-      if ($search_request)
-        $search_str .= ' '.$IMAP->search_string;
+      if ($IMAP->threading) {
+          $OUTPUT->command('message_list.clear');
+          $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
+          $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
+          $result_h = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
+          // add to the list
+          rcmail_js_message_list($result_h);
+      } else {
+          // use SEARCH/SORT to find recent messages
+          $search_str = 'RECENT';
+          if ($search_request)
+              $search_str .= ' '.$IMAP->search_string;
 
-      $result = $IMAP->search($mbox_name, $search_str, NULL, 'date');
+          $result = $IMAP->search($mbox_name, $search_str, NULL, 'date');
 
-      if ($result) {
-        // get the headers
-        $result_h = $IMAP->list_headers($mbox_name, 1, 'date', 'DESC');
-        // add to the list
-        rcmail_js_message_list($result_h, true, false);
+          if ($result) {
+            // get the headers
+            $result_h = $IMAP->list_headers($mbox_name, 1, 'date', 'DESC');
+            // add to the list
+            rcmail_js_message_list($result_h, TRUE);
+          }
       }
     }

branches/devel-threads/program/steps/mail/func.inc

@@ -53 +53 @@
   $_SESSION['sort_order'] = $CONFIG['message_sort_order'];
 
+// enable threads mode
+$a_message_threading = $RCMAIL->config->get('message_threading', array());
+$IMAP->set_threading($a_message_threading[$_SESSION['mbox']]);
+
 // set message set for search result
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
@@ -80 +84 @@
       $OUTPUT->set_env('search_mods', $_SESSION['search_mods'] ? $_SESSION['search_mods'] : array('subject'=>'subject'));
       // make sure the message count is refreshed (for default view)
-      $IMAP->messagecount($mbox_name, 'ALL', true);
+      $IMAP->messagecount($mbox_name, $IMAP->threading ? 'THREADS' : 'ALL', true);
     }
         
@@ -87 +91 @@
   $OUTPUT->set_env('quota', $IMAP->get_capability('quota'));
   $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter());
+  $OUTPUT->set_env('threading', (bool) $IMAP->threading);
 
   if ($CONFIG['flag_for_deletion'])
@@ -120 +125 @@
   $skin_path = $CONFIG['skin_path'];
   $image_tag = '<img src="%s%s" alt="%s" />';
-
   // check to see if we have some settings for sorting
   $sort_col   = $_SESSION['sort_col'];
@@ -162 +166 @@
   // add col definition
   $out .= '<colgroup>';
-  $out .= '<col class="icon" />';
 
   foreach ($a_show_cols as $col)
@@ -170 +173 @@
 
   // add table title
-  $out .= "<thead><tr>\n<td class=\"icon\">&nbsp;</td>\n";
+  $out .= "<thead><tr>\n";
 
   $javascript = '';
@@ -234 +237 @@
 
     // put it all together
-    if ($col!='attachment')
-      $out .= '<td class="'.$col.$sort_class.'" id="rcm'.$col.'">' . "$col_name$sort</td>\n";
+    if ($col != 'attachment') {
+      // list options menu link
+      if ($col == 'subject' && !empty($attrib['optionsmenuicon'])) {
+          $list_menu = $OUTPUT->button(array(
+            'name' => 'listmenulink',
+            'id' => 'listmenulink',
+//            'command' => '',
+//            'prop' => '',
+            'image' => $attrib['optionsmenuicon'],
+            'align' => 'absmiddle',
+            'style' => 'float: left; padding-right: 5px',
+            'title' => 'listoptions'));
+        } else
+          $list_menu = '';
+
+      $out .= '<td class="'.$col.$sort_class.'" id="rcm'.$col.'">' . "$list_menu$col_name$sort</td>\n";
+      }
     else    
       $out .= '<td class="icon" id="rcm'.$col.'">' . "$col_name$sort</td>\n";
@@ -266 +284 @@
     if ($header->flagged)
       $js_row_arr['flagged'] = true;
-
-    // set message icon  
-    if ($attrib['deletedicon'] && $header->deleted)
+    if ($header->has_children)
+      $js_row_arr['has_children'] = true;
+    if ($header->depth)
+      $js_row_arr['depth'] = $header->depth;
+    if ($header->parent_uid)
+      $js_row_arr['parent_uid'] = $header->parent_uid;
+    if ($header->unread_children)
+      $js_row_arr['unread_children'] = $header->unread_children;
+
+    // set message icon
+    if ($header->seen && $attrib['unreadchildrenicon'] && $header->unread_children > 0) 
+      $message_icon = $attrib['unreadchildrenicon'];
+    else if ($attrib['deletedicon'] && $header->deleted)
       $message_icon = $attrib['deletedicon'];
     else if ($attrib['repliedicon'] && $header->answered)
@@ -293 +321 @@
       $attach_icon = $attrib['attachmenticon'];
         
-    $out .= sprintf('<tr id="rcmrow%d" class="message%s%s%s%s">'."\n",
+    $out .= sprintf('<tr id="rcmrow%d" class="message%s%s%s%s"%s>'."\n",
                     $header->uid,
                     $header->seen ? '' : ' unread',
                     $header->deleted ? ' deleted' : '',
                     $header->flagged ? ' flagged' : '',
-                    $zebra_class);
-    
-    $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');
+                    $zebra_class,
+                    ($header->depth) ? ' style="display: none"' : '');
+    
+    $tree = '';
+    if ($IMAP->threading)
+      {
+      // XXX: This assumes that div width is hardcoded to 15px,
+      // Chris did it a bit differently in an original patch, he was adding so much divs as depth is
+      // I replaced logic in list.js:drag_mouse_move() so subject text is picked defferently, so
+      // either method of could be used (that was only the one problem I noted with these added divs).
+      // The same is true for an online list (program/js/app.js:add_message_row()).
+      // Bubble
+      $width = ($header->depth) * 15;
+      $tree .= '<div id="rcmtab' . $header->uid . '" class="branch" style="width:' . $width . 'px;">&nbsp</div>';
+      if ($header->has_children && !$header->depth)
+        $tree .= '<div id="rcmexpando' . $header->uid . '" class="collapsed">&nbsp;</div>';
+      else
+        $tree .= '<div class="leaf">&nbsp;</div>';
+      }
+
+    $tree .= $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '';
 
     $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']);
   
     // format each col
+    $first = true;
     foreach ($a_show_cols as $col)
       {
@@ -326 +373 @@
         $cont = Q($header->$col);
         
+      if ($first) {
+        $first = false;
+        $cont = $tree . $cont;
+      }
       if ($col!='attachment')
         $out .= '<td class="'.$col.'">' . $cont . "</td>\n";
@@ -341 +392 @@
   $out .= "</tbody></table>\n";
   
-  $message_count = $IMAP->messagecount();
+  $message_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
   
   // set client env
   $OUTPUT->add_gui_object('mailcontframe', 'mailcontframe');
   $OUTPUT->add_gui_object('messagelist', $attrib['id']);
+  $OUTPUT->set_env('autoexpand_threads', $CONFIG['autoexpand_threads']);
   $OUTPUT->set_env('messagecount', $message_count);
   $OUTPUT->set_env('current_page', $IMAP->list_page);
@@ -370 +422 @@
   if ($attrib['unflaggedicon'])
     $OUTPUT->set_env('unflaggedicon', $skin_path . $attrib['unflaggedicon']);
+  if ($attrib['unreadchildrenicon'])
+    $OUTPUT->set_env('unreadchildrenicon', $skin_path . $attrib['unreadchildrenicon']);
   
   $OUTPUT->set_env('messages', $a_js_message_arr);
@@ -413 +467 @@
   if ($browser->ie && $replace)
     $OUTPUT->command('offline_message_list', true);
+
+  // remove 'attachment' and 'flag' columns, we don't need them here
+  if(($key = array_search('attachment', $a_show_cols)) !== FALSE)
+    unset($a_show_cols[$key]);
+  if(($key = array_search('flag', $a_show_cols)) !== FALSE)
+    unset($a_show_cols[$key]);
 
   // loop through message headers
@@ -448 +508 @@
       }
 
+    if ($header->depth)
+      $a_msg_flags['depth'] = $header->depth;
+    if ($header->parent_uid)
+      $a_msg_flags['parent_uid'] = $header->parent_uid;
+    if ($header->has_children)
+      $a_msg_flags['has_children'] = $header->has_children;
+    if ($header->unread_children)
+      $a_msg_flags['unread_children'] = $header->unread_children;
     if ($header->deleted)
       $a_msg_flags['deleted'] = 1;
@@ -575 +643 @@
     {
     return rcube_label(array('name' => 'messagenrof',
-                             'vars' => array('nr'  => $MESSAGE->index+1,
-                                             'count' => $count!==NULL ? $count : $IMAP->messagecount())));
+        'vars' => array('nr'  => $MESSAGE->index+1,
+        'count' => $count!==NULL ? $count : $IMAP->messagecount(NULL, 'ALL')))); // Only messages, no threads here
     }
 
@@ -583 +651 @@
     
   $start_msg = ($page-1) * $IMAP->page_size + 1;
-  $max = $count!==NULL ? $count : $IMAP->messagecount();
+  $max = $count!==NULL ? $count : $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
 
   if ($max==0)
     $out = rcube_label('mailboxempty');
   else
-    $out = rcube_label(array('name' => 'messagesfromto',
-                              'vars' => array('from'  => $start_msg,
-                                              'to'    => min($max, $start_msg + $IMAP->page_size - 1),
-                                              'count' => $max)));
+    $out = rcube_label(array('name' => $IMAP->threading ? 'threadsfromto' : 'messagesfromto',
+            'vars' => array('from'  => $start_msg,
+            'to'    => min($max, $start_msg + $IMAP->page_size - 1),
+            'count' => $max)));
 
   return Q($out);

branches/devel-threads/program/steps/mail/list.inc

@@ -56 +56 @@
 
 // fetch message headers
-if ($count = $IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh'])))
+if ($count = $IMAP->messagecount($mbox_name, $IMAP->threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh'])))
   $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
 
@@ -66 +66 @@
 $OUTPUT->set_env('messagecount', $count);
 $OUTPUT->set_env('pagecount', $pages);
+$OUTPUT->set_env('threading', (bool) $IMAP->threading);
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count));
 $OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text());
@@ -81 +82 @@
   $OUTPUT->show_message('nomessagesfound', 'notice');
 
+// deal with threaded view
+if ($IMAP->threading) {
+  switch ($RCMAIL->config->get('autoexpand_threads')) {
+    case 2:
+      $OUTPUT->command('message_list.expand_unread');
+      break;
+    case 1:
+      $OUTPUT->command('message_list.expand_all');
+      break;
+    case 0:
+    default:
+      break;
+  }
+}
+
 // send response
 $OUTPUT->send();

branches/devel-threads/program/steps/mail/move_del.inc

@@ -25 +25 @@
 
 // count messages before changing anything
-$old_count = $IMAP->messagecount();
+$old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
 $old_pages = ceil($old_count / $IMAP->page_size);
 
@@ -83 +83 @@
 else
 {
-  $msg_count      = $IMAP->messagecount();
+  $msg_count      = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
   $pages          = ceil($msg_count / $IMAP->page_size);
   $nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
@@ -123 +123 @@
 
     $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, $count);
+    if ($_SESSION['threads'])
+      // TODO: count number of roots deleted and slice that many roots from the end of $a_headers 
+      $OUTPUT->command('message_list.clear');
+    else
+      $a_headers = array_slice($a_headers, -$count, $count);
 
     rcmail_js_message_list($a_headers, false, false);

branches/devel-threads/program/steps/mail/search.inc

@@ -100 +100 @@
 // Get the headers
 $result_h = $IMAP->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
-$count = $IMAP->messagecount();
+$count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
 
 // save search results in session
@@ -116 +116 @@
   rcmail_js_message_list($result_h);
   if ($search_str)
-    $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
+    $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $IMAP->messagecount(NULL, 'ALL')));
 }
 else

branches/devel-threads/program/steps/settings/func.inc

@@ -312 +312 @@
     }
 
+    if (!isset($no_override['autoexpand_threads'])) {
+      $field_id = 'rcmfd_autoexpand_threads';
+      $select_autoexpand_threads = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
+      $select_autoexpand_threads->add(rcube_label('dont_expand'), 0);
+      $select_autoexpand_threads->add(rcube_label('do_expand'), 1);
+      $select_autoexpand_threads->add(rcube_label('expand_only_unread'), 2);
+      
+      $blocks['main']['options']['autoexpand_threads'] = array(
+        'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
+        'content' => $select_autoexpand_threads->show($config['autoexpand_threads']),
+      );
+    }
+
     if (!isset($no_override['focus_on_new_message'])) {
       $field_id = 'rcmfd_focus_on_new_message';

branches/devel-threads/program/steps/settings/manage_folders.inc

@@ -39 +39 @@
   }
 
+// enable threading for one or more mailboxes
+else if ($RCMAIL->action=='enable-threading')
+  {
+  if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF7-IMAP'))
+    $a_user_prefs = $USER->get_prefs();
+    if (!is_array($a_user_prefs['message_threading']))
+      $a_user_prefs['message_threading'] = array();
+    $a_user_prefs['message_threading'][$mbox] = true;
+    $USER->save_prefs($a_user_prefs);
+  }
+
+// enable threading for one or more mailboxes
+else if ($RCMAIL->action=='disable-threading')
+  {
+  if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF7-IMAP'))
+    $a_user_prefs = $USER->get_prefs();
+    if (!is_array($a_user_prefs['message_threading']))
+      $a_user_prefs['message_threading'] = array();
+    unset($a_user_prefs['message_threading'][$mbox]);
+    $USER->save_prefs($a_user_prefs);
+  }
+
 // create a new mailbox
 else if ($RCMAIL->action=='create-folder')
@@ -160 +182 @@
 function rcube_subscription_form($attrib)
   {
-  global $IMAP, $CONFIG, $OUTPUT;
+  global $RCMAIL, $IMAP, $CONFIG, $OUTPUT;
+
+  $threading_supported = $IMAP->get_capability('thread=references')
+    || $IMAP->get_capability('thread=orderedsubject')
+    || $IMAP->get_capability('thread=refs');
 
   list($form_start, $form_end) = get_form_tags($attrib, 'folders');
@@ -174 +200 @@
   $table->add_header('msgcount', rcube_label('messagecount'));
   $table->add_header('subscribed', rcube_label('subscribed'));
+  if ($threading_supported)
+    $table->add_header('threaded', rcube_label('threaded'));
   $table->add_header('rename', ' ');
   $table->add_header('delete', ' ');
 
-
   // get folders from server
   $IMAP->clear_cache('mailboxes');
@@ -183 +210 @@
   $a_unsubscribed = $IMAP->list_unsubscribed();
   $a_subscribed = $IMAP->list_mailboxes();
+  $a_threaded = $RCMAIL->config->get('message_threading', array()); 
   $delimiter = $IMAP->get_hierarchy_delimiter();
   $a_js_folders = $seen_folders = $list_folders = array();
@@ -212 +240 @@
     'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)",
   ));
+  $checkbox_threaded = new html_checkbox(array(
+    'name' => '_threaded[]',
+    'onclick' => JS_OBJECT_NAME.".command(this.checked?'enable-threading':'disable-threading',this.value)",
+  ));
   
   if (!empty($attrib['deleteicon']))
@@ -227 +259 @@
     $idx = $i + 1;
     $subscribed = in_array($folder['id'], $a_subscribed);
+    $threaded = $a_threaded[$folder['id']];
     $protected = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders']));
     $classes = array($i%2 ? 'even' : 'odd');
@@ -239 +272 @@
     
     $table->add('name', Q($display_folder));
-    $table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id'])));
+    $table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id']))); // XXX: Use THREADS or ALL?
     $table->add('subscribed', ($protected || $folder['virtual']) ? ($subscribed ? ' •' : ' ') :
         $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''), array('value' => $folder_utf8)));
+    if ($IMAP->get_capability('thread=references')) {
+      $table->add('threaded',
+                  $checkbox_threaded->show(($threaded ? $folder_utf8 : ''), array('value' => $folder_utf8)));
+    }
     
     // add rename and delete buttons

branches/devel-threads/program/steps/settings/save_prefs.inc

@@ -43 +43 @@
       'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE,
       'preview_pane'         => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+      'autoexpand_threads'   => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
       'mdn_requests'         => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
       'keep_alive'           => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'],

branches/devel-threads/skins/default/functions.js

@@ -125 +125 @@
   this.searchmenu = $('#searchmenu');
   this.messagemenu = $('#messagemenu');
+  this.listmenu = $('#listmenu');
+  var ref = rcube_find_object('listmenulink');
+  
+  if (ref)
+    ref.onclick = function () { rcmail_ui.show_listmenu() };
 }
 
@@ -184 +189 @@
 },
 
+show_listmenu: function(show)
+{
+  if (typeof show == 'undefined')
+    show = this.listmenu.is(':visible') ? false : true;
+
+  var ref = rcube_find_object('listmenulink');
+  if (show && ref) {
+    var pos = $(ref).offset();
+    this.listmenu.css({ left:pos.left, top:(pos.top + ref.offsetHeight)});
+  }
+  this.listmenu[show?'show':'hide']();
+},
+
 body_mouseup: function(evt, p)
 {
@@ -190 +208 @@
   else if (this.messagemenu && this.messagemenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('messagemenulink'))
     this.show_messagemenu(false);
+  else if (this.listmenu && this.listmenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('listmenulink')) {
+    var menu = rcube_find_object('listmenu');
+    var target = rcube_event.get_target(evt);
+    while (target.parentNode) {
+      if (target.parentNode == menu)
+        return;
+      target = target.parentNode;
+    }
+    this.show_listmenu(false);
+  }
   else if (this.searchmenu && this.searchmenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('searchmod')) {
     var menu = rcube_find_object('searchmenu');
@@ -211 +239 @@
     if (this.messagemenu && this.messagemenu.is(':visible'))
       this.show_messagemenu(false);
+    if (this.listmenu && this.listmenu.is(':visible'))
+      this.show_listmenu(false);
   }
 }

branches/devel-threads/skins/default/mail.css

@@ -167 +167 @@
 #markmessagemenu,
 #searchmenu,
-#messagemenu
+#messagemenu,
+#listmenu
 {
   position: absolute;
@@ -627 +628 @@
 }
 
+#listcontrols a.expand-all {
+  background-position: -90px 0;
+}
+
+#listcontrols a.expand-allsel {
+  background-position: -90px -15px;
+}
+
+#listcontrols a.collapse-all {
+  background-position: -105px 0;
+}
+
+#listcontrols a.collapse-allsel {
+  background-position: -105px -15px;
+}
+
 #countcontrols
 {
@@ -750 +767 @@
 }
 
+#messagelist tr td div
+{
+  display: table-cell; /* For FireFox and Opera */
+  display: inline-block; /* For Opera and IE */ 
+  width: 15px;
+  height: 15px;
+}
+
+#messagelist tr td.subject img
+{
+  vertical-align: middle;
+}
+
+#messagelist tr td div.collapsed,
+#messagelist tr td div.expanded,
+#messagelist tr td img
+{
+  cursor: pointer;
+}
+
+#messagelist tr td div.collapsed
+{
+  background: url(images/icons/collapsed.png) center 5px no-repeat;
+}
+
+#messagelist tr td div.expanded
+{
+  background: url(images/icons/expanded.png) center 5px no-repeat;
+}
+
 #messagelist tbody tr td.flag img:hover,
 #messagelist thead tr td.flag img

branches/devel-threads/skins/default/templates/mail.html

@@ -60 +60 @@
   attachmentIcon="/images/icons/attachment.png"
   flaggedIcon="/images/icons/flagged.png"
-  unflaggedIcon="/images/icons/blank.gif" />
+  unflaggedIcon="/images/icons/blank.gif"
+  unreadchildrenIcon="/images/icons/unread_children.png"
+  optionsmenuIcon="/images/icons/columnpicker.gif" />
 </div>
 
@@ -83 +85 @@
       <roundcube:button command="select-all" type="link" prop="invert" title="invert" class="buttonPas invert" classAct="button invert" classSel="button invertsel" content=" " />
       <roundcube:button command="select-none" type="link" title="none" class="buttonPas none" classAct="button none" classSel="button nonesel" content=" " />
+      <span style="margin-left: 20px"><roundcube:label name="threads" />:&nbsp;</span>
+      <roundcube:button command="expand-all" type="link" title="expand-all" class="buttonPas expand-all" classAct="button expand-all" classSel="button expand-allsel" content=" "  />
+      <roundcube:button command="collapse-all" type="link" title="collapse-all" class="buttonPas collapse-all" classAct="button collapse-all" classSel="button collapse-allsel" content=" " />
       <roundcube:container name="listcontrols" id="listcontrols" />
   <roundcube:if condition="env:quota" />
@@ -147 +152 @@
 </div>
 
+<div id="listmenu">
+<div><roundcube:label name="listcolumns" /></div>
+  <ul class="toolbarmenu">
+    <li><input type="checkbox" name="list_cols[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /><label for="cols_subject"><roundcube:label name="subject" /></label></li>
+    <li><input type="checkbox" name="list_cols[]" value="from" id="cols_fromto" /><label for="cols_fromto"><roundcube:label name="fromto" /></label></li>
+    <li><input type="checkbox" name="list_cols[]" value="replyto" id="cols_replyto" /><label for="cols_replyto"><roundcube:label name="replyto" /></label></li>
+    <li><input type="checkbox" name="list_cols[]" value="cc" id="cols_cc" /><label for="cols_cc"><roundcube:label name="cc" /></label></li>
+    <li><input type="checkbox" name="list_cols[]" value="date" id="cols_date" /><label for="cols_date"><roundcube:label name="date" /></label></li>
+    <li><input type="checkbox" name="list_cols[]" value="size" id="cols_size" /><label for="cols_size"><roundcube:label name="size" /></label></li>
+    <li><input type="checkbox" name="list_cols[]" value="flag" id="cols_flag" /><label for="cols_flag"><roundcube:label name="flag" /></label></li>
+    <li><input type="checkbox" name="list_cols[]" value="attachment" id="cols_attachment" /><label for="cols_attachment"><roundcube:label name="attachment" /></label></li>
+  </ul>
+<div><roundcube:label name="listsorting" /></div>
+  <ul class="toolbarmenu">
+    <li><input type="radio" name="sort_cols" value="" id="sort_default" /><label for="sort_default"><roundcube:label name="nonedefault" /></label></li>
+    <li><input type="radio" name="sort_cols" value="arrival" id="sort_arrival" /><label for="sort_arrival"><roundcube:label name="arrival" /></label></li>
+    <li><input type="radio" name="sort_cols" value="date" id="sort_date" /><label for="sort_date"><roundcube:label name="sentdate" /></label></li>
+    <li><input type="radio" name="sort_cols" value="subject" id="sort_subject" /><label for="sort_subject"><roundcube:label name="subject" /></label></li>
+    <li><input type="radio" name="sort_cols" value="from" id="sort_fromto" /><label for="sort_fromto"><roundcube:label name="fromto" /></label></li>
+    <li><input type="radio" name="sort_cols" value="to" id="sort_replyto" /><label for="sort_replyto"><roundcube:label name="replyto" /></label></li>
+    <li><input type="radio" name="sort_cols" value="cc" id="sort_cc" /><label for="sort_cc"><roundcube:label name="cc" /></label></li>
+    <li><input type="radio" name="sort_cols" value="size" id="sort_size" /><label for="sort_size"><roundcube:label name="size" /></label></li>
+  </ul>
+<div><roundcube:label name="listorder" /></div>
+  <ul class="toolbarmenu">
+    <li><input type="radio" name="sort_ord" value="" id="sort_asc" /><label for="sort_default"><roundcube:label name="asc" /></label></li>
+    <li><input type="radio" name="sort_ord" value="subject" id="sort_desc" /><label for="sort_subject"><roundcube:label name="desc" /></label></li>
+  </ul>
+<div><roundcube:label name="listgroups" /></div>
+  <ul class="toolbarmenu">
+    <li><input type="radio" name="view" value="" id="view_default" /><label for="view_default"><roundcube:label name="nonedefault" /></label></li>
+    <li><input type="radio" name="view" value="thread" id="view_thread" /><label for="view_thread"><roundcube:label name="threaded" /></label></li>
+  </ul>
+</div>
+
 </body>
 </html>