Branch 'kolab-syncroton-2.2' - 2 commits - lib/kolab_sync_backend_common.php lib/kolab_sync_backend.php

[Aleksander Machniak]

 lib/kolab_sync_backend.php        |    3 ++-
 lib/kolab_sync_backend_common.php |   10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 16840c2c21fde8de70ab2e4524f3b464dfa56283
Author: Aleksander Machniak <alec at alec.pl>
Date:   Fri Oct 18 17:50:13 2013 +0200

    Enable alarms synchronization by default for task/event folders when
    registering a device (Bug #2383)

diff --git a/lib/kolab_sync_backend.php b/lib/kolab_sync_backend.php
index b985aef..1b85e06 100644
--- a/lib/kolab_sync_backend.php
+++ b/lib/kolab_sync_backend.php
@@ -421,7 +421,8 @@ class kolab_sync_backend
                 foreach ($foldertypes as $folder => $type) {
                     // only personal folders
                     if ($this->storage->folder_namespace($folder) == 'personal') {
-                        $this->folder_set($folder, $id, 1);
+                        $flag = preg_match('/^(event|task)/', $type) ? 2 : 1;
+                        $this->folder_set($folder, $id, $flag);
                     }
                 }
             }


commit c22a5bfea495e51b39922fd0d3a2938f19311c55
Author: Aleksander Machniak <alec at alec.pl>
Date:   Fri Oct 18 17:41:54 2013 +0200

    Skip SELECT/DELETE ... WHERE id = NULL queries

diff --git a/lib/kolab_sync_backend_common.php b/lib/kolab_sync_backend_common.php
index ead546e..1c4f988 100644
--- a/lib/kolab_sync_backend_common.php
+++ b/lib/kolab_sync_backend_common.php
@@ -120,8 +120,10 @@ class kolab_sync_backend_common implements Syncroton_Backend_IBackend
     {
         $id = $id instanceof $this->interface_name ? $id->id : $id;
 
-        $select = $this->db->query('SELECT * FROM ' . $this->table_name . ' WHERE id = ?', array($id));
-        $data   = $this->db->fetch_assoc($select);
+        if ($id) {
+            $select = $this->db->query('SELECT * FROM ' . $this->table_name . ' WHERE id = ?', array($id));
+            $data   = $this->db->fetch_assoc($select);
+        }
 
         if (empty($data)) {
             throw new Syncroton_Exception_NotFound('Object not found');
@@ -141,6 +143,10 @@ class kolab_sync_backend_common implements Syncroton_Backend_IBackend
     {
         $id = $id instanceof $this->interface_name ? $id->id : $id;
 
+        if (!$id) {
+            return false;
+        }
+
         $result = $this->db->query('DELETE FROM ' . $this->table_name .' WHERE id = ?', array($id));
 
         return (bool) $this->db->affected_rows($result);