From e0efd8f5dc9bcdb7559c71386aa3c91c1230e8d3 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 11 Aug 2012 10:57:24 +0200 Subject: Added separate From and To columns apart from smart From/To column (#1486891) --- CHANGELOG | 1 + config/main.inc.php.dist | 6 +- program/js/app.js | 10 ++-- program/steps/mail/check_recent.inc | 2 +- program/steps/mail/func.inc | 113 +++++++++++++++++++++++++++--------- program/steps/mail/list.inc | 10 +--- program/steps/mail/mark.inc | 7 +-- program/steps/mail/move_del.inc | 7 +-- program/steps/mail/pagenav.inc | 2 +- program/steps/mail/search.inc | 4 +- skins/classic/functions.js | 16 ++--- skins/classic/mail.css | 1 + skins/classic/templates/mail.html | 8 ++- skins/larry/mail.css | 1 + skins/larry/templates/mail.html | 8 ++- skins/larry/ui.js | 16 ++--- 16 files changed, 130 insertions(+), 82 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d09d97568..47909f379 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Added separate From and To columns apart from smart From/To column (#1486891) - Fix fallback to Larry skin when configured skin isn't available (#1488591) - Fix (workaround) delete operations with some versions of memcache (#1488592) - Fix (disable) request validation for spell and spell_html actions diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 58e59ae6e..58f9ca865 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -387,15 +387,15 @@ $rcmail_config['plugins'] = array(); // ---------------------------------- // default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'size', 'cc' +// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' $rcmail_config['message_sort_col'] = ''; // default messages sort order $rcmail_config['message_sort_order'] = 'DESC'; // These cols are shown in the message list. Available cols are: -// subject, from, to, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'from', 'date', 'size', 'flag', 'attachment'); +// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' +$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); // the default locale setting (leave empty for auto-detection) // RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR diff --git a/program/js/app.js b/program/js/app.js index afaebec9c..214a5cb80 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1612,7 +1612,7 @@ function rcube_webmail() for (i=0; i= 0) @@ -1891,7 +1891,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; icommand('message_list.clear', $all_count ? false : true); if ($all_count) { - $a_headers = $RCMAIL->storage->list_messages($mbox_name, null, $_SESSION['sort_col'], $_SESSION['sort_order']); + $a_headers = $RCMAIL->storage->list_messages($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 ddd34315a..b2f81d73c 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -75,7 +75,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') { $search_request = md5($mbox_name.$_SESSION['search_filter']); - $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $_SESSION['sort_col']); + $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column()); $_SESSION['search'] = $RCMAIL->storage->get_search_set(); $_SESSION['search_request'] = $search_request; $OUTPUT->set_env('search_request', $search_request); @@ -126,13 +126,76 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { $OUTPUT->set_pagetitle(rcmail_localize_foldername($RCMAIL->storage->mod_folder($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->storage->get_hierarchy_delimiter(); + $mbox = $RCMAIL->storage->get_folder(); + $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 $RCMAIL, $CONFIG, $OUTPUT; + global $CONFIG, $OUTPUT; // add some labels to client $OUTPUT->add_label('from', 'to'); @@ -153,15 +216,6 @@ function rcmail_message_list($attrib) // save some variables for use in ajax list $_SESSION['list_attrib'] = $attrib; - - $mbox = $RCMAIL->storage->get_folder(); - $delim = $RCMAIL->storage->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'); @@ -212,7 +266,6 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null } $mbox = $RCMAIL->storage->get_folder(); - $delim = $RCMAIL->storage->get_hierarchy_delimiter(); // make sure 'threads' and 'subject' columns are present if (!in_array('subject', $a_show_cols)) @@ -222,11 +275,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); @@ -240,7 +288,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; @@ -261,16 +314,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, false, null, $header->charset), 'show'); - else if ($col=='subject') { + $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, false, null, $header->charset), 'show'); + else if ($col == 'subject') { $cont = trim(rcube_mime::decode_header($header->$col, $header->charset)); 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); @@ -321,8 +376,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")); @@ -331,7 +384,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')"; @@ -349,6 +402,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) { @@ -363,6 +421,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 f3318fa18..b5d579d7d 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)) @@ -61,7 +55,7 @@ $RCMAIL->storage->folder_sync($mbox_name); if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') { $search_request = md5($mbox_name.$_SESSION['search_filter']); - $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col); + $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column()); $_SESSION['search'] = $RCMAIL->storage->get_search_set(); $_SESSION['search_request'] = $search_request; $OUTPUT->set_env('search_request', $search_request); @@ -69,7 +63,7 @@ if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') // fetch message headers if ($count = $RCMAIL->storage->count($mbox_name, $threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh']))) - $a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, $sort_col, $sort_order); + $a_headers = $RCMAIL->storage->list_messages($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 238e11797..c220fc5c4 100644 --- a/program/steps/mail/mark.inc +++ b/program/steps/mail/mark.inc @@ -118,11 +118,8 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va // 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 = $RCMAIL->storage->list_messages($mbox, NULL, $sort_col, $sort_order, - $jump_back ? NULL : $count); + $a_headers = $RCMAIL->storage->list_messages($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 d3dd9bfea..da43b4000 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -135,11 +135,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 = $RCMAIL->storage->list_messages($mbox, NULL, $sort_col, $sort_order, - $jump_back ? NULL : $count); + $a_headers = $RCMAIL->storage->list_messages($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 e17d82123..e4b70ad60 100644 --- a/program/steps/mail/pagenav.inc +++ b/program/steps/mail/pagenav.inc @@ -20,7 +20,7 @@ */ $uid = get_input_value('_uid', RCUBE_INPUT_GET); -$index = $RCMAIL->storage->index(null, $_SESSION['sort_col'], $_SESSION['sort_order']); +$index = $RCMAIL->storage->index(null, rcmail_sort_column(), rcmail_sort_order()); $cnt = $index->count_messages(); if ($cnt && ($pos = $index->exists($uid, true)) !== false) { diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index a7605f6d0..b0d584100 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -107,7 +107,7 @@ $search_str = trim($search_str); // execute IMAP search if ($search_str) - $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $_SESSION['sort_col']); + $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $sort_column); // save search results in session if (!is_array($_SESSION['search'])) @@ -121,7 +121,7 @@ $_SESSION['search_request'] = $search_request; // Get the headers -$result_h = $RCMAIL->storage->list_messages($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']); +$result_h = $RCMAIL->storage->list_messages($mbox, 1, rcmail_sort_column(), rcmail_sort_order()); $count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL'); diff --git a/skins/classic/functions.js b/skins/classic/functions.js index 48f9acd75..9b83b9044 100644 --- a/skins/classic/functions.js +++ b/skins/classic/functions.js @@ -298,22 +298,18 @@ listmenu: function(show) pos.left = pos.left - menuwidth; obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)}); + // set form values $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true); $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC'); $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC'); $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false); $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true); - // list columns - var found, cols = $('input[name="list_col[]"]'); - for (var i=0; i
    • -
    • +
    • +
    • +
    • @@ -178,7 +180,9 @@
    • -
    • +
    • +
    • +
    • diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 695697f6b..6e4e0cd7d 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -422,6 +422,7 @@ a.iconbutton.threadmode.selected { text-align: right; } +#messagelist tr td.fromto, #messagelist tr td.from, #messagelist tr td.to, #messagelist tr td.cc, diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index 32c64d929..8b205efbe 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -181,7 +181,9 @@
      • -
      • +
      • +
      • +
      • @@ -201,7 +203,9 @@
      • -
      • +
      • +
      • +
    diff --git a/skins/larry/ui.js b/skins/larry/ui.js index 698785161..b6056b6ee 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -620,18 +620,10 @@ function rcube_mail_ui() $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false); $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true); - // list columns - var found, cols = $('input[name="list_col[]"]'); - for (var i=0; i < cols.length; i++) { - if (cols[i].value != 'from') { - found = $.inArray(cols[i].value, rcmail.env.coltypes) != -1; - } - else { - found = ($.inArray('from', rcmail.env.coltypes) != -1 - || $.inArray('to', rcmail.env.coltypes) != -1); - } - $(cols[i]).prop('checked', found); - } + // set checkboxes + $('input[name="list_col[]"]').each(function() { + $(this).prop('checked', $.inArray(this.value, rcmail.env.coltypes) != -1); + }); $dialog.dialog({ modal: true, -- cgit v1.2.3