Projects
Kolab:Winterfell
kolab-syncroton
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 36
View file
kolab-syncroton.spec
Changed
@@ -36,7 +36,7 @@ %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name} Name: kolab-syncroton -Version: 2.3.9 +Version: 2.3.10 Release: 1%{?dist} Summary: ActiveSync for Kolab Groupware @@ -195,6 +195,9 @@ %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name} %changelog +* Thu Mar 8 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.10-1 +- Release 2.3.10 + * Fri Mar 2 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.9-1 - Release 2.3.9
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +kolab-syncroton (2.3.10-0~kolab1) unstable; urgency=low + + * Release 2.3.10 + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 8 Mar 2018 15:13:40 +0200 + kolab-syncroton (2.3.9-0~kolab1) unstable; urgency=low * Release 2.3.9
View file
kolab-syncroton-2.3.9.tar.gz/lib/ext/Syncroton/Command/MoveItems.php -> kolab-syncroton-2.3.10.tar.gz/lib/ext/Syncroton/Command/MoveItems.php
Changed
@@ -23,7 +23,7 @@ const STATUS_SUCCESS = 3; protected $_defaultNameSpace = 'uri:Move'; - protected $_documentElement = 'Moves'; + protected $_documentElement = 'MoveItems'; /** * list of items to move @@ -83,7 +83,8 @@ $newId = $dataController->moveItem($move['srcFldId'], $move['srcMsgId'], $move['dstFldId']); $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Command_MoveItems::STATUS_SUCCESS)); - $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId)); + if ($newId) + $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId)); } catch (Syncroton_Exception_Status $e) { $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', $e->getCode())); } catch (Exception $e) {
View file
kolab-syncroton-2.3.9.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.3.10.tar.gz/lib/kolab_sync.php
Changed
@@ -46,7 +46,7 @@ public $password; const CHARSET = 'UTF-8'; - const VERSION = "2.3.9"; + const VERSION = "2.3.10"; /** @@ -463,7 +463,10 @@ $this->gc_run(); // write performance stats to logs/console - if ($this->config->get('devel_mode')) { + if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) { + // make sure logged numbers use unified format + setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C'); + if (function_exists('memory_get_usage')) $mem = sprintf('%.1f', memory_get_usage() / 1048576); if (function_exists('memory_get_peak_usage'))
View file
kolab-syncroton-2.3.9.tar.gz/lib/kolab_sync_backend_common.php -> kolab-syncroton-2.3.10.tar.gz/lib/kolab_sync_backend_common.php
Changed
@@ -87,7 +87,7 @@ public function create($object) { if (! $object instanceof $this->interface_name) { - throw new InvalidArgumentException('$object must be instanace of ' . $this->interface_name); + throw new InvalidArgumentException('$object must be instance of ' . $this->interface_name); } $data = $this->object_to_array($object); @@ -99,13 +99,13 @@ $cols[] = $this->db->quote_identifier($key); } - $this->db->query('INSERT INTO `' . $this->table_name . '`' . ' (' . implode(', ', $cols) . ')' + $result = $this->db->query('INSERT INTO `' . $this->table_name . '`' . ' (' . implode(', ', $cols) . ')' . ' VALUES(' . implode(', ', array_fill(0, count($cols), '?')) . ')', array_values($data) ); - if (!$this->db->insert_id($this->table_name)) { - // @TODO: throw exception + if ($this->db->is_error($result)) { + throw new Exception('Failed to save instance of ' . $this->interface_name); } return $object;
View file
kolab-syncroton-2.3.9.tar.gz/lib/kolab_sync_data_calendar.php -> kolab-syncroton-2.3.10.tar.gz/lib/kolab_sync_data_calendar.php
Changed
@@ -451,16 +451,12 @@ } // Organizer - if (!$is_exception) { - $name = $data->organizerName; - $email = $data->organizerEmail; - if ($name || $email) { - $attendees[] = array( - 'role' => 'ORGANIZER', - 'name' => $name, - 'email' => $email, - ); - } + if (!$is_exception && ($organizer_email = $data->organizerEmail)) { + $attendees[] = array( + 'role' => 'ORGANIZER', + 'name' => $data->organizerName, + 'email' => $organizer_email, + ); } // Attendees @@ -478,7 +474,7 @@ else if (isset($data->attendees)) { $statusMap = array_flip($this->attendeeStatusMap); foreach ($data->attendees as $attendee) { - if ($attendee->email && $attendee->email == $data->organizerEmail) { + if ($attendee->email && $attendee->email == $organizer_email) { continue; } @@ -519,6 +515,15 @@ } } + // Make sure the event has the organizer set + if (!$organizer_email && ($identity = kolab_sync::get_instance()->user->get_identity())) { + $attendees[] = array( + 'role' => 'ORGANIZER', + 'name' => $identity['name'], + 'email' => $identity['email'], + ); + } + $event['attendees'] = $attendees; $event['categories'] = $categories;
View file
kolab-syncroton.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-syncroton Binary: kolab-syncroton Architecture: all -Version: 2.3.9-0~kolab1 +Version: 2.3.10-0~kolab1 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.kolab.org/ @@ -12,5 +12,5 @@ Package-List: kolab-syncroton deb utils extra Files: - 00000000000000000000000000000000 0 kolab-syncroton-2.3.9.tar.gz + 00000000000000000000000000000000 0 kolab-syncroton-2.3.10.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.