summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/acl/acl.php17
-rw-r--r--plugins/archive/archive.php4
-rw-r--r--plugins/debug_logger/debug_logger.php5
-rw-r--r--plugins/enigma/lib/enigma_engine.php6
-rw-r--r--plugins/managesieve/managesieve.php1
-rw-r--r--plugins/markasjunk/markasjunk.php4
-rw-r--r--plugins/show_additional_headers/show_additional_headers.php10
-rw-r--r--plugins/subscriptions_option/subscriptions_option.php6
-rw-r--r--plugins/vcard_attachments/vcard_attachments.php2
9 files changed, 28 insertions, 27 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index b2e5b8d47..dcc249421 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -58,8 +58,7 @@ class acl extends rcube_plugin
$action = trim(get_input_value('_act', RCUBE_INPUT_GPC));
// Connect to IMAP
- $this->rc->imap_init();
- $this->rc->imap_connect();
+ $this->rc->storage_init();
// Load localization and configuration
$this->add_texts('localization/');
@@ -151,7 +150,7 @@ class acl extends rcube_plugin
}
// Do nothing if no ACL support
- if (!$this->rc->imap->get_capability('ACL')) {
+ if (!$this->rc->storage->get_capability('ACL')) {
return $args;
}
@@ -335,7 +334,7 @@ class acl extends rcube_plugin
private function list_rights($attrib=array())
{
// Get ACL for the folder
- $acl = $this->rc->imap->get_acl($this->mbox);
+ $acl = $this->rc->storage->get_acl($this->mbox);
if (!is_array($acl)) {
$acl = array();
@@ -395,7 +394,7 @@ class acl extends rcube_plugin
$i = 1;
$js_table = array();
foreach ($acl as $user => $rights) {
- if ($this->rc->imap->conn->user == $user) {
+ if ($this->rc->storage->conn->user == $user) {
continue;
}
@@ -462,7 +461,7 @@ class acl extends rcube_plugin
}
if ($user != $_SESSION['username'] && $username != $_SESSION['username']) {
- if ($this->rc->imap->set_acl($mbox, $user, $acl)) {
+ if ($this->rc->storage->set_acl($mbox, $user, $acl)) {
$ret = array('id' => html_identifier($user),
'username' => $username, 'acl' => implode($acl), 'old' => $oldid);
$this->rc->output->command('acl_update', $ret);
@@ -491,7 +490,7 @@ class acl extends rcube_plugin
foreach ($user as $u) {
$u = trim($u);
- if ($this->rc->imap->delete_acl($mbox, $u)) {
+ if ($this->rc->storage->delete_acl($mbox, $u)) {
$this->rc->output->command('acl_remove_row', html_identifier($u));
}
else {
@@ -603,7 +602,7 @@ class acl extends rcube_plugin
return $this->supported;
}
- $capa = $this->rc->imap->get_capability('RIGHTS');
+ $capa = $this->rc->storage->get_capability('RIGHTS');
if (is_array($capa)) {
$rights = strtolower($capa[0]);
@@ -636,7 +635,7 @@ class acl extends rcube_plugin
// whether or not the user ID in ACL entries need to be qualified and how
// they would need to be qualified.
if (empty($domain)) {
- $acl = $this->rc->imap->get_acl('INBOX');
+ $acl = $this->rc->storage->get_acl('INBOX');
if (is_array($acl)) {
$regexp = '/^' . preg_quote($_SESSION['username'], '/') . '@(.*)$/';
foreach (array_keys($acl) as $name) {
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index ffac38a9e..f540b0376 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -48,9 +48,9 @@ class archive extends rcube_plugin
$rcmail->output->set_env('archive_folder', $archive_folder);
// add archive folder to the list of default mailboxes
- if (($default_folders = $rcmail->config->get('default_imap_folders')) && !in_array($archive_folder, $default_folders)) {
+ if (($default_folders = $rcmail->config->get('default_folders')) && !in_array($archive_folder, $default_folders)) {
$default_folders[] = $archive_folder;
- $rcmail->config->set('default_imap_folders', $default_folders);
+ $rcmail->config->set('default_folders', $default_folders);
}
}
else if ($rcmail->task == 'settings') {
diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
index 45c395377..1e015c201 100644
--- a/plugins/debug_logger/debug_logger.php
+++ b/plugins/debug_logger/debug_logger.php
@@ -106,13 +106,16 @@ class debug_logger extends rcube_plugin
if(!isset($args[1])){
// This could be extended to detect types based on the
- // file which called console. For now only rcube_imap.inc is supported
+ // file which called console. For now only rcube_imap/rcube_storage is supported
$bt = debug_backtrace();
$file = $bt[3]['file'];
switch(basename($file)){
case 'rcube_imap.php':
$type = 'imap';
break;
+ case 'rcube_storage.php':
+ $type = 'storage';
+ break;
default:
$type = FALSE;
break;
diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php
index 59ae1202c..89cb4b796 100644
--- a/plugins/enigma/lib/enigma_engine.php
+++ b/plugins/enigma/lib/enigma_engine.php
@@ -503,7 +503,7 @@ class enigma_engine
$mime_id = get_input_value('_part', RCUBE_INPUT_POST);
if ($uid && $mime_id) {
- $part = $this->rc->imap->get_message_part($uid, $mime_id);
+ $part = $this->rc->storage->get_message_part($uid, $mime_id);
}
if ($part && is_array($result = $this->import_key($part))) {
@@ -512,7 +512,7 @@ class enigma_engine
}
else
$this->rc->output->show_message('enigma.keysimportfailed', 'error');
-
+
$this->rc->output->send();
}
@@ -528,7 +528,7 @@ class enigma_engine
// @TODO: Create such function in core
// @TODO: Handle big bodies using file handles
if (!isset($part->body)) {
- $part->body = $this->rc->imap->get_message_part(
+ $part->body = $this->rc->storage->get_message_part(
$uid, $part->mime_id, $part);
}
}
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 2902a5ccb..2ef57123a 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -1514,7 +1514,6 @@ class managesieve extends rcube_plugin
else
$mailbox = '';
- $this->rc->imap_connect();
$select = rcmail_mailbox_select(array(
'realnames' => false,
'maxlength' => 100,
diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
index 7f87f5baa..41a95acdc 100644
--- a/plugins/markasjunk/markasjunk.php
+++ b/plugins/markasjunk/markasjunk.php
@@ -48,8 +48,8 @@ class markasjunk extends rcube_plugin
$mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
$rcmail = rcmail::get_instance();
- $rcmail->imap->unset_flag($uids, 'NONJUNK');
- $rcmail->imap->set_flag($uids, 'JUNK');
+ $rcmail->storage->unset_flag($uids, 'NONJUNK');
+ $rcmail->storage->set_flag($uids, 'JUNK');
if (($junk_mbox = $rcmail->config->get('junk_mbox')) && $mbox != $junk_mbox) {
$rcmail->output->command('move_messages', $junk_mbox);
diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php
index 78fd6be5a..cc71421ee 100644
--- a/plugins/show_additional_headers/show_additional_headers.php
+++ b/plugins/show_additional_headers/show_additional_headers.php
@@ -16,20 +16,20 @@
class show_additional_headers extends rcube_plugin
{
public $task = 'mail';
-
+
function init()
{
$rcmail = rcmail::get_instance();
if ($rcmail->action == 'show' || $rcmail->action == 'preview') {
- $this->add_hook('imap_init', array($this, 'imap_init'));
+ $this->add_hook('storage_init', array($this, 'storage_init'));
$this->add_hook('message_headers_output', array($this, 'message_headers'));
} else if ($rcmail->action == '') {
// with enabled_caching we're fetching additional headers before show/preview
- $this->add_hook('imap_init', array($this, 'imap_init'));
+ $this->add_hook('storage_init', array($this, 'storage_init'));
}
}
-
- function imap_init($p)
+
+ function storage_init($p)
{
$rcmail = rcmail::get_instance();
if ($add_headers = (array)$rcmail->config->get('show_additional_headers', array()))
diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
index 4db9b8102..ab16994a7 100644
--- a/plugins/subscriptions_option/subscriptions_option.php
+++ b/plugins/subscriptions_option/subscriptions_option.php
@@ -65,8 +65,8 @@ class subscriptions_option extends rcube_plugin
// if the use_subscriptions preference changes, flush the folder cache
if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
(!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
- $rcmail->imap_connect();
- $rcmail->imap->clear_cache('mailboxes');
+ $storage = $rcmail->get_storage();
+ $storage->clear_cache('mailboxes');
}
}
return $args;
@@ -76,7 +76,7 @@ class subscriptions_option extends rcube_plugin
{
$rcmail = rcmail::get_instance();
if (!$rcmail->config->get('use_subscriptions', true)) {
- $args['folders'] = $rcmail->imap->conn->listMailboxes($args['root'], $args['name']);
+ $args['folders'] = $rcmail->storage->conn->listMailboxes($args['root'], $args['name']);
}
return $args;
}
diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index 3fb3bf9ad..2e79053cb 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -117,7 +117,7 @@ class vcard_attachments extends rcube_plugin
if ($uid && $mime_id) {
list($mime_id, $index) = explode(':', $mime_id);
- $part = $rcmail->imap->get_message_part($uid, $mime_id);
+ $part = $rcmail->storage->get_message_part($uid, $mime_id);
}
$error_msg = $this->gettext('vcardsavefailed');
generated by cgit v1.2.3 (git 2.51.0) at 2026-05-16 02:38:33 +0000