Improvements in creating flag form IDs.

When dealing with negative set flags, add a slash to distinguish
from user-defined flags that begin with 0.

diff --git a/imp/lib/Imap/Flags.php b/imp/lib/Imap/Flags.php
index 0e5f1dc..4add4d6 100644 (file)
--- a/imp/lib/Imap/Flags.php
+++ b/imp/lib/Imap/Flags.php
@@ -368,7 +368,7 @@ class IMP_Imap_Flags
             $act2 = ($act1 == 'set') ? 'unset' : 'set';
 
             $ret[$act1][] = $tmp;
-            $tmp['f'] = '0' . $val['flag'];
+            $tmp['f'] = '0\\' . $val['flag'];
             $ret[$act2][] = $tmp;
         }
 

diff --git a/imp/mailbox.php b/imp/mailbox.php
index feca691..9dfbeee 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -168,8 +168,8 @@ case 'flag_messages':
     $flag = Horde_Util::getPost('flag');
     if ($flag && !empty($indices)) {
         $set = true;
-        if ($flag[0] == '0') {
-            $flag = substr($flag, 1);
+        if (strpos($flag, '0\\') === 0) {
+            $flag = substr($flag, 2);
             $set = false;
         }
         $imp_message = IMP_Message::singleton();

diff --git a/imp/message.php b/imp/message.php
index c7750bb..a998e27 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -144,8 +144,8 @@ case 'flag_message':
     $flag = Horde_Util::getFormData('flag');
     if ($flag && !empty($indices_array)) {
         $peek = $set = true;
-        if ($flag[0] == '0') {
-            $flag = substr($flag, 1);
+        if (strpos($flag, '0\\') === 0) {
+            $flag = substr($flag, 2);
             $set = false;
         }
         $imp_message->flag(array($flag), $indices_array, $set);