Ticket #1485012: rc_preview_not_read_r1556.patch

config/main.inc.php.dist

@@ -342 +342 @@
 // default setting if preview pane is enabled
 $rcmail_config['preview_pane'] = FALSE;
 
+// default setting if messages are marked as read when viewed in the preview pane
+$rcmail_config['preview_pane_mark_read'] = TRUE;
+
 // Clear Trash on logout
 $rcmail_config['logout_purge'] = FALSE;
 

program/localization/en_US/labels.inc

@@ -325 +325 @@
 
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+
 ?>

program/steps/mail/show.inc

@@ -66 +66 @@
   $OUTPUT->set_pagetitle($MESSAGE->subject);
   
   // mark message as read
-  if (!$MESSAGE->headers->seen)
+  if (!$MESSAGE->headers->seen && !($RCMAIL->action == 'preview' && !$CONFIG['preview_pane_mark_read']))
   {
     $marked = $IMAP->set_flag($MESSAGE->uid, 'SEEN');
     if($RCMAIL->action == 'preview' && $marked != -1)

program/steps/settings/func.inc

@@ -177 +177 @@
                     Q(rcube_label('previewpane')),
                     $input_preview->show($config['preview_pane']?1:0));
     }
+    
+  // show config parameter for preview pane auto mark as read
+  if (!isset($no_override['preview_pane_mark_read']))
+    {
+    $field_id = 'rcmfd_preview_pane_mark_read';
+    $input_preview_read = new html_checkbox(array('name' => '_preview_pane_mark_read', 'id' => $field_id, 'value' => 1));
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('previewpanemarkread')),
+                    $input_preview_read->show($config['preview_pane_mark_read']?1:0));
+    }
 
   if (!isset($no_override['mdn_requests']))
     {

program/steps/settings/save_prefs.inc

@@ -29 +29 @@
   'htmleditor'   => isset($_POST['_htmleditor']) ? TRUE : FALSE,
   'inline_images'   => isset($_POST['_inline_images']) ? TRUE : FALSE,
   'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+  'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? TRUE : FALSE,
   'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
   'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
   'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,