Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve performance by using Roundcube cache for Kolab_List object instead of session

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-07-25 15:37:30 +02:00
parent dc0f7261ad
commit 84730d0ea0
1 changed files with 54 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
plugins/kolab_core/rcube_kolab.php
View file

@ -29,6 +29,8 @@ class rcube_kolab
private static $horde_auth;
private static $config;
private static $ready = false;
private static $list;
private static $cache;
/**
@ -90,19 +92,57 @@ class rcube_kolab
);
Auth::setCredential('password', $pwd);
self::$ready = true;
// Register shutdown function for storing folders cache in session
// This is already required, because Roundcube session handler
// saves data into DB before Horde's shutdown function is called
if (!empty($conf['kolab']['imap']['cache_folders'])) {
$rcmail->add_shutdown_function(array('rcube_kolab', 'save_folders_cache'));
}
}
NLS::setCharset('UTF-8');
String::setDefaultCharset('UTF-8');
}
/**
* Get instance of Kolab_List object
*
* @return object Kolab_List Folders list object
*/
public static function get_folders_list()
{
self::setup();
if (self::$list)
return self::$list;
if (!self::$ready)
return null;
$rcmail = rcmail::get_instance();
$imap_cache = $rcmail->config->get('imap_cache');
if ($imap_cache) {
self::$cache = $rcmail->get_cache('IMAP', $imap_cache);
self::$list = self::$cache->get('mailboxes.kolab');
// Disable Horde folders caching, we're using our own cache
self::$config['kolab']['imap']['cache_folders'] = false;
// Register shutdown function for saving folders list cache
$rcmail->add_shutdown_function(array('rcube_kolab', 'save_folders_list'));
}
if (empty(self::$list)) {
self::$list = Kolab_List::singleton();
}
return self::$list;
}
/**
* Store Kolab_List instance in Roundcube cache
*/
public static function save_folders_list()
{
if (self::$cache && self::$list) {
self::$cache->set('mailboxes.kolab', self::$list);
}
}
/**
* Get instance of a Kolab (XML) format object
*
@ -125,8 +165,7 @@ class rcube_kolab
*/
public static function get_folders($type)
{
self::setup();
$kolab = Kolab_List::singleton();
$kolab = self::get_folders_list();
return self::$ready ? $kolab->getByType($type) : array();
}
@ -138,9 +177,8 @@ class rcube_kolab
*/
public static function get_folder($folder)
{
self::setup();
$kolab = Kolab_List::singleton();
return self::$ready ? $kolab->getFolder($folder) : null;
$kolab = self::get_folders_list();
return self::$ready ? $kolab->getFolder($folder) : null;
}
/**
@ -153,8 +191,7 @@ class rcube_kolab
*/
public static function get_storage($folder, $data_type = null)
{
self::setup();
$kolab = Kolab_List::singleton();
$kolab = self::get_folders_list();
return self::$ready ? $kolab->getFolder($folder)->getData($data_type) : null;
}
@ -177,18 +214,6 @@ class rcube_kolab
unset($_SESSION['__auth']);
}
/**
* Save Horde's folders cache in session (workaround shoutdown function issue)
*/
public static function save_folders_cache()
{
require_once 'Horde/SessionObjects.php';
$kolab = Kolab_List::singleton();
$session = Horde_SessionObjects::singleton();
$session->overwrite('kolab_folderlist', $kolab, false);
}
/**
* Creates folder ID from folder name
*
@ -210,8 +235,7 @@ class rcube_kolab
*/
public static function folder_delete($name)
{
self::setup();
$kolab = Kolab_List::singleton();
$kolab = self::get_folders_list();
$folder = $kolab->getFolder($name);
$result = $folder->delete();
@ -234,8 +258,7 @@ class rcube_kolab
*/
public static function folder_create($name, $type=null, $default=false)
{
self::setup();
$kolab = Kolab_List::singleton();
$kolab = self::get_folders_list();
$folder = new Kolab_Folder();
$folder->setList($kolab);
@ -263,8 +286,7 @@ class rcube_kolab
*/
public static function folder_rename($oldname, $newname)
{
self::setup();
$kolab = Kolab_List::singleton();
$kolab = self::get_folders_list();
$folder = $kolab->getFolder($oldname);
$folder->setFolder($newname);