Added separate From and To columns apart from smart From/To column (#1486891)

Conflicts:

	CHANGELOG
	program/steps/mail/check_recent.inc
	program/steps/mail/func.inc
	program/steps/mail/list.inc
	program/steps/mail/mark.inc
	program/steps/mail/move_del.inc
	program/steps/mail/pagenav.inc
	program/steps/mail/search.inc
	skins/larry/mail.css
	skins/larry/templates/mail.html
	skins/larry/ui.js

8 files changed, 102 insertions, 52 deletions

diff --git a/program/js/app.js b/program/js/app.js
index 0db174625..8ec209539 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1600,7 +1600,7 @@ function rcube_webmail()
     for (i=0; i<cols.length; i++)
       if (cols[i].id && cols[i].id.match(/^rcm/)) {
         name = cols[i].id.replace(/^rcm/, '');
-        this.env.coltypes.push(name == 'to' ? 'from' : name);
+        this.env.coltypes.push(name);
       }
 
     if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
@@ -1875,7 +1875,7 @@ function rcube_webmail()
       // make sure new columns are added at the end of the list
       var i, idx, name, newcols = [], oldcols = this.env.coltypes;
       for (i=0; i<oldcols.length; i++) {
-        name = oldcols[i] == 'to' ? 'from' : oldcols[i];
+        name = oldcols[i];
         idx = $.inArray(name, cols);
         if (idx != -1) {
           newcols.push(name);
@@ -5484,7 +5484,7 @@ function rcube_webmail()
 
   // for reordering column array (Konqueror workaround)
   // and for setting some message list global variables
-  this.set_message_coltypes = function(coltypes, repl)
+  this.set_message_coltypes = function(coltypes, repl, smart_col)
   {
     var list = this.message_list,
       thead = list ? list.list.tHead : null,
@@ -5512,7 +5512,7 @@ function rcube_webmail()
 
       for (n=0, len=this.env.coltypes.length; n<len; n++) {
         col = this.env.coltypes[n];
-        if ((cell = thead.rows[0].cells[n]) && (col=='from' || col=='to')) {
+        if ((cell = thead.rows[0].cells[n]) && (col == 'from' || col == 'to' || col == 'fromto')) {
           cell.id = 'rcm'+col;
           // if we have links for sorting, it's a bit more complicated...
           if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
@@ -5520,7 +5520,7 @@ function rcube_webmail()
             cell.onclick = function(){ return rcmail.command('sort', this.__col, this); };
             cell.__col = col;
           }
-          cell.innerHTML = this.get_label(col);
+          cell.innerHTML = this.get_label(col == 'fromto' ? smart_col : col);
         }
       }
     }
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index e22cccca5..4ec27c0ba 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -88,7 +88,7 @@ foreach ($a_mailboxes as $mbox_name) {
         $OUTPUT->command('message_list.clear', $all_count ? false : true);
 
         if ($all_count) {
-            $a_headers = $IMAP->list_headers($mbox_name, null, $_SESSION['sort_col'], $_SESSION['sort_order']);
+            $a_headers = $IMAP->list_headers($mbox_name, null, rcmail_sort_column(), rcmail_sort_order());
             // add message rows
             rcmail_js_message_list($a_headers, false);
             // remove messages that don't exists from list selection array
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index ab0605d46..6cb7b7592 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -89,7 +89,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
     if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
       $search_request = md5($mbox_name.$_SESSION['search_filter']);
 
-      $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $_SESSION['sort_col']);
+      $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column());
       $_SESSION['search'] = $IMAP->get_search_set();
       $_SESSION['search_request'] = $search_request;
       $OUTPUT->set_env('search_request', $search_request);
@@ -133,13 +133,76 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
   $OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->mod_mailbox($mbox_name)));
 }
 
