1 files changed, 56 insertions, 4 deletions

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 3487ec73f..066d38151 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/func.inc                                           |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -37,7 +37,7 @@ if (!empty($_GET['_page'])) {
 
 $a_threading        = $RCMAIL->config->get('message_threading', array());
 $message_sort_col   = $RCMAIL->config->get('message_sort_col');
-$message_sort_order = $RCMAIL->config->get('message_sort_col');
+$message_sort_order = $RCMAIL->config->get('message_sort_order');
 
 // set default sort col/order to session
 if (!isset($_SESSION['sort_col'])) {
@@ -144,7 +144,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
     if (!$OUTPUT->ajax_call) {
         $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
             'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
-            'copy', 'move', 'quota', 'replyall', 'replylist', 'importwait');
+            'copy', 'move', 'quota', 'replyall', 'replylist');
     }
 
     $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
@@ -651,7 +651,7 @@ function rcmail_get_messagecount_text($count = null, $page = null)
         $max = $RCMAIL->storage->count(NULL, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
 
     if ($max == 0)
-        $out = $RCMAIL->gettext('mailboxempty');
+        $out = $RCMAIL->storage->get_search_set() ? $RCMAIL->gettext('nomessages') : $RCMAIL->gettext('mailboxempty');
     else
         $out = $RCMAIL->gettext(array('name' => $RCMAIL->storage->get_threading() ? 'threadsfromto' : 'messagesfromto',
             'vars' => array('from'  => $start_msg,
@@ -2138,6 +2138,58 @@ function rcmail_message_import_form($attrib = array())
         $content);
 
     $RCMAIL->output->add_gui_object('importform', $attrib['id'].'Frm');
+    $RCMAIL->output->add_label('selectimportfile','importwait');
 
     return html::div($attrib, $out);
 }
+
+/**
+ * Add groups from the given address source to the address book widget
+ */
+function rcmail_compose_contact_groups($abook, $source_id, $search = null, $search_mode = 0)
+{
+    global $RCMAIL, $OUTPUT;
+
+    $jsresult = array();
+    foreach ($abook->list_groups($search, $search_mode) as $group) {
+        $abook->reset();
+        $abook->set_group($group['ID']);
+        $group_prop = $abook->get_group($group['ID']);
+
+        // group (distribution list) with email address(es)
+        if ($group_prop['email']) {
+            foreach ((array)$group_prop['email'] as $email) {
+                $row_id = 'G'.$group['ID'];
+                $jsresult[$row_id] = format_email_recipient($email, $group['name']);
+                $OUTPUT->command('add_contact_row', $row_id, array(
+                    'contactgroup' => html::span(array('title' => $email), rcube::Q($group['name']))), 'group');
+            }
+        }
+        // make virtual groups clickable to list their members
+        else if ($group_prop['virtual']) {
+            $row_id = 'G'.$group['ID'];
+            $OUTPUT->command('add_contact_row', $row_id, array(
+                'contactgroup' => html::a(array(
+                    'href' => '#list',
+                    'rel' => $group['ID'],
+                    'title' => $RCMAIL->gettext('listgroup'),
+                    'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)",
+                                    rcmail_output::JS_OBJECT_NAME, $source_id, $group['ID']),
+                ), rcube::Q($group['name']) . ' ' . html::span('action', '»'))),
+                'group',
+                array('ID' => $group['ID'], 'name' => $group['name'], 'virtual' => true));
+        }
+        // show group with count
+        else if (($result = $abook->count()) && $result->count) {
+            $row_id = 'E'.$group['ID'];
+            $jsresult[$row_id] = $group['name'];
+            $OUTPUT->command('add_contact_row', $row_id, array(
+                'contactgroup' => rcube::Q($group['name'] . ' (' . intval($result->count) . ')')), 'group');
+        }
+    }
+
+    $abook->reset();
+    $abook->set_group(0);
+
+    return $jsresult;
+}