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

Use rcube instead of rcmail, so the classes can be used out of Roundcube

Browse source
This commit is contained in:
Aleksander Machniak 2012-04-25 13:27:13 +02:00
parent 1a60eea869
commit 2a472e41b5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/libkolab/lib/kolab_storage.php
View file

@ -44,10 +44,10 @@ class kolab_storage
if (self::$ready) if (self::$ready)
return true; return true;
$rcmail = rcmail::get_instance(); $rcmail = rcube::get_instance();
self::$config = $rcmail->config; self::$config = $rcmail->config;
self::$imap = $rcmail->get_storage(); self::$imap = $rcmail->get_storage();
self::$ready = class_exists('kolabformat') && $rcmail->storage_connect() && self::$ready = class_exists('kolabformat') &&
(self::$imap->get_capability('METADATA') || self::$imap->get_capability('ANNOTATEMORE') || self::$imap->get_capability('ANNOTATEMORE2')); (self::$imap->get_capability('METADATA') || self::$imap->get_capability('ANNOTATEMORE') || self::$imap->get_capability('ANNOTATEMORE2'));
if (self::$ready) { if (self::$ready) {

8
plugins/libkolab/lib/kolab_storage_folder.php
View file

@ -53,7 +53,7 @@ class kolab_storage_folder
*/ */
function __construct($name, $imap = null) function __construct($name, $imap = null)
{ {
$this->imap = is_object($imap) ? $imap : rcmail::get_instance()->get_storage(); $this->imap = is_object($imap) ? $imap : rcube::get_instance()->get_storage();
$this->imap->set_options(array('skip_deleted' => false)); $this->imap->set_options(array('skip_deleted' => false));
$this->set_folder($name); $this->set_folder($name);
} }
@ -124,7 +124,7 @@ class kolab_storage_folder
return $this->owner; return $this->owner;
$info = $this->get_folder_info(); $info = $this->get_folder_info();
$rcmail = rcmail::get_instance(); $rcmail = rcube::get_instance();
switch ($info['namespace']) { switch ($info['namespace']) {
case 'personal': case 'personal':
@ -571,7 +571,7 @@ class kolab_storage_folder
} }
$mime = new Mail_mime("\r\n"); $mime = new Mail_mime("\r\n");
$rcmail = rcmail::get_instance(); $rcmail = rcube::get_instance();
$headers = array(); $headers = array();
if ($ident = $rcmail->user->get_identity()) { if ($ident = $rcmail->user->get_identity()) {
@ -581,7 +581,7 @@ class kolab_storage_folder
$headers['Date'] = date('r'); $headers['Date'] = date('r');
$headers['X-Kolab-Type'] = self::KTYPE_PREFIX . $type; $headers['X-Kolab-Type'] = self::KTYPE_PREFIX . $type;
$headers['Subject'] = $object['uid']; $headers['Subject'] = $object['uid'];
// $headers['Message-ID'] = rcmail_gen_message_id(); // $headers['Message-ID'] = $rcmail->gen_message_id();
$headers['User-Agent'] = $rcmail->config->get('useragent'); $headers['User-Agent'] = $rcmail->config->get('useragent');
$mime->headers($headers); $mime->headers($headers);