Changeset 993 in subversion

Timestamp:

Feb 2, 2008 12:22:36 PM (5 years ago)

Author:

till

Message:

• fixed #1484738

Location:

trunk/roundcubemail/program

Files:

• include/rcube_imap.inc (modified) (2 diffs)
• steps/settings/manage_folders.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_imap.inc

@@ -1772 +1772 @@
 
         foreach ($all_mboxes as $c_mbox)
-          if (preg_match('/^'.preg_quote($mailbox.$this->delimiter).'/', $c_mbox))
+          {
+          $regex = preg_quote($mailbox . $this->delimiter, '/');
+          $regex = '/^' . $regex . '/';
+          if (preg_match($regex, $c_mbox))
             {
             iil_C_UnSubscribe($this->conn, $c_mbox);
@@ -1779 +1782 @@
               $deleted = TRUE;
             }
+          }
         }
 

trunk/roundcubemail/program/steps/settings/manage_folders.inc

@@ -120 +120 @@
     $OUTPUT->command('remove_folder_row', get_input_value('_mboxes', RCUBE_INPUT_POST));
     foreach ($a_mboxes as $mbox)
-      if (preg_match('/^'.preg_quote(get_input_value('_mboxes', RCUBE_INPUT_POST).$delimiter).'/', $mbox))
+      {
+      $regex = get_input_value('_mboxes', RCUBE_INPUT_POST) . $delimiter;
+      $regex = preg_quote($regex, '/');
+      if (preg_match('/^'. $regex .'/', $mbox))
+        {
         $OUTPUT->command('remove_folder_row', $mbox);
+        }
+      }
     $OUTPUT->show_message('folderdeleted', 'confirmation');
     $OUTPUT->send();