Changeset 4247 in subversion

Timestamp:

Nov 22, 2010 5:18:46 AM (3 years ago)

Author:

thomasb

Message:

Move core Kolab functions to a separate plugin to be used by others too

Location:

trunk/plugins

Files:

• kolab_addressbook/config.inc.php.dist (deleted)
• kolab_addressbook/kolab_addressbook.php (modified) (2 diffs)
• kolab_core (added)
• kolab_core/config.inc.php.dist (added)
• kolab_core/kolab_core.php (added)
• kolab_core/rcube_kolab.php (copied) (copied from trunk/plugins/kolab_addressbook/lib/rcube_kolab.php)

trunk/plugins/kolab_addressbook/kolab_addressbook.php

@@ -7 +7 @@
  * 
  * Sample plugin to add a new address book source with data from Kolab storage
- *
  * This is work-in-progress for the Roundcube+Kolab integration.
- * The library part is to be moved into a separate PEAR package or plugin
- * that this and other Kolab-related plugins will depend on.
  *
  * @author Thomas Bruederli <roundcube@gmail.com>
@@ -25 +22 @@
     public function init()
     {
-        // load local config
-        $this->load_config();
+        // load required plugin
+        $this->require_plugin('kolab_core');
         
+        // register hooks
         $this->add_hook('addressbooks_list', array($this, 'address_sources'));
         $this->add_hook('addressbook_get', array($this, 'get_address_book'));
         $this->add_hook('contact_form', array($this, 'contact_form'));
-
-        // extend include path to load bundled Horde classes
-        $include_path = $this->home . '/lib' . PATH_SEPARATOR . ini_get('include_path');
-        set_include_path($include_path);
-
+        
         // extend list of address sources to be used for autocompletion
         $rcmail = rcmail::get_instance();