Bug #8306: Remove msgflags_hidesys pref

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 45ba878..27fca7f 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -137,7 +137,7 @@ if (!$is_pop3) {
         'column' => _("Message Options"),
         'label' => _("Message Flags"),
         'desc' => _("Customize flag highlighting."),
-        'members' => array('msgflags_hidesys', 'flagmanagement')
+        'members' => array('flagmanagement')
     );
 
     $prefGroups['fetchmail'] = array(
@@ -1136,10 +1136,10 @@ $_prefs['msgflags'] = array(
     //                NO DEFAULT (entry required)
     //          't' - (string) [type] The flag type:
     //                'atc' - Attachment information
-    //                'imap' - IMAP flags (not user settable)
+    //                'imap' - IMAP system flags (not settable by user)
     //                'imapp' - IMAP flags (personal flags - created by user
     //                          through the prefs interface)
-    //                'imapu' - IMAP flags (user settable)
+    //                'imapu' - IMAP system flags (settable by user)
     //                'imp' - IMP defined flags
     //                NO DEFAULT (entry required)
     'value' => json_encode(array(
@@ -1196,20 +1196,24 @@ $_prefs['msgflags'] = array(
             'c' => 'flagUnseen',
             'l' => _("Unseen"),
             'n' => true,
-            't' => 'imap'
+            't' => 'imapu'
         ),
         '\\answered' => array(
             'a' => 'r',
             'b' => '#ccffcc',
             'c' => 'flagAnswered',
             'l' => _("Answered"),
+            // By default, this flag is not settable by the user - it is
+            // automatically set when a message is replied to.
             't' => 'imap'
         ),
         '\\draft' => array(
             'a' => 'd',
             'c' => 'flagDraft',
             'l' => _("Draft"),
-            't' => 'imapu'
+            // By default, this flag is not settable by the user - it is
+            // automatically set/reset when a message is drafted/finished.
+            't' => 'imap'
         ),
         '\\flagged' => array(
             'a' => '*',
@@ -1223,7 +1227,7 @@ $_prefs['msgflags'] = array(
             'b' => '#999999',
             'c' => 'flagDeleted',
             'l' => _("Deleted"),
-            't' => 'imap'
+            't' => 'imapu'
         ),
 
         // Forwarded flag (RFC 4550 [2.8])
@@ -1248,14 +1252,6 @@ $_prefs['msgflags_color'] = array(
     'shared' => false,
     'type' => 'implicit');
 
-// Allow user to alter system flags?
-$_prefs['msgflags_hidesys'] = array(
-    'value' => false,
-    'locked' => false,
-    'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Show only user flags in the drop down lists to mark messages?"));
-
 // End IMAP Flag preferences
 
 

diff --git a/imp/lib/Imap/Flags.php b/imp/lib/Imap/Flags.php
index 0785beb..5e42950 100644 (file)
--- a/imp/lib/Imap/Flags.php
+++ b/imp/lib/Imap/Flags.php
@@ -64,7 +64,8 @@ class IMP_Imap_Flags
      * 'fgcolor' - (boolean) If true, add foreground color information to be
      *             used for text overlay purposes.
      *             DEFAULT: false
-     * 'imap' - (boolean) If true, only return IMAP flags.
+     * 'imap' - (boolean) If true, only return IMAP flags that can be set by
+     *          the user.
      *          DEFAULT: false
      * 'mailbox' - (string) A real (not virtual) IMAP mailbox. If set, will
      *             determine what flags are available in the mailbox.
@@ -88,9 +89,6 @@ class IMP_Imap_Flags
         $types = array();
         if (!empty($options['imap'])) {
             $types = array('imapp', 'imapu');
-            if (!$GLOBALS['prefs']->getValue('msgflags_hidesys')) {
-                $types[] = 'imap';
-            }
         }
 
         /* Reduce the list of flags for the mailbox depending on the return