summaryrefslogtreecommitdiff
path: root/plugins/tasklist
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/tasklist
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/tasklist')
-rw-r--r--plugins/tasklist/drivers/tasklist_driver.php2
-rw-r--r--plugins/tasklist/tasklist.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/tasklist/drivers/tasklist_driver.php b/plugins/tasklist/drivers/tasklist_driver.php
index f810799..99e5453 100644
--- a/plugins/tasklist/drivers/tasklist_driver.php
+++ b/plugins/tasklist/drivers/tasklist_driver.php
@@ -251,7 +251,7 @@ abstract class tasklist_driver
*/
public function list_categories()
{
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
return $rcmail->config->get('tasklist_categories', array());
}
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index f9ae1c0..0807946 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -63,7 +63,7 @@ class tasklist extends rcube_plugin
{
$this->require_plugin('libcalendaring');
- $this->rc = rcmail::get_instance();
+ $this->rc = rcube::get_instance();
$this->lib = libcalendaring::get_instance();
$this->register_task('tasks', 'tasklist');
@@ -601,7 +601,7 @@ class tasklist extends rcube_plugin
$rec['alarms_text'] = libcalendaring::alarms_text($rec['alarms']);
foreach ((array)$rec['attachments'] as $k => $attachment) {
- $rec['attachments'][$k]['classname'] = rcmail_filetype2classname($attachment['mimetype'], $attachment['name']);
+ $rec['attachments'][$k]['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
}
if (in_array($rec['id'], $this->collapsed_tasks))
@@ -844,13 +844,13 @@ class tasklist extends rcube_plugin
if ($attachment['status'] && !$attachment['abort']) {
$id = $attachment['id'];
- $attachment['classname'] = rcmail_filetype2classname($attachment['mimetype'], $attachment['name']);
+ $attachment['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
// store new attachment in session
unset($attachment['status'], $attachment['abort'], $attachment['data']);
$_SESSION[self::SESSION_KEY]['attachments'][$id] = $attachment;
- $attachment['id'] = 'rcmfile' . $attachment['id']; # add prefix to consider it 'new'
+ $attachment['id'] = 'rcmfile' . $attachment['id']; // add prefix to consider it 'new'
$task['attachments'][] = $attachment;
}
}