[Svn] r5782 - trunk/roundcubemail/program/include

[trac at roundcube.net]

Author: thomasb
Date: 2012-01-16 09:23:40 -0600 (Mon, 16 Jan 2012)
New Revision: 5782

Modified:
   trunk/roundcubemail/program/include/rcmail.php
   trunk/roundcubemail/program/include/rcube_plugin_api.php
Log:
Run imap_init plugin hook as deprecated hook; set $_SESSION['imap_host'] for backwards compat.

Modified: trunk/roundcubemail/program/include/rcmail.php
===================================================================
--- trunk/roundcubemail/program/include/rcmail.php	2012-01-16 15:14:41 UTC (rev 5781)
+++ trunk/roundcubemail/program/include/rcmail.php	2012-01-16 15:23:40 UTC (rev 5782)
@@ -682,13 +682,12 @@
       $options['port']     = $_SESSION['storage_port'];
       $options['ssl']      = $_SESSION['storage_ssl'];
       $options['password'] = $this->decrypt($_SESSION['password']);
+      // set 'imap_host' for backwards compatibility
+      $_SESSION[$driver.'_host'] = &$_SESSION['storage_host'];
     }
 
     $options = $this->plugins->exec_hook("storage_init", $options);
 
-    // for backward compat. (deprecated, to be removed)
-    $options = $this->plugins->exec_hook("imap_init", $options);
-
     $this->storage->set_options($options);
     $this->set_storage_prop();
   }

Modified: trunk/roundcubemail/program/include/rcube_plugin_api.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_plugin_api.php	2012-01-16 15:14:41 UTC (rev 5781)
+++ trunk/roundcubemail/program/include/rcube_plugin_api.php	2012-01-16 15:23:40 UTC (rev 5782)
@@ -71,6 +71,7 @@
     'delete_identity'   => 'identity_delete',
     'save_identity'     => 'identity_update',
     'identity_save'     => 'identity_update',
+    'imap_init'         => 'storage_init',
   );
 
   /**

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn