[SM-CVS] SF.net SVN: squirrelmail:[14956] branches/SM-1_4-STABLE/squirrelmail

[<pdo...@us...>]

Revision: 14956
          http://sourceforge.net/p/squirrelmail/code/14956
Author:   pdontthink
Date:     2022-05-22 20:16:41 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Add option to folder prefs for marking deleted messages as read

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
    branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php
    branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2022-05-22 18:57:29 UTC (rev 14955)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2022-05-22 20:16:41 UTC (rev 14956)
@@ -71,8 +71,10 @@
  *
  */
 function sqimap_msgs_list_delete($imap_stream, $mailbox, $id) {
-    global $move_to_trash, $trash_folder, $uid_support;
+    global $move_to_trash, $trash_folder, $uid_support, $mark_as_read_upon_delete;
     $msgs_id = sqimap_message_list_squisher($id);
+    if ($mark_as_read_upon_delete)
+        sqimap_toggle_flag($imap_stream, $id, '\\Seen', true, true);
     if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
         /**
          * turn off internal error handling (third argument = false) and

Modified: branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php	2022-05-22 18:57:29 UTC (rev 14955)
+++ branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php	2022-05-22 20:16:41 UTC (rev 14956)
@@ -87,6 +87,9 @@
 $save_as_draft =
     getPref($data_dir, $username, 'save_as_draft', $default_save_as_draft);
 
+$mark_as_read_upon_delete =
+    getPref($data_dir, $username, 'mark_as_read_upon_delete', FALSE);
+
 if ($default_unseen_type == '') {
     $default_unseen_type = 1;
 }
@@ -130,7 +133,6 @@
 
 $show_num = getPref($data_dir, $username, 'show_num', 15 );
 
-$wrap_at = getPref( $data_dir, $username, 'wrap_at', 86 );
 if ($wrap_at < 15) { $wrap_at = 15; }
 
 $left_size = getPref($data_dir, $username, 'left_size');

Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php	2022-05-22 18:57:29 UTC (rev 14955)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php	2022-05-22 20:16:41 UTC (rev 14956)
@@ -97,6 +97,12 @@
         'posvals' => $sent_folder_values,
         'save'    => 'save_option_sent_folder'
     );
+    $optvals[SMOPT_GRP_SPCFOLDER][] = array(
+        'name'    => 'mark_as_read_upon_delete',
+        'caption' => _("Mark Deleted Messages as Read"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
 
     /*** Load the General Options into the array ***/
     $optgrps[SMOPT_GRP_FOLDERLIST] = _("Folder List Options");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.