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

Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

Browse source
This commit is contained in:
Thomas Bruederli 2012-08-03 15:29:52 +02:00
commit 60dbc1f5c9
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -278,11 +278,11 @@ class kolab_calendar
$object = $this->_from_rcube_event($event); $object = $this->_from_rcube_event($event);
$saved = $this->storage->save($object, 'event'); $saved = $this->storage->save($object, 'event');
if (!$saved || PEAR::isError($saved)) { if (!$saved) {
raise_error(array( raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving event object to Kolab server:" . $saved->getMessage()), 'message' => "Error saving event object to Kolab server"),
true, false); true, false);
$saved = false; $saved = false;
} }
@ -312,11 +312,11 @@ class kolab_calendar
$object = $this->_from_rcube_event($event, $old); $object = $this->_from_rcube_event($event, $old);
$saved = $this->storage->save($object, 'event', $event['id']); $saved = $this->storage->save($object, 'event', $event['id']);
if (!$saved || PEAR::isError($saved)) { if (!$saved) {
raise_error(array( raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving event object to Kolab server:" . $saved->getMessage()), 'message' => "Error saving event object to Kolab server"),
true, false); true, false);
} }
else { else {
@ -337,7 +337,7 @@ class kolab_calendar
{ {
$deleted = $this->storage->delete($event['id'], $force); $deleted = $this->storage->delete($event['id'], $force);
if (!$deleted || PEAR::isError($deleted)) { if (!$deleted) {
raise_error(array( raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,

38
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -68,27 +68,18 @@ class kolab_driver extends calendar_driver
$folders = kolab_storage::get_folders('event'); $folders = kolab_storage::get_folders('event');
$this->calendars = array(); $this->calendars = array();
if (PEAR::isError($folders)) { // convert to UTF8 and sort
raise_error(array( $names = array();
'code' => 600, 'type' => 'php', foreach ($folders as $folder)
'file' => __FILE__, 'line' => __LINE__, $names[$folder->name] = rcube_charset::convert($folder->name, 'UTF7-IMAP');
'message' => "Failed to list calendar folders from Kolab server:" . $folders->getMessage()),
true, false);
}
else {
// convert to UTF8 and sort
$names = array();
foreach ($folders as $folder)
$names[$folder->name] = rcube_charset::convert($folder->name, 'UTF7-IMAP');
asort($names, SORT_LOCALE_STRING); asort($names, SORT_LOCALE_STRING);
foreach ($names as $utf7name => $name) { foreach ($names as $utf7name => $name) {
$calendar = new kolab_calendar($utf7name, $this->cal); $calendar = new kolab_calendar($utf7name, $this->cal);
$this->calendars[$calendar->id] = $calendar; $this->calendars[$calendar->id] = $calendar;
if (!$calendar->readonly) if (!$calendar->readonly)
$this->has_writeable = true; $this->has_writeable = true;
}
} }
return $this->calendars; return $this->calendars;
@ -470,6 +461,15 @@ class kolab_driver extends calendar_driver
$attachments = array(); $attachments = array();
$old = $master = $fromcalendar->get_event($event['id']); $old = $master = $fromcalendar->get_event($event['id']);
if (!$old || !$old['start']) {
raise_error(array(
'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load event object to update: id=" . $event['id']),
true, false);
return false;
}
// delete existing attachment(s) // delete existing attachment(s)
if (!empty($event['deleted_attachments'])) { if (!empty($event['deleted_attachments'])) {
foreach ($event['deleted_attachments'] as $attachment) { foreach ($event['deleted_attachments'] as $attachment) {