Request 2187 (accepted)

kolab-syncroton.spec Changed

@@ -36,7 +36,7 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           kolab-syncroton
-Version:        2.3.9
+Version:        2.3.8
 Release:        1%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
@@ -195,16 +195,6 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
-* Fri Mar  2 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.9-1
-- Release 2.3.9
-
-* Fri Feb  2 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.8-3
-- Fix redundant GETMETADATA requests for mail folders
-
-* Wed Jan 24 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.8-2
-- Fix logging
-- Fix version number
-
 * Wed Dec 20 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.3.8-1
 - Release 2.3.8
 
@@ -303,6 +293,9 @@
 * Sun Sep  8 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.2.0-1
 - Release version 2.2.0
 
+* Wed Sep  3 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.1.0-1
+- Bug fixes for #1658, and attachment sending
+
 * Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.1-0.2.rc2
 - New upstream release

debian.changelog Changed

kolab-syncroton-2.3.9.tar.gz/config/config.inc.php.dist -> kolab-syncroton-2.3.8.tar.gz/config/config.inc.php.dist Changed

kolab-syncroton-2.3.9.tar.gz/lib/ext/Syncroton/Command/FolderSync.php -> kolab-syncroton-2.3.8.tar.gz/lib/ext/Syncroton/Command/FolderSync.php Changed

@@ -208,28 +208,7 @@
                 
                 $updates[] = $change;
             }
-
-            // Find changes in case backend does not support folder changes detection.
-            // On some backends getChangedFolders() can return an empty result.
-            // We make sure all is up-to-date comparing folder properties.
-            foreach ($clientFoldersIds as $folderId) {
-                if (isset($serverFolders[$folderId])) {
-                    $c = $clientFolders[$folderId];
-                    $s = $serverFolders[$folderId];
-
-                    if ($c->displayName !== $s->displayName
-                        || strval($c->parentId) !== strval($s->parentId)
-                        || $c->type != $s->type
-                    ) {
-                        $c->displayName = $s->displayName;
-                        $c->parentId    = $s->parentId;
-                        $c->type        = $s->type;
-
-                        $updates[] = $c;
-                    }
-                }
-            }
-
+            
             // calculate deleted entries
             $serverDiff = array_diff($clientFoldersIds, $serverFoldersIds);
             foreach ($serverDiff as $serverFolderId) {

kolab-syncroton-2.3.9.tar.gz/lib/ext/Syncroton/Command/Sync.php -> kolab-syncroton-2.3.8.tar.gz/lib/ext/Syncroton/Command/Sync.php Changed

@@ -544,15 +544,7 @@
             // request already maybe
             } while (Syncroton_Server::validateSession() && time() - $intervalStart < $this->_heartbeatInterval - (Syncroton_Registry::getPingTimeout() + 10));
         }
-
-        // First check for folders hierarchy changes
-        foreach ($this->_collections as $collectionData) {
-            if (! ($collectionData->folder instanceof Syncroton_Model_IFolder)) {
-                $sync->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Status', self::STATUS_FOLDER_HIERARCHY_HAS_CHANGED));
-                return $this->_outputDom;
-            }
-        }
-
+        
         foreach($this->_collections as $collectionData) {
             $collectionChanges = 0;
             
@@ -566,8 +558,15 @@
              */
             $deletedContentStates = array();
             
+            // invalid collectionid provided
+            if (! ($collectionData->folder instanceof Syncroton_Model_IFolder)) {
+                $collection = $collections->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Collection'));
+                $collection->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'SyncKey', 0));
+                $collection->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'CollectionId', $collectionData->collectionId));
+                $collection->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Status', self::STATUS_FOLDER_HIERARCHY_HAS_CHANGED));
+
             // invalid synckey provided
-            if (! ($collectionData->syncState instanceof Syncroton_Model_ISyncState)) {
+            } elseif (! ($collectionData->syncState instanceof Syncroton_Model_ISyncState)) {
                 // set synckey to 0
                 $collection = $collections->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Collection'));
                 $collection->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'SyncKey', 0));

kolab-syncroton-2.3.9.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage5.php -> kolab-syncroton-2.3.8.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage5.php Changed

