Changeset bc49601 in github

Timestamp:

Apr 9, 2010 11:12:40 AM (3 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

a920289

Parents:

814905c

Message:

Option not to mark messages as read when viewed in preview pane (#1485012)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/js/app.js (modified) (5 diffs)
• program/localization/de_CH/labels.inc (modified) (2 diffs)
• program/localization/de_DE/labels.inc (modified) (2 diffs)
• program/localization/en_US/labels.inc (modified) (2 diffs)
• program/steps/mail/compose.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)
• program/steps/mail/show.inc (modified) (2 diffs)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added option not to mark messages as read when viewed in preview pane (#1485012)
+- Allow plugins modify the Sent folder when composing (#1486548)
 - Added optional (max_recipients) support to restrict total number of recipients per message (#1484542)
 - Re-organize editor buttons, add blockquote and search buttons

config/main.inc.php.dist

@@ -435 +435 @@
 $rcmail_config['preview_pane'] = false;
 
+// Mark as read when viewed in preview pane (delay in seconds)
+// Set to -1 if messages in preview pane should not be marked as read
+$rcmail_config['preview_pane_mark_read'] = 0;
+
 // focus new window if new message arrives
 $rcmail_config['focus_on_new_message'] = true;

program/js/app.js

@@ -1274 +1274 @@
       clearTimeout(this.preview_timer);
     
+    if (this.preview_read_timer)
+      clearTimeout(this.preview_read_timer);
+
     // save folderlist and folders location/sizes for droptarget calculation in drag_move()
     if (this.gui_objects.folderlist && model)
@@ -1439 +1442 @@
       clearTimeout(this.preview_timer);
 
+    if (this.preview_read_timer)
+      clearTimeout(this.preview_read_timer);
+
     var selected = list.get_single_selection() != null;
 
@@ -1465 +1471 @@
       if (this.preview_timer)
         clearTimeout(this.preview_timer);
+
+      if (this.preview_read_timer)
+        clearTimeout(this.preview_read_timer);
 
     var uid = list.get_single_selection();
@@ -1755 +1764 @@
     if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
       this.show_contentframe(true);
-    else
-      {
+    else {
       this.set_busy(true, 'loading');
       target.location.href = this.env.comm_path+url;
 
       // mark as read and change mbox unread counter
-      if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
-        {
-        this.set_message(id, 'unread', false);
-        this.update_thread_root(id, 'read');
-        if (this.env.unread_counts[this.env.mailbox])
-          {
-          this.env.unread_counts[this.env.mailbox] -= 1;
-          this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
+      if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
+        this.preview_read_timer = window.setTimeout(function() {
+          ref.set_message(id, 'unread', false);
+          ref.update_thread_root(id, 'read');
+          if (ref.env.unread_counts[ref.env.mailbox]) {
+            ref.env.unread_counts[ref.env.mailbox] -= 1;
+            ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX');
           }
-        }
-      }
-    };
+          if (ref.env.preview_pane_mark_read > 0)
+            ref.http_post('mark', '_uid='+id+'&_flag=read');
+        }, this.env.preview_pane_mark_read * 1000);
+      }
+    }
+  };
 
   this.show_contentframe = function(show)
@@ -4662 +4672 @@
     }
 
+  this.toggle_preview_pane = function(checkbox)
+    {
+    var preview_pane_mark_read;
+    if (preview_pane_mark_read = document.getElementById('rcmfd_preview_pane_mark_read'))
+      preview_pane_mark_read.disabled = !checkbox.checked;
+    }
+
   // display fetched raw headers
   this.set_headers = function(content)

program/localization/de_CH/labels.inc

@@ -272 +272 @@
 $labels['keepalive'] = 'Auf neue Nachrichten prÃŒfen nach';
 $labels['never'] = 'nie';
+$labels['immediately']  = 'sofort';
 $labels['messagesdisplaying'] = 'Nachrichtendarstellung';
 $labels['messagescomposition'] = 'Nachrichtenerstellung';
@@ -300 +301 @@
 $labels['abovequote'] = 'ÃŒber der Originalnachricht einfÃŒgen';
 $labels['insertsignature'] = 'Signatur einfÃŒgen';
+$labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
+$labels['afternseconds']  = 'nach $n Sekuden';
 $labels['folder'] = 'Ordner';
 $labels['folders'] = 'Ordner';

program/localization/de_DE/labels.inc

@@ -272 +272 @@
 $labels['keepalive'] = 'Auf neue Nachrichten prÃŒfen nach';
 $labels['never'] = 'nie';
+$labels['immediately']  = 'sofort';
 $labels['messagesdisplaying'] = 'Nachrichtendarstellung';
 $labels['messagescomposition'] = 'Nachrichtenerstellung';
@@ -300 +301 @@
 $labels['abovequote'] = 'ÃŒber der Originalnachricht einfÃŒgen';
 $labels['insertsignature'] = 'Signatur einfÃŒgen';
+$labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
+$labels['afternseconds']  = 'nach $n Sekuden';
 $labels['folder'] = 'Ordner';
 $labels['folders'] = 'Ordner';

program/localization/en_US/labels.inc

@@ -328 +328 @@
 $labels['keepalive']  = 'Check for new messages on';
 $labels['never']  = 'never';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Displaying Messages';
 $labels['messagescomposition'] = 'Composing Messages';
@@ -356 +357 @@
 $labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
 
 $labels['folder']  = 'Folder';

program/steps/mail/compose.inc

@@ -144 +144 @@
   $MESSAGE = new rcube_message($msg_uid);
   
+  // make sure message is marked as read
+  if ($MESSAGE && $MESSAGE->headers && !$MESSAGE->headers->seen)
+    $IMAP->set_flag($msg_uid, 'SEEN');
+
   if (!empty($MESSAGE->headers->charset))
     $IMAP->set_charset($MESSAGE->headers->charset);

program/steps/mail/func.inc

@@ -122 +122 @@
   if ($CONFIG['display_next'])
     $OUTPUT->set_env('display_next', true);
-          
+
+  $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));
+
   if ($CONFIG['trash_mbox'])
     $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);

