From 9989376b95d55ed752b2e3f6e8dbf42257f5ce77 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sun, 21 Feb 2010 16:44:39 +0000
Subject: Use rcmail::imap_connect() to establish IMAP connections; always
 initialize rcube_imap object in mail steps

git-svn-id: https://svn.roundcube.net/trunk@3278 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/plugins/managesieve/managesieve.php        |  2 +-
 .../subscriptions_option/subscriptions_option.php        |  2 +-
 roundcubemail/program/include/rcmail.php                 | 16 ++++++++++++----
 roundcubemail/program/steps/mail/func.inc                |  5 ++++-
 roundcubemail/program/steps/settings/func.inc            |  2 +-
 roundcubemail/program/steps/settings/manage_folders.inc  |  2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/roundcubemail/plugins/managesieve/managesieve.php b/roundcubemail/plugins/managesieve/managesieve.php
index 07b39767d..219c33489 100644
--- a/roundcubemail/plugins/managesieve/managesieve.php
+++ b/roundcubemail/plugins/managesieve/managesieve.php
@@ -901,7 +901,7 @@ class managesieve extends rcube_plugin
     $out .= '<select id="action_mailbox' .$id. '" name="_action_mailbox[]" style="display:' 
 	.(!isset($action) || $action['type']=='fileinto' ? 'inline' : 'none'). '">';
 
-    $this->rc->imap_init(true);
+    $this->rc->imap_connect();
 
     $a_folders = $this->rc->imap->list_mailboxes();
     $delimiter = $this->rc->imap->get_hierarchy_delimiter();
diff --git a/roundcubemail/plugins/subscriptions_option/subscriptions_option.php b/roundcubemail/plugins/subscriptions_option/subscriptions_option.php
index ecbc4e238..4d471b8e6 100644
--- a/roundcubemail/plugins/subscriptions_option/subscriptions_option.php
+++ b/roundcubemail/plugins/subscriptions_option/subscriptions_option.php
@@ -65,7 +65,7 @@ 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_init(true);
+                    $rcmail->imap_connect();
                     $rcmail->imap->clear_cache('mailboxes');
             }
         }
diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 5d20989b2..b0d130e75 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/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'])) {
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index f522d0dc3..da21220ff 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/func.inc                                           |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -24,6 +24,9 @@ $EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9][a-z0-9\-\.]*\\.[a-
 // actions that do not require imap connection
 $NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment');
 
+// always instantiate imap object (but not yet connect to server)
+$RCMAIL->imap_init();
+
 // log in to imap server
 if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) {
   $RCMAIL->kill_session();
diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc
index a2175b0f0..094fa5995 100644
--- a/roundcubemail/program/steps/settings/func.inc
+++ b/roundcubemail/program/steps/settings/func.inc
@@ -509,7 +509,7 @@ function rcmail_user_prefs($current=null)
 
     // Configure special folders
     if (!isset($no_override['default_imap_folders'])) {
-      $RCMAIL->imap_init(true);
+      $RCMAIL->imap_connect();
       $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
         'maxlength' => 30, 'exceptions' => array('INBOX')));
 
diff --git a/roundcubemail/program/steps/settings/manage_folders.inc b/roundcubemail/program/steps/settings/manage_folders.inc
index 22bd158f5..06fee7a87 100644
--- a/roundcubemail/program/steps/settings/manage_folders.inc
+++ b/roundcubemail/program/steps/settings/manage_folders.inc
@@ -22,7 +22,7 @@
 // WARNING: folder names in UI are encoded with RCMAIL_CHARSET
 
 // init IMAP connection
-$RCMAIL->imap_init(true);
+$RCMAIL->imap_connect();
 
 // subscribe to one or more mailboxes
 if ($RCMAIL->action=='subscribe')
-- 
cgit v1.2.3