kolab-syncroton-2.3.9.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.3.8.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.7";
 
 
     /**
@@ -142,7 +142,7 @@
         $this->plugins->exec_hook('ready', array('task' => 'syncroton'));
 
         // Set log directory per-user
-        $this->set_log_dir();
+        $this->set_log_dir($this->username ?: $_SERVER['PHP_AUTH_USER']);
 
         // Save user password for Roundcube Framework
         $this->password = $_SERVER['PHP_AUTH_PW'];
@@ -384,13 +384,13 @@
     /**
      * Set logging directory per-user
      */
-    protected function set_log_dir()
+    protected function set_log_dir($username)
     {
-        if (empty($this->username)) {
+        if (empty($username)) {
             return;
         }
 
-        $this->logger->set_username($this->username);
+        $this->logger->set_username($username);
 
         $user_debug = $this->config->get('per_user_logging');
         $user_log   = $user_debug || $this->config->get('activesync_user_log');
@@ -400,9 +400,15 @@
         }
 
         $log_dir  = $this->config->get('log_dir');
-        $log_dir .= DIRECTORY_SEPARATOR . $this->username;
+        $log_dir .= DIRECTORY_SEPARATOR . $username;
 
-        if (!$user_debug && !is_dir($log_dir)) {
+        // in user_debug mode enable logging only if user directory exists
+        if ($user_debug) {
+            if (!is_dir($log_dir)) {
+                return;
+            }
+        }
+        else if (!is_dir($log_dir)) {
             if (!mkdir($log_dir, 0770)) {
                 return;
             }
@@ -418,26 +424,35 @@
             }
         }
 
+        // make sure we're using debug mode where possible,
         if ($user_debug) {
-            $this->per_user_log_dir = $log_dir;
-        }
-        else {
-            $this->config->set('log_dir', $log_dir);
+            $this->config->set('debug_level', 1);
+            $this->config->set('memcache_debug', true);
+            $this->config->set('imap_debug', true);
+            $this->config->set('ldap_debug', true);
+            $this->config->set('smtp_debug', true);
+            $this->config->set('sql_debug', true);
+
+            // SQL/IMAP debug need to be set directly on the object instance
+            // it's already initialized/configured
+            if ($db = $this->get_dbh()) {
+                $db->set_debug(true);
+            }
+            if ($storage = $this->get_storage()) {
+                $storage->set_debug(true);
+            }
+
+            $this->logger->mode = kolab_sync_logger::DEBUG;
         }
 
+        $this->config->set('log_dir', $log_dir);
+
         // re-set PHP error logging
         if (($this->config->get('debug_level') & 1) && $this->config->get('log_driver') != 'syslog') {
             ini_set('error_log', $log_dir . '/errors');
         }
     }
 