program/steps/mail/show.inc

@@ -141 +141 @@
     }
 
-  if (!$MESSAGE->headers->seen)
+  if (!$MESSAGE->headers->seen && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
     $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid,
       'mailbox' => $mbox_name, 'message' => $MESSAGE));
@@ -227 +227 @@
 
 // mark message as read
-if ($MESSAGE && $MESSAGE->headers && !$MESSAGE->headers->seen)
+if ($MESSAGE && $MESSAGE->headers && !$MESSAGE->headers->seen && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
   $IMAP->set_flag($MESSAGE->uid, 'SEEN');
 

program/steps/settings/func.inc

@@ -280 +280 @@
     if (!isset($no_override['preview_pane'])) {
       $field_id = 'rcmfd_preview';
-      $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
+      $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1,
+        'onchange' => JS_OBJECT_NAME.'.toggle_preview_pane(this)'));
 
       $blocks['main']['options']['preview_pane'] = array(
         'title' => html::label($field_id, Q(rcube_label('previewpane'))),
         'content' => $input_preview->show($config['preview_pane']?1:0),
+      );
+    }
+
+    // show config parameter for preview pane auto mark as read delay
+    if (!isset($no_override['preview_pane_mark_read'])) {
+      // apply default if config option is not set at all
+      $config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);
+      
+      $field_id = 'rcmfd_preview_pane_mark_read';
+      $select_delay = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
+        'disabled' => $config['preview_pane']?0:1));
+
+      $select_delay->add(rcube_label('never'), '-1');
+      $select_delay->add(rcube_label('immediately'), 0);
+      foreach(array(5, 10, 20, 30) as $sec)
+        $select_delay->add(rcube_label(array('name' => 'afternseconds', 'vars' => array('n' => $sec))), $sec);
+
+      $blocks['main']['options']['preview_pane_mark_read'] = array(
+        'title' => html::label($field_id, Q(rcube_label('previewpanemarkread'))),
+        'content' => $select_delay->show(intval($config['preview_pane_mark_read'])),
       );
     }

program/steps/settings/save_prefs.inc

@@ -41 +41 @@
     $a_user_prefs = array(
       'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE,
-      'preview_pane'         => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+      'preview_pane'         => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+      'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'],
       'autoexpand_threads'   => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
       'mdn_requests'         => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,