+/**
+ * Returns 'to' if current folder is configured Sent or Drafts
+ * or their subfolders, otherwise returns 'from'.
+ *
+ * @return string Column name
+ */
+function rcmail_message_list_smart_column_name()
+{
+  global $RCMAIL;
+
+  $delim       = $RCMAIL->imap->get_hierarchy_delimiter();
+  $mbox        = $RCMAIL->imap->get_mailbox_name();
+  $sent_mbox   = $RCMAIL->config->get('sent_mbox');
+  $drafts_mbox = $RCMAIL->config->get('drafts_mbox');
+
+  if (strpos($mbox.$delim, $sent_mbox.$delim) === 0 || strpos($mbox.$delim, $drafts_mbox.$delim) === 0) {
+    return 'to';
+  }
+
+  return 'from';
+}
+
+/**
+ * Returns configured messages list sorting column name
+ * The name is context-sensitive, which means if sorting is set to 'fromto'
+ * it will return 'from' or 'to' according to current folder type.
+ *
+ * @return string Column name
+ */
+function rcmail_sort_column()
+{
+  global $RCMAIL;
+
+  if (isset($_SESSION['sort_col'])) {
+    $column = $_SESSION['sort_col'];
+  }
+  else {
+    $column = $RCMAIL->config->get('message_sort_col');
+  }
+
+  // get name of smart From/To column in folder context
+  if ($column == 'fromto') {
+    $column = rcmail_message_list_smart_column_name();
+  }
+
+  return $column;
+}
+
+/**
+ * Returns configured message list sorting order
+ *
+ * @return string Sorting order (ASC|DESC)
+ */
+function rcmail_sort_order()
+{
+  global $RCMAIL;
+
+  if (isset($_SESSION['sort_order'])) {
+    return $_SESSION['sort_order'];
+  }
+
+  return $RCMAIL->config->get('message_sort_order');
+}
 
 /**
  * return the message list as HTML table
  */
 function rcmail_message_list($attrib)
 {
-  global $IMAP, $CONFIG, $OUTPUT;
+  global $CONFIG, $OUTPUT;
 
   // add some labels to client
   $OUTPUT->add_label('from', 'to');
@@ -161,14 +224,6 @@ function rcmail_message_list($attrib)
   // save some variables for use in ajax list
   $_SESSION['list_attrib'] = $attrib;
 
-  $mbox = $IMAP->get_mailbox_name();
-  $delim = $IMAP->get_hierarchy_delimiter();
-
-  // show 'to' instead of 'from' in sent/draft messages
-  if ((strpos($mbox.$delim, $CONFIG['sent_mbox'].$delim)===0 || strpos($mbox.$delim, $CONFIG['drafts_mbox'].$delim)===0)
-      && (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
-    $a_show_cols[$f] = 'to';
-
   // make sure 'threads' and 'subject' columns are present
   if (!in_array('subject', $a_show_cols))
     array_unshift($a_show_cols, 'subject');
@@ -219,7 +274,6 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
   }
 
   $mbox = $IMAP->get_mailbox_name();
-  $delim = $IMAP->get_hierarchy_delimiter();
 
   // make sure 'threads' and 'subject' columns are present
   if (!in_array('subject', $a_show_cols))
@@ -229,11 +283,6 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
 
   $_SESSION['list_attrib']['columns'] = $a_show_cols;
 
-  // show 'to' instead of 'from' in sent/draft messages
-  if ((strpos($mbox.$delim, $CONFIG['sent_mbox'].$delim)===0 || strpos($mbox.$delim, $CONFIG['drafts_mbox'].$delim)===0)
-      && (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
-    $a_show_cols[$f] = 'to';
-
   // Make sure there are no duplicated columns (#1486999)
   $a_show_cols = array_unique($a_show_cols);
 
@@ -247,7 +296,12 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
 
   $thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;
 
-  $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead);
+  // get name of smart From/To column in folder context
+  if (($f = array_search('fromto', $a_show_cols)) !== false) {
+    $smart_col = rcmail_message_list_smart_column_name();
+  }
+
+  $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead, $smart_col);
 
   if (empty($a_headers))
     return;
@@ -270,16 +324,18 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
 
     // format each col; similar as in rcmail_message_list()
     foreach ($a_show_cols as $col) {
-      if (in_array($col, array('from', 'to', 'cc', 'replyto')))
-        $cont = Q(rcmail_address_string($header->$col, 3), 'show');
+      $col_name = $col == 'fromto' ? $smart_col : $col;
+
+      if (in_array($col_name, array('from', 'to', 'cc', 'replyto')))
+        $cont = Q(rcmail_address_string($header->$col_name, 3), 'show');
       else if ($col=='subject') {
         $cont = trim($IMAP->decode_header($header->$col));
         if (!$cont) $cont = rcube_label('nosubject');
         $cont = Q($cont);
       }
-      else if ($col=='size')
+      else if ($col == 'size')
         $cont = show_bytes($header->$col);
-      else if ($col=='date')
+      else if ($col == 'date')
         $cont = format_date($header->date);
       else
         $cont = Q($header->$col);
@@ -330,8 +386,6 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
  */
 function rcmail_message_list_head($attrib, $a_show_cols)
 {
-  global $CONFIG;
-
   $skin_path = $_SESSION['skin_path'];
   $image_tag = html::img(array('src' => "%s%s", 'alt' => "%s"));
 
@@ -340,7 +394,7 @@ function rcmail_message_list_head($attrib, $a_show_cols)
   $sort_order = $_SESSION['sort_order'];
 
   // define sortable columns
-  $a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc');
+  $a_sort_cols = array('subject', 'date', 'from', 'to', 'fromto', 'size', 'cc');
 
   if (!empty($attrib['optionsmenuicon'])) {
     $onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')";
@@ -358,6 +412,11 @@ function rcmail_message_list_head($attrib, $a_show_cols)
 
   $cells = array();
 
+  // get name of smart From/To column in folder context
+  if (($f = array_search('fromto', $a_show_cols)) !== false) {
+    $smart_col = rcmail_message_list_smart_column_name();
+  }
+
   foreach ($a_show_cols as $col) {
     // get column name
     switch ($col) {
@@ -372,6 +431,9 @@ function rcmail_message_list_head($attrib, $a_show_cols)
       case 'threads':
         $col_name = $list_menu;
         break;
+      case 'fromto':
+        $col_name = Q(rcube_label($smart_col));
+        break;
       default:
         $col_name = Q(rcube_label($col));
     }
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 9988a00b4..1a7d05577 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -34,12 +34,6 @@ if ($sort = get_input_value('_sort', RCUBE_INPUT_GET))
   $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col;
   $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order;
 }
-else
-{
-  // use session settings if set, defaults if not
-  $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'];
-}
 
 // is there a set of columns for this request?
 if ($cols = get_input_value('_cols', RCUBE_INPUT_GET))
@@ -60,7 +54,7 @@ $IMAP->mailbox_sync($mbox_name);
 if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL')
 {
   $search_request = md5($mbox_name.$_SESSION['search_filter']);
-  $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col);
+  $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column());
   $_SESSION['search'] = $IMAP->get_search_set();
   $_SESSION['search_request'] = $search_request;
   $OUTPUT->set_env('search_request', $search_request);
@@ -68,7 +62,7 @@ if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL')
 
 // fetch message headers
 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);
+  $a_headers = $IMAP->list_headers($mbox_name, NULL, rcmail_sort_column(), rcmail_sort_order());
 
 // update search set (possible change of threading mode)
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index c232d8c48..710a77e0f 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -107,15 +107,12 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
       $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
 
       if ($IMAP->threading)
-	    $count = get_input_value('_count', RCUBE_INPUT_POST);
+        $count = get_input_value('_count', RCUBE_INPUT_POST);
 
       // add new rows from next page (if any)
       if ($count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
-        $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'];
-
-        $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order,
-	    $jump_back ? NULL : $count);
+        $a_headers = $IMAP->list_headers($mbox, NULL,
+          rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);
 
         rcmail_js_message_list($a_headers, false);
       }
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index a42bc90cd..02504875e 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -128,11 +128,8 @@ else
 
   // add new rows from next page (if any)
   if ($addrows && $count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
-    $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'];
-
-    $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order,
-      $jump_back ? NULL : $count);
+    $a_headers = $IMAP->list_headers($mbox, NULL,
+      rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);
 
     rcmail_js_message_list($a_headers, false);
   }
diff --git a/program/steps/mail/pagenav.inc b/program/steps/mail/pagenav.inc
index 974b3b46f..a1f00b61c 100644
--- a/program/steps/mail/pagenav.inc
+++ b/program/steps/mail/pagenav.inc
@@ -42,7 +42,7 @@ if ($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC'
 }
 else {
     // Only if we use custom sorting
-    $a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']);
+    $a_msg_index = $IMAP->message_index(NULL, rcmail_sort_column(), rcmail_sort_order());
 
     $index = array_search($IMAP->get_id($uid), $a_msg_index);
 
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 49f31e0c1..ab026d5f3 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -107,10 +107,10 @@ $search_str = trim($search_str);
 
 // execute IMAP search
 if ($search_str)
-  $IMAP->search($mbox, $search_str, $imap_charset, $_SESSION['sort_col']);
+  $IMAP->search($mbox, $search_str, $imap_charset, rcmail_sort_column());
 
 // Get the headers
-$result_h = $IMAP->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
+$result_h = $IMAP->list_headers($mbox, 1, rcmail_sort_column(), rcmail_sort_order());
 $count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
 
 // save search results in session