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

raise_error() -> rcube::raise_error()

Browse source
This commit is contained in:
Aleksander Machniak 2012-11-06 11:46:15 +01:00
parent 075748b076
commit bef8355aff
5 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -279,7 +279,7 @@ class kolab_calendar
$saved = $this->storage->save($object, 'event'); $saved = $this->storage->save($object, 'event');
if (!$saved) { if (!$saved) {
raise_error(array( rcube::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"), 'message' => "Error saving event object to Kolab server"),
@ -313,7 +313,7 @@ class kolab_calendar
$saved = $this->storage->save($object, 'event', $event['id']); $saved = $this->storage->save($object, 'event', $event['id']);
if (!$saved) { if (!$saved) {
raise_error(array( rcube::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"), 'message' => "Error saving event object to Kolab server"),
@ -338,7 +338,7 @@ class kolab_calendar
$deleted = $this->storage->delete($event['id'], $force); $deleted = $this->storage->delete($event['id'], $force);
if (!$deleted) { if (!$deleted) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error deleting event object from Kolab server"), 'message' => "Error deleting event object from Kolab server"),
@ -360,7 +360,7 @@ class kolab_calendar
return true; return true;
} }
else { else {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error undeleting the event object $uid from the Kolab server"), 'message' => "Error undeleting the event object $uid from the Kolab server"),

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

@ -466,7 +466,7 @@ class kolab_driver extends calendar_driver
$old = $master = $fromcalendar->get_event($event['id']); $old = $master = $fromcalendar->get_event($event['id']);
if (!$old || !$old['start']) { if (!$old || !$old['start']) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load event object to update: id=" . $event['id']), 'message' => "Failed to load event object to update: id=" . $event['id']),
@ -927,7 +927,7 @@ class kolab_driver extends calendar_driver
// trigger updates on folder // trigger updates on folder
$trigger = $cal->storage->trigger(); $trigger = $cal->storage->trigger();
if (is_object($trigger) && is_a($trigger, 'PEAR_Error')) { if (is_object($trigger) && is_a($trigger, 'PEAR_Error')) {
raise_error(array( rcube::raise_error(array(
'code' => 900, 'type' => 'php', 'code' => 900, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed triggering folder. Error was " . $trigger->getMessage()), 'message' => "Failed triggering folder. Error was " . $trigger->getMessage()),

2
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -236,7 +236,7 @@ class kolab_addressbook extends rcube_plugin
$this->folders = kolab_storage::get_folders('contact'); $this->folders = kolab_storage::get_folders('contact');
if (PEAR::isError($this->folders)) { if (PEAR::isError($this->folders)) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to list contact folders from Kolab server:" . $this->folders->getMessage()), 'message' => "Failed to list contact folders from Kolab server:" . $this->folders->getMessage()),

24
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -562,7 +562,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$saved = $this->storagefolder->save($object, 'contact'); $saved = $this->storagefolder->save($object, 'contact');
if (!$saved) { if (!$saved) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving contact object to Kolab server"), 'message' => "Error saving contact object to Kolab server"),
@ -596,7 +596,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$object = $this->_from_rcube_contact($save_data, $old); $object = $this->_from_rcube_contact($save_data, $old);
if (!$this->storagefolder->save($object, 'contact', $old['uid'])) { if (!$this->storagefolder->save($object, 'contact', $old['uid'])) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving contact object to Kolab server"), 'message' => "Error saving contact object to Kolab server"),
@ -636,7 +636,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$deleted = $is_mailto || $this->storagefolder->delete($uid, $force); $deleted = $is_mailto || $this->storagefolder->delete($uid, $force);
if (!$deleted) { if (!$deleted) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error deleting a contact object $uid from the Kolab server"), 'message' => "Error deleting a contact object $uid from the Kolab server"),
@ -680,7 +680,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$count++; $count++;
} }
else { else {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error undeleting a contact object $uid from the Kolab server"), 'message' => "Error undeleting a contact object $uid from the Kolab server"),
@ -731,7 +731,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$saved = $this->storagefolder->save($list, 'distribution-list'); $saved = $this->storagefolder->save($list, 'distribution-list');
if (!$saved) { if (!$saved) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving distribution-list object to Kolab server"), 'message' => "Error saving distribution-list object to Kolab server"),
@ -758,18 +758,20 @@ class rcube_kolab_contacts extends rcube_addressbook
$this->_fetch_groups(); $this->_fetch_groups();
$result = false; $result = false;
if ($list = $this->distlists[$gid]) if ($list = $this->distlists[$gid]) {
$deleted = $this->storagefolder->delete($list['uid']); $deleted = $this->storagefolder->delete($list['uid']);
}
if (!$deleted) { if (!$deleted) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error deleting distribution-list object from the Kolab server"), 'message' => "Error deleting distribution-list object from the Kolab server"),
true, false); true, false);
} }
else else {
$result = true; $result = true;
}
return $result; return $result;
} }
@ -792,7 +794,7 @@ class rcube_kolab_contacts extends rcube_addressbook
} }
if (!$saved) { if (!$saved) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving distribution-list object to Kolab server"), 'message' => "Error saving distribution-list object to Kolab server"),
@ -857,7 +859,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$saved = true; $saved = true;
if (!$saved) { if (!$saved) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving distribution-list to Kolab server"), 'message' => "Error saving distribution-list to Kolab server"),
@ -899,7 +901,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$saved = $this->storagefolder->save($list, 'distribution-list', $list['uid']); $saved = $this->storagefolder->save($list, 'distribution-list', $list['uid']);
if (!$saved) { if (!$saved) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'type' => 'php', 'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Error saving distribution-list object to Kolab server"), 'message' => "Error saving distribution-list object to Kolab server"),

2
plugins/libkolab/libkolab.php
View file

@ -46,7 +46,7 @@ class libkolab extends rcube_plugin
kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT')); kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
} }
catch (Exception $e) { catch (Exception $e) {
raise_error($e, true); rcube::raise_error($e, true);
kolab_format::$timezone = new DateTimeZone('GMT'); kolab_format::$timezone = new DateTimeZone('GMT');
} }