Changeset 2fd9750 in github

Timestamp:

Nov 28, 2008 2:03:24 PM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

2bedfab7

Parents:

41b43ba

Message:

Option to check for new mails in all folders (#1484374)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/localization/de_CH/labels.inc (modified) (2 diffs)
• program/localization/de_DE/labels.inc (modified) (2 diffs)
• program/localization/en_GB/labels.inc (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/steps/mail/check_recent.inc (modified) (4 diffs)
• program/steps/settings/func.inc (modified) (2 diffs)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/11/28 (thomasb)
+----------
+- Option to check for new mails in all folders (#1484374)
+- Don't set client busy when checking for new messages (#1485276)
 
 2008/11/26 (alec)

config/main.inc.php.dist

@@ -403 +403 @@
 $rcmail_config['keep_alive'] = 60;
 
+// If true all folders will be checked for recent messages
+$rcmail_config['check_all_folders'] = FALSE;
+
 // end of config file
 ?>

program/localization/de_CH/labels.inc

@@ -123 +123 @@
 $labels['none'] = 'Keine';
 $labels['unread'] = 'Ungelesene';
+$labels['flagged'] = 'Markiert';
+$labels['unanswered'] = 'Unbeantwortet';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
@@ -235 +237 @@
 $labels['messagescomposition'] = 'Nachrichtenerstellung';
 $labels['mimeparamfolding'] = 'Namen der DateianhÀnge';
-$labels['2231folding'] = 'VollstÀndig RFC 2231 kompatibel (Mozilla Thunderbird)';
+$labels['2231folding'] = 'VollstÀndig RFC 2231 kompatibel (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 kompatibel (Microsoft Outlook)';
 $labels['2047folding'] = 'VollstÀndig RFC 2047 kompatibel (andere)';
 $labels['advancedoptions'] = 'Erweiterte Einstellungen';
 $labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
+$labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prÃŒfen';
 $labels['folder'] = 'Ordner';
 $labels['folders'] = 'Ordner';

program/localization/de_DE/labels.inc

@@ -122 +122 @@
 $labels['none'] = 'Keine';
 $labels['unread'] = 'Ungelesene';
+$labels['flagged'] = 'Markiert';
+$labels['unanswered'] = 'Unbeantwortet';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
@@ -234 +236 @@
 $labels['messagescomposition'] = 'Nachrichtenerstellung';
 $labels['mimeparamfolding'] = 'Namen der DateianhÀnge';
-$labels['2231folding'] = 'VollstÀndig RFC 2231 kompatibel (Mozilla Thunderbird)';
+$labels['2231folding'] = 'VollstÀndig RFC 2231 kompatibel (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 kompatibel (Microsoft Outlook)';
 $labels['2047folding'] = 'VollstÀndig RFC 2047 kompatibel (andere)';
 $labels['advancedoptions'] = 'Erweiterte Einstellungen';
 $labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
+$labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prÃŒfen';
 $labels['folder'] = 'Ordner';
 $labels['folders'] = 'Ordner';

program/localization/en_GB/labels.inc

@@ -234 +234 @@
 $labels['advancedoptions'] = 'Advanced options';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
 $labels['messagesdisplaying'] = 'Displaying Messages';
 $labels['messagescomposition'] = 'Composing Messages';

program/localization/en_US/labels.inc

@@ -296 +296 @@
 $labels['advancedoptions'] = 'Advanced options';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
 
 $labels['folder']  = 'Folder';

program/steps/mail/check_recent.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -21 +21 @@
 
 $a_mailboxes = $IMAP->list_mailboxes();
+$check_all = (bool)$RCMAIL->config->get('check_all_folders');
 
-foreach ($a_mailboxes as $mbox_name)
-  {
-  if ($mbox_name == $IMAP->get_mailbox_name())
-    {
-    if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE))
-      {
+foreach ($a_mailboxes as $mbox_name) {
+  if ($mbox_name == $IMAP->get_mailbox_name()) {
+    if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE)) {
       // refresh saved search set
       if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set)
@@ -48 +46 @@
       $a_headers = array();
       for ($i=$recent_count, $id=$count_all-$recent_count+1; $i>0; $i--, $id++)
-        {
+      {
         // skip message if it does not match the current search
         if (!$IMAP->in_searchset($id))
@@ -56 +54 @@
         if ($header->recent)
           $a_headers[] = $header;
-        }
+      }
 
       rcmail_js_message_list($a_headers, TRUE);
-      }
-    }
-  else
-    {
-    if ($IMAP->messagecount($mbox_name, 'RECENT'))
-      $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'));
     }
   }
+  else if ($IMAP->messagecount($mbox_name, 'RECENT', $check_all)) {
+    $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all));
+  }
+}
 
 $OUTPUT->send();

program/steps/settings/func.inc

@@ -182 +182 @@
     foreach(array(1, 3, 5, 10, 15, 30, 60) as $min)
       if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60)
-        && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) {
+          && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) {
         $select_keep_alive->add(rcube_label(array('name' => 'keepaliveevery', 'vars' => array('n' => $min))), $min);
       }
@@ -188 +188 @@
     $table->add('title', html::label($field_id, Q(rcube_label('keepalive'))));
     $table->add(null, $select_keep_alive->show($config['keep_alive']/60));
+  }
+
+  if (!isset($no_override['check_all_folders'])) {
+    $field_id = 'rcmfd_check_all_folders';
+    $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
+    $table->add('title', html::label($field_id, Q(rcube_label('checkallfolders'))));
+    $table->add(null, $input_check_all->show($config['check_all_folders']?1:0));
   }
 

program/steps/settings/save_prefs.inc

@@ -39 +39 @@
   'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
   'keep_alive' => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'],
+  'check_all_folders' => isset($_POST['_check_all_folders']) ? TRUE : FALSE,
   'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
   'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,