diff options
| author | thomascube <thomas@roundcube.net> | 2010-02-21 16:44:39 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2010-02-21 16:44:39 +0000 |
| commit | 47d8d39cf49310b688967f7571b0d66b5971b39c (patch) | |
| tree | cad6a377f8e37bddaf8c87c4fd8b713d54d32043 /program/include | |
| parent | cd8e5636d201e22139dcfa090fa949f577129ec8 (diff) | |
Use rcmail::imap_connect() to establish IMAP connections; always initialize rcube_imap object in mail steps
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 5d20989b2..b0d130e75 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -5,7 +5,7 @@ | program/include/rcmail.php | | | | This file is part of the RoundCube Webmail client | - | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland | + | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -374,6 +374,10 @@ class rcmail */ public function imap_init($connect = false) { + // already initialized + if (is_object($this->imap)) + return; + $this->imap = new rcube_imap($this->db); $this->imap->debug_level = $this->config->get('debug_level'); $this->imap->skip_deleted = $this->config->get('skip_deleted'); @@ -404,9 +408,13 @@ class rcmail $hook = $this->plugins->exec_hook('imap_init', array('fetch_headers' => $this->imap->fetch_add_headers)); if ($hook['fetch_headers']) $this->imap->fetch_add_headers = $hook['fetch_headers']; - - if ($connect) + + // support this parameter for backward compatibility but log warning + if ($connect) { $this->imap_connect(); + raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__, + 'message' => "rcube::imap_init(true) is deprecated, use rcube::imap_connect() instead"), true, false); + } } @@ -841,7 +849,7 @@ class rcmail if (!$this->authenticate_session()) return; - $this->imap_init(true); + $this->imap_connect(); } if ($config['logout_purge'] && !empty($config['trash_mbox'])) { |