Bug #8882: Don't allow flagging deleted by default

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 82aeae5..05178fb 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -1195,14 +1195,6 @@ $_prefs['msgflags'] = array(
         //         DEFAULT: false
 
         // System IMAP flags (RFC 3501 [2.3.2])
-        '\\seen' => array(
-            'a' => 'N',
-            'b' => '#eeeeff',
-            'c' => 'flagUnseen',
-            'l' => _("Unseen"),
-            'n' => true,
-            't' => 'imapu'
-        ),
         '\\answered' => array(
             'a' => 'r',
             'b' => '#ccffcc',
@@ -1220,18 +1212,23 @@ $_prefs['msgflags'] = array(
             // automatically set/reset when a message is drafted/finished.
             't' => 'imap'
         ),
-
-        // Forwarded flag (RFC 5550 [5.9])
-        '$forwarded' => array(
-            'a' => 'F',
-            'b' => '#bfdfdf',
-            'c' => 'flagForwarded',
-            'l' => _("Forwarded"),
-            // Pursuant to RFC, this flag SHOULD NOT be changed by the user
+        '\\deleted' => array(
+            'a' => 'D',
+            'b' => '#999999',
+            'c' => 'flagDeleted',
+            'l' => _("Deleted"),
+            // By default, this flag is not settable by the user - it is
+            // handled via the Delete/Undelete links.
             't' => 'imap'
         ),
-
-        // Continued: System IMAP flags (RFC 3501 [2.3.2])
+        '\\seen' => array(
+            'a' => 'N',
+            'b' => '#eeeeff',
+            'c' => 'flagUnseen',
+            'l' => _("Unseen"),
+            'n' => true,
+            't' => 'imapu'
+        ),
         '\\flagged' => array(
             'a' => '*',
             'b' => '#ffcccc',
@@ -1239,12 +1236,15 @@ $_prefs['msgflags'] = array(
             'l' => _("Flagged for Followup"),
             't' => 'imapu'
         ),
-        '\\deleted' => array(
-            'a' => 'D',
-            'b' => '#999999',
-            'c' => 'flagDeleted',
-            'l' => _("Deleted"),
-            't' => 'imapu'
+
+        // Forwarded flag (RFC 5550 [5.9])
+        '$forwarded' => array(
+            'a' => 'F',
+            'b' => '#bfdfdf',
+            'c' => 'flagForwarded',
+            'l' => _("Forwarded"),
+            // Pursuant to RFC, this flag SHOULD NOT be changed by the user
+            't' => 'imap'
         ),
     )),
     'locked' => false,