till
2008-02-02 fa0152c21a7465013cd2a980d5cd3531ff7720d6
* fixed #1484738

2 files modified
14 ■■■■ changed files
program/include/rcube_imap.inc 6 ●●●● patch | view | raw | blame | history
program/steps/settings/manage_folders.inc 8 ●●●● patch | view | raw | blame | history
program/include/rcube_imap.inc
@@ -1771,13 +1771,17 @@
          $deleted = TRUE;
        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);
            $result = iil_C_DeleteFolder($this->conn, $c_mbox);
            if ($result>=0)
              $deleted = TRUE;
            }
          }
        }
    // clear mailboxlist cache
program/steps/settings/manage_folders.inc
@@ -119,8 +119,14 @@
    {
    $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();
    }