From c321a955a7b0f6d6b13ffaebf040a6c7091037ae Mon Sep 17 00:00:00 2001 From: thomascube Date: Mon, 16 Jan 2012 15:14:41 +0000 Subject: Merged devel-framework branch (r5746:5779) back into trunk --- program/steps/settings/folders.inc | 51 ++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'program/steps/settings/folders.inc') diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 7364c6eec..94f446265 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -23,20 +23,20 @@ // WARNING: folder names in UI are encoded with RCMAIL_CHARSET // init IMAP connection -$RCMAIL->imap_connect(); +$STORAGE = $RCMAIL->get_storage(); // subscribe mailbox if ($RCMAIL->action == 'subscribe') { $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP'); if (strlen($mbox)) { - $result = $RCMAIL->imap->subscribe(array($mbox)); + $result = $STORAGE->subscribe(array($mbox)); // Handle virtual (non-existing) folders - if (!$result && $RCMAIL->imap->get_error_code() == -1 && - $RCMAIL->imap->get_response_code() == rcube_imap::TRYCREATE + if (!$result && $STORAGE->get_error_code() == -1 && + $STORAGE->get_response_code() == rcube_storage::TRYCREATE ) { - $result = $RCMAIL->imap->create_mailbox($mbox, true); + $result = $STORAGE->create_folder($mbox, true); if ($result) { // @TODO: remove 'virtual' class of folder's row } @@ -45,7 +45,7 @@ if ($RCMAIL->action == 'subscribe') if ($result) { // Handle subscription of protected folder (#1487656) if ($CONFIG['protect_default_folders'] == true - && in_array($mbox, $CONFIG['default_imap_folders']) + && in_array($mbox, $CONFIG['default_folders']) ) { $OUTPUT->command('disable_subscription', $mbox); } @@ -62,7 +62,7 @@ else if ($RCMAIL->action == 'unsubscribe') { $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP'); if (strlen($mbox)) { - $result = $RCMAIL->imap->unsubscribe(array($mbox)); + $result = $STORAGE->unsubscribe(array($mbox)); if ($result) $OUTPUT->show_message('folderunsubscribed', 'confirmation'); else @@ -80,7 +80,7 @@ else if ($RCMAIL->action == 'delete-folder') $plugin = $RCMAIL->plugins->exec_hook('folder_delete', array('name' => $mbox)); if (!$plugin['abort']) { - $deleted = $RCMAIL->imap->delete_mailbox($plugin['name']); + $deleted = $STORAGE->delete_folder($plugin['name']); } else { $deleted = $plugin['result']; @@ -126,19 +126,19 @@ else if ($RCMAIL->action == 'purge') { $mbox_utf8 = get_input_value('_mbox', RCUBE_INPUT_POST, true); $mbox = rcube_charset_convert($mbox_utf8, RCMAIL_CHARSET, 'UTF7-IMAP'); - $delimiter = $RCMAIL->imap->get_hierarchy_delimiter(); + $delimiter = $STORAGE->get_hierarchy_delimiter(); $trash_regexp = '/^' . preg_quote($CONFIG['trash_mbox'] . $delimiter, '/') . '/'; // we should only be purging trash (or their subfolders) if (!strlen($CONFIG['trash_mbox']) || $mbox == $CONFIG['trash_mbox'] || preg_match($trash_regexp, $mbox) ) { - $success = $RCMAIL->imap->clear_mailbox($mbox); + $success = $STORAGE->delete_message('*', $mbox); $delete = true; } // copy to Trash else { - $success = $RCMAIL->imap->move_message('1:*', $CONFIG['trash_mbox'], $mbox); + $success = $STORAGE->move_message('1:*', $CONFIG['trash_mbox'], $mbox); $delete = false; } @@ -164,7 +164,7 @@ else if ($RCMAIL->action == 'folder-size') { $name = trim(get_input_value('_mbox', RCUBE_INPUT_POST, true)); - $size = $RCMAIL->imap->get_mailbox_size($name); + $size = $STORAGE->folder_size($name); // @TODO: check quota and show percentage usage of specified mailbox? @@ -199,13 +199,15 @@ function rcube_subscription_form($attrib) $table->add_header('subscribed', ''); } + $STORAGE = $RCMAIL->get_storage(); + // get folders from server - $RCMAIL->imap->clear_cache('mailboxes', true); + $STORAGE->clear_cache('mailboxes', true); - $a_unsubscribed = $RCMAIL->imap->list_unsubscribed(); - $a_subscribed = $RCMAIL->imap->list_mailboxes('', '*', null, null, true); // unsorted - $delimiter = $RCMAIL->imap->get_hierarchy_delimiter(); - $namespace = $RCMAIL->imap->get_namespace(); + $a_unsubscribed = $STORAGE->list_folders(); + $a_subscribed = $STORAGE->list_folders_subscribed('', '*', null, null, true); // unsorted + $delimiter = $STORAGE->get_hierarchy_delimiter(); + $namespace = $STORAGE->get_namespace(); $a_js_folders = array(); $seen = array(); $list_folders = array(); @@ -213,7 +215,7 @@ function rcube_subscription_form($attrib) // pre-process folders list foreach ($a_unsubscribed as $i => $folder) { $folder_id = $folder; - $folder = $RCMAIL->imap->mod_mailbox($folder); + $folder = $STORAGE->mod_folder($folder); $foldersplit = explode($delimiter, $folder); $name = rcube_charset_convert(array_pop($foldersplit), 'UTF7-IMAP'); $parent_folder = join($delimiter, $foldersplit); @@ -269,7 +271,7 @@ function rcube_subscription_form($attrib) $idx = $i + 1; $sub_key = array_search($folder['id'], $a_subscribed); $subscribed = $sub_key !== false; - $protected = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders'])); + $protected = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_folders'])); $noselect = false; $classes = array($i%2 ? 'even' : 'odd'); @@ -283,7 +285,7 @@ function rcube_subscription_form($attrib) } if (!$protected) { - $attrs = $RCMAIL->imap->mailbox_attributes($folder['id']); + $attrs = $STORAGE->folder_attributes($folder['id']); $noselect = in_array('\\Noselect', $attrs); } @@ -342,7 +344,7 @@ function rcube_subscription_form($attrib) $OUTPUT->add_gui_object('subscriptionlist', $attrib['id']); $OUTPUT->set_env('subscriptionrows', $a_js_folders); - $OUTPUT->set_env('defaultfolders', $CONFIG['default_imap_folders']); + $OUTPUT->set_env('defaultfolders', $CONFIG['default_folders']); $OUTPUT->set_env('delimiter', $delimiter); return $form_start . $table->show($attrib) . $form_end; @@ -367,13 +369,14 @@ function rcmail_rename_folder($oldname, $newname) { global $RCMAIL; - $delimiter = $RCMAIL->imap->get_hierarchy_delimiter(); + $storage = $RCMAIL->get_storage(); + $delimiter = $storage->get_hierarchy_delimiter(); $plugin = $RCMAIL->plugins->exec_hook('folder_rename', array( 'oldname' => $oldname, 'newname' => $newname)); if (!$plugin['abort']) { - $renamed = $RCMAIL->imap->rename_mailbox($oldname, $newname); + $renamed = $storage->rename_folder($oldname, $newname); } else { $renamed = $plugin['result']; @@ -405,7 +408,7 @@ function rcmail_rename_folder($oldname, $newname) $OUTPUT->set_pagetitle(rcube_label('folders')); $OUTPUT->include_script('list.js'); -$OUTPUT->set_env('quota', $RCMAIL->imap->get_capability('QUOTA')); +$OUTPUT->set_env('quota', $STORAGE->get_capability('QUOTA')); // add some labels to client $OUTPUT->add_label('deletefolderconfirm', 'purgefolderconfirm', 'folderdeleting', -- cgit v1.2.3