summaryrefslogtreecommitdiff
path: root/plugins/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/calendar')
-rw-r--r--plugins/calendar/calendar.php8
-rw-r--r--plugins/calendar/drivers/calendar_driver.php2
-rw-r--r--plugins/calendar/lib/calendar_itip.php6
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index f51af3c..a526570 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -75,7 +75,7 @@ class calendar 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('calendar', 'calendar');
@@ -1094,7 +1094,7 @@ class calendar extends rcube_plugin
}
foreach ((array)$event['attachments'] as $k => $attachment) {
- $event['attachments'][$k]['classname'] = rcmail_filetype2classname($attachment['mimetype'], $attachment['name']);
+ $event['attachments'][$k]['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
}
return array(
@@ -1936,13 +1936,13 @@ class calendar 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'
$event['attachments'][] = $attachment;
}
}
diff --git a/plugins/calendar/drivers/calendar_driver.php b/plugins/calendar/drivers/calendar_driver.php
index 7feca60..88c7f45 100644
--- a/plugins/calendar/drivers/calendar_driver.php
+++ b/plugins/calendar/drivers/calendar_driver.php
@@ -298,7 +298,7 @@ abstract class calendar_driver
*/
public function list_categories()
{
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
return $rcmail->config->get('calendar_categories', array());
}
diff --git a/plugins/calendar/lib/calendar_itip.php b/plugins/calendar/lib/calendar_itip.php
index 50f012f..dc4cfa0 100644
--- a/plugins/calendar/lib/calendar_itip.php
+++ b/plugins/calendar/lib/calendar_itip.php
@@ -103,7 +103,7 @@ class calendar_itip
// finally send the message
$this->itip_send = true;
- $sent = rcmail_deliver_message($message, $headers['X-Sender'], $mailto, $smtp_error);
+ $sent = $this->rc->deliver_message($message, $headers['X-Sender'], $mailto, $smtp_error);
$this->itip_send = false;
return $sent;
@@ -147,8 +147,8 @@ class calendar_itip
// compose common headers array
$headers = array(
'From' => $sender,
- 'Date' => rcmail_user_date(),
- 'Message-ID' => rcmail_gen_message_id(),
+ 'Date' => $this->rc->user_date(),
+ 'Message-ID' => $this->rc->gen_message_id(),
'X-Sender' => $from,
);
if ($agent = $this->rc->config->get('useragent'))