Changeset 5763 in subversion

Timestamp:

Jan 13, 2012 3:17:23 AM (17 months ago)

Author:

alec

Message:

• Rename imap_init hook to storage_init hook (with additional 'driver' argument)

Location:

branches/devel-framework/roundcubemail/program/include

Files:

• main.inc (modified) (1 diff)
• rcmail.php (modified) (2 diffs)

branches/devel-framework/roundcubemail/program/include/main.inc

@@ -1246 +1246 @@
   $p += array('maxlength' => 100, 'realnames' => false);
   $a_mailboxes = array();
-
-  if (empty($p['folder_name']))
+  $storage = $RCMAIL->get_storage();
+
+  if (empty($p['folder_name'])) {
     $p['folder_name'] = '*';
+  }
 
   if ($p['unsubscribed'])
-    $list = $RCMAIL->storage->list_folders('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
+    $list = $storage->list_folders('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
   else
-    $list = $RCMAIL->storage->list_folders_subscribed('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
-
-  $delimiter = $RCMAIL->storage->get_hierarchy_delimiter();
+    $list = $storage->list_folders_subscribed('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
+
+  $delimiter = $storage->get_hierarchy_delimiter();
 
   foreach ($list as $folder) {

branches/devel-framework/roundcubemail/program/include/rcmail.php

@@ -648 +648 @@
       'timeout'     => (int) $this->config->get("{$driver}_timeout"),
       'skip_deleted' => (bool) $this->config->get('skip_deleted'),
+      'driver'      => $driver,
     );
 
@@ -658 +659 @@
     }
 
-    $hook = $this->plugins->exec_hook("{$driver}_init", $options);
+    $hook = $this->plugins->exec_hook("storage_init", $options);
 
     $this->storage->set_options($options);