summaryrefslogtreecommitdiff
path: root/plugins/kolab_zpush
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2012-10-17 09:54:25 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2012-10-17 09:54:25 (GMT)
commit2d08c58e56ebe9c0dd8c55679c887714178ed994 (patch)
tree7a4c5210fbfa9cdf5638181539c0b13d1a2a8bed /plugins/kolab_zpush
parent5be0b06fcbf61dacd493467b57041f808b04f1c7 (diff)
downloadroundcubemail-plugins-kolab-2d08c58e56ebe9c0dd8c55679c887714178ed994.tar.gz
Fix/prepare plugins to use out of Roundcube (where rcmail object doesn't exist)
Diffstat (limited to 'plugins/kolab_zpush')
-rw-r--r--plugins/kolab_zpush/kolab_zpush.php2
-rw-r--r--plugins/kolab_zpush/kolab_zpush_ui.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/kolab_zpush/kolab_zpush.php b/plugins/kolab_zpush/kolab_zpush.php
index b65f39c..6f38182 100644
--- a/plugins/kolab_zpush/kolab_zpush.php
+++ b/plugins/kolab_zpush/kolab_zpush.php
@@ -44,7 +44,7 @@ class kolab_zpush extends rcube_plugin
*/
public function init()
{
- $this->rc = rcmail::get_instance();
+ $this->rc = rcube::get_instance();
$this->require_plugin('jqueryui');
$this->add_texts('localization/', true);
diff --git a/plugins/kolab_zpush/kolab_zpush_ui.php b/plugins/kolab_zpush/kolab_zpush_ui.php
index 4c99cf7..3d2fbcc 100644
--- a/plugins/kolab_zpush/kolab_zpush_ui.php
+++ b/plugins/kolab_zpush/kolab_zpush_ui.php
@@ -30,7 +30,7 @@ class kolab_zpush_ui
public function __construct($config)
{
$this->config = $config;
- $this->rc = rcmail::get_instance();
+ $this->rc = rcube::get_instance();
$skin = $this->rc->config->get('skin');
$this->config->include_stylesheet('skins/' . $skin . '/config.css');
@@ -146,8 +146,8 @@ class kolab_zpush_ui
$classes = array('mailbox');
- if ($folder_class = rcmail_folder_classname($folder)) {
- $foldername = rcube_label($folder_class);
+ if ($folder_class = $this->rc->folder_classname($folder)) {
+ $foldername = $this->rc->gettext($folder_class);
$classes[] = $folder_class;
}