Branch 'roundcubemail-plugins-kolab-format2-horde5' - plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Wed May 8 09:04:26 CEST 2013
plugins/calendar/drivers/database/database_driver.php | 4 ++--
plugins/calendar/drivers/kolab/kolab_calendar.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 574e17ad32b635484a1c570b2a0881598ec509f7
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed May 8 08:55:58 2013 +0200
Small fixes after static code analysis (#1851)
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index ca3a576..b0cb0a4 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -555,7 +555,7 @@ class database_driver extends calendar_driver
break;
// stop adding events for inifinite recurrence after 20 years
- if (++$count > 999 || (!$recurrence->recurEnd && !$recurrence->recurCount && $next->year > date('Y') + 20))
+ if (++$count > 999 || (!$recurrence->recurEnd && !$recurrence->recurCount && $next_start->format('Y') > date('Y') + 20))
break;
}
}
@@ -631,7 +631,7 @@ class database_driver extends calendar_driver
$update_master = true;
// delete this and all future instances
- $fromdate = clone $old['start'];
+ $fromdate = clone $event['start'];
$fromdate->setTimezone($this->server_timezone);
$query = $this->rc->db->query(
"DELETE FROM " . $this->db_events . "
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 499e2a9..dd17186 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -377,7 +377,7 @@ class kolab_calendar
rcube::raise_error(array(
'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Error undeleting the event object $uid from the Kolab server"),
+ 'message' => "Error undeleting the event object $event[id] from the Kolab server"),
true, false);
}
@@ -554,7 +554,7 @@ class kolab_calendar
if (is_array($prop)) {
foreach ($prop as $key => $val) {
if (is_numeric($key)) {
- $out .= self::_complex2string($val, $fields);
+ $out .= self::_complex2string($val);
}
else if (!in_array($key, $ignorekeys)) {
$out .= $val . ' ';
More information about the commits
mailing list