Micke/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-06-06 10:24:42 +02:00
commit 435b94f8f6
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/libkolab/lib/kolab_format.php
View file

@ -186,7 +186,7 @@ abstract class kolab_format
} }
if ($log) { if ($log) {
raise_error(array( rcube::raise_error(array(
'code' => 660, 'code' => 660,
'type' => 'php', 'type' => 'php',
'file' => __FILE__, 'file' => __FILE__,

4
plugins/libkolab/lib/kolab_format_xcal.php
View file

@ -249,7 +249,7 @@ abstract class kolab_format_xcal extends kolab_format
$attendees->push($att); $attendees->push($att);
} }
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' => "Invalid event attendee: " . json_encode($attendee), 'message' => "Invalid event attendee: " . json_encode($attendee),
@ -316,7 +316,7 @@ abstract class kolab_format_xcal extends kolab_format
$this->obj->setExceptionDates($exdates); $this->obj->setExceptionDates($exdates);
} }
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' => "Invalid event recurrence rule: " . json_encode($object['recurrence']), 'message' => "Invalid event recurrence rule: " . json_encode($object['recurrence']),

4
plugins/libkolab/lib/kolab_storage_cache.php
View file

@ -230,7 +230,7 @@ class kolab_storage_cache
); );
if (!$this->db->affected_rows($result)) { if (!$this->db->affected_rows($result)) {
rcmail::raise_error(array( rcube::raise_error(array(
'code' => 900, 'type' => 'php', 'code' => 900, 'type' => 'php',
'message' => "Failed to write to kolab cache" 'message' => "Failed to write to kolab cache"
), true); ), true);
@ -551,7 +551,7 @@ class kolab_storage_cache
" VALUES $buffer" " VALUES $buffer"
); );
if (!$this->db->affected_rows($result)) { if (!$this->db->affected_rows($result)) {
rcmail::raise_error(array( rcube::raise_error(array(
'code' => 900, 'type' => 'php', 'code' => 900, 'type' => 'php',
'message' => "Failed to write to kolab cache" 'message' => "Failed to write to kolab cache"
), true); ), true);

10
plugins/libkolab/lib/kolab_storage_folder.php
View file

@ -148,7 +148,7 @@ class kolab_storage_folder
switch ($info['namespace']) { switch ($info['namespace']) {
case 'personal': case 'personal':
$this->owner = $rcmail->user->get_username(); $this->owner = $rcmail->get_user_name();
break; break;
case 'shared': case 'shared':
@ -159,7 +159,7 @@ class kolab_storage_folder
$owner = ''; $owner = '';
list($prefix, $user) = explode($this->imap->get_hierarchy_delimiter(), $info['name']); list($prefix, $user) = explode($this->imap->get_hierarchy_delimiter(), $info['name']);
if (strpos($user, '@') === false) { if (strpos($user, '@') === false) {
$domain = strstr($rcmail->user->get_username(), '@'); $domain = strstr($rcmail->get_user_name(), '@');
if (!empty($domain)) if (!empty($domain))
$user .= $domain; $user .= $domain;
} }
@ -422,7 +422,7 @@ class kolab_storage_folder
} }
if (!$xml) { if (!$xml) {
raise_error(array( rcube::raise_error(array(
'code' => 600, 'code' => 600,
'type' => 'php', 'type' => 'php',
'file' => __FILE__, 'file' => __FILE__,
@ -470,7 +470,7 @@ class kolab_storage_folder
if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m)) if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m))
$msgadd = " UID = " . trim(strip_tags($m[1])); $msgadd = " UID = " . trim(strip_tags($m[1]));
raise_error(array( rcube::raise_error(array(
'code' => 600, 'code' => 600,
'type' => 'php', 'type' => 'php',
'file' => __FILE__, 'file' => __FILE__,
@ -606,7 +606,7 @@ class kolab_storage_folder
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' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(), 'message' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(),