-    /**
-     * Get the per-user log directory
-     */
-    public function get_user_log_dir()
-    {
-        return $this->per_user_log_dir;
-    }
 
     /**
      * Send HTTP 503 response.

kolab-syncroton-2.3.9.tar.gz/lib/kolab_sync_backend.php -> kolab-syncroton-2.3.8.tar.gz/lib/kolab_sync_backend.php Changed

kolab-syncroton-2.3.9.tar.gz/lib/kolab_sync_data_calendar.php -> kolab-syncroton-2.3.8.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -440,13 +440,13 @@
             $event['valarms'] = $this->to_kolab_alarm($data->reminder, $event);
         }
 
-        $attendees  = array();
-        $categories = array();
+        $event['attendees']  = array();
+        $event['categories'] = array();
 
         // Categories
         if (isset($data->categories)) {
             foreach ($data->categories as $category) {
-                $categories[] = $category;
+                $event['categories'][] = $category;
             }
         }
 
@@ -455,7 +455,7 @@
             $name  = $data->organizerName;
             $email = $data->organizerEmail;
             if ($name || $email) {
-                $attendees[] = array(
+                $event['attendees'][] = array(
                     'role'   => 'ORGANIZER',
                     'name'   => $name,
                     'email'  => $email,
@@ -473,17 +473,12 @@
         if ($is_outlook && !empty($entry) && $data->timezone == $dummy_tz
             && $data->responseRequested && !empty($data->attendees)
         ) {
-            $attendees = $entry['attendees'];
+            $event['attendees'] = $entry['attendees'];
         }
         else if (isset($data->attendees)) {
             $statusMap = array_flip($this->attendeeStatusMap);
             foreach ($data->attendees as $attendee) {
-                if ($attendee->email && $attendee->email == $data->organizerEmail) {
-                    continue;
-                }
-
                 $role = false;
-
                 if (isset($attendee->attendeeType)) {
                     $role = array_search($attendee->attendeeType, $this->attendeeTypeMap);
                 }
@@ -504,7 +499,7 @@
                         $_attendee['rsvp']   = true;
                     }
                 }
-                else if (!empty($event['attendees']) && !empty($attendee->email)) {
+                else if (!empty($event['attendees'])) {
                     // copy the old attendee status
                     foreach ($event['attendees'] as $old_attendee) {
                         if ($old_attendee['email'] == $_attendee['email'] && isset($old_attendee['status'])) {
@@ -515,13 +510,10 @@
                     }
                 }
 
-                $attendees[] = $_attendee;
+                $event['attendees'][] = $_attendee;
             }
         }
 
-        $event['attendees']  = $attendees;
-        $event['categories'] = $categories;
-
         // recurrence (and exceptions)
         if (!$is_exception) {
             $event['recurrence'] = $this->recurrence_to_kolab($data, $folderid, $timezone);
@@ -533,16 +525,13 @@
         // Unfortunately Outlook also sends an update when no SEQUENCE bump
         // is needed, e.g. when updating attendee status.
         // We try our best to bump the SEQUENCE only when expected
-        if (!empty($entry) && !$is_exception && !empty($data->attendees) && $data->timezone != $dummy_tz) {
+        if ($is_outlook && !empty($entry) && !$is_exception && !empty($data->attendees) && $data->timezone != $dummy_tz) {
             if ($last_update = $this->getKolabDataItem($event, 'x-custom.X-ACTIVESYNC-DTSTAMP')) {
                 $last_update = new DateTime($last_update);
             }
 
             if ($data->dtStamp && $data->dtStamp != $last_update) {
-                if ($this->has_significant_changes($event, $entry)) {
-                    $event['sequence']++;
-                    $this->logger->debug('Found significant changes in the updated event. Bumping SEQUENCE to ' . $event['sequence']);
-                }
+                $event['sequence'] += 1;
             }
         }
 
@@ -965,65 +954,4 @@
             $entry->endTime = $rounded;
         }
     }
-
-    /**
-     * Check if the new event version has any significant changes
-     */
-    protected function has_significant_changes($event, $old)
-    {
-        // Calendar namespace fields
-        foreach (array('allday', 'start', 'end', 'location', 'recurrence') as $key) {
-            if ($event[$key] != $old[$key]) {
-                // Comparing recurrence is tricky as there can be differences in default
-                // value handling. Let's try to handle most common cases
-                if ($key == 'recurrence' && $this->fixed_recurrence($event) == $this->fixed_recurrence($old)) {
-                    continue;
-                }
-
-                return true;
-            }
-        }
-
-        if (count($event['attendees']) != count($old['attendees'])) {
-            return true;
-        }
-
-        foreach ($event['attendees'] as $idx => $attendee) {
-            $old_attendee = $old['attendees'][$idx];
-
-            if ($old_attendee['email'] != $attendee['email']
-                || ($attendee['role'] != 'ORGANIZER'
-                    && $attendee['status'] != $old_attendee['status']
-                    && $attendee['status'] == 'NEEDS-ACTION')
-            ) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Unify recurrence spec. for comparison
-     */
-    protected function fixed_recurrence($event)
-    {
-        $rec = (array) $event['recurrence'];
-
-        // Add BYDAY if not exists
-        if ($rec['FREQ'] == 'WEEKLY' && empty($rec['BYDAY'])) {
-            $days = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
-            $day  = $event['start']->format('w');
-
-            $rec['BYDAY'] = $days[$day];
-        }
-
-        if (!$rec['INTERVAL']) {
-            $rec['INTERVAL'] = 1;
-        }
-
-        ksort($rec);
-
-        return $rec;
-    }
 }

kolab-syncroton-2.3.9.tar.gz/lib/kolab_sync_logger.php -> kolab-syncroton-2.3.8.tar.gz/lib/kolab_sync_logger.php Changed

kolab-syncroton.dsc Changed

Overview

Request 2187 (accepted)

Request History