gunnar: server/patches/horde HK-GW-global_3.2_ALPHA-SyncML.patch, NONE, 1.1 README_SyncML.patch, NONE, 1.1 README_Share_caching.patch, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde
In directory doto:/tmp/cvs-serv27950

Modified Files:
	README_Share_caching.patch 
Added Files:
	HK-GW-global_3.2_ALPHA-SyncML.patch README_SyncML.patch 
Log Message:
A patch to partially fix the Horde APIs and thus the RPCs (including SyncML).

--- NEW FILE: HK-GW-global_3.2_ALPHA-SyncML.patch ---
A patch that fixes some obvious SyncML problems.

diff -r dbd8e4436693 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php	Wed Nov 07 08:49:33 2007 +0100
+++ b/kronolith/lib/Driver/kolab.php	Wed Nov 07 08:51:18 2007 +0100
@@ -1098,7 +1098,7 @@ class Kronolith_Driver_kolab_wrapper_new
             }
 
             if ($keep_event) {
-                $ids[] = $event->getUID();
+                $ids[$event->getUID()] = $event->getUID();
             }
         }
 
diff -r dbd8e4436693 mnemo/lib/Driver/kolab.php
--- a/mnemo/lib/Driver/kolab.php	Wed Nov 07 08:49:33 2007 +0100
+++ b/mnemo/lib/Driver/kolab.php	Wed Nov 07 08:51:18 2007 +0100
@@ -36,6 +36,10 @@ class Mnemo_Driver_kolab extends Mnemo_D
 
     function Mnemo_Driver_kolab($notepad, $params = array())
     {
+        if (empty($notepad)) {
+            $notepad = Auth::getAuth();
+        }
+
         $this->_notepad = $notepad;
 
         $this->_kolab = &new Kolab();
@@ -506,7 +510,13 @@ class Mnemo_Driver_kolab_wrapper_new ext
      */
     function _splitId($id)
     {
-        return split('@', $id, 2);
+        $split = split('@', $id, 2);
+        if (count($split) == 2) {
+            list($id, $notepad) = $split;
+        } else if (count($split) == 1) {
+            $notepad = Auth::getAuth();
+        }
+        return array($id, $notepad);
     }
 
     /**
@@ -520,6 +530,9 @@ class Mnemo_Driver_kolab_wrapper_new ext
      */
     function _uniqueId($id)
     {
+        if ($this->_notepad == Auth::getAuth()) {
+            return $id;
+        }
         return $id . '@' . $this->_notepad;
     }
 
@@ -555,7 +568,7 @@ class Mnemo_Driver_kolab_wrapper_new ext
      */
     function getByUID($uid, $passphrase = null)
     {
-        list($noteId, $notepad) = $this->_splitId($noteId);
+        list($noteId, $notepad) = $this->_splitId($uid);
 
         if ($this->_notepad != $notepad) {
             $this->_notepad = $notepad;
diff -r dbd8e4436693 mnemo/lib/api.php
--- a/mnemo/lib/api.php	Wed Nov 07 08:49:33 2007 +0100
+++ b/mnemo/lib/api.php	Wed Nov 07 08:51:18 2007 +0100
@@ -133,8 +133,7 @@ function _mnemo_list($notepad = null)
     require_once dirname(__FILE__) . '/base.php';
     global $conf;
 
-    if (!isset($conf['storage']['driver']) ||
-        !isset($conf['storage']['params'])) {
+    if (!isset($conf['storage']['driver'])) {
         return PEAR::raiseError('Not configured');
     }
 
diff -r dbd8e4436693 nag/lib/Driver/kolab.php
--- a/nag/lib/Driver/kolab.php	Wed Nov 07 08:49:33 2007 +0100
+++ b/nag/lib/Driver/kolab.php	Wed Nov 07 08:51:18 2007 +0100
@@ -47,6 +47,10 @@ class Nag_Driver_kolab extends Nag_Drive
      */
     function Nag_Driver_kolab($tasklist, $params = array())
     {
+        if (empty($tasklist)) {
+            $tasklist = Auth::getAuth();
+        }
+
         $this->_tasklist = $tasklist;
 
         $this->_kolab = &new Kolab();
@@ -643,7 +647,13 @@ class Nag_Driver_kolab_wrapper_new exten
      */
     function _splitId($id)
     {
-        return split('@', $id, 2);
+        $split = split('@', $id, 2);
+        if (count($split) == 2) {
+            list($id, $tasklist) = $split;
+        } else if (count($split) == 1) {
+            $tasklist = Auth::getAuth();
+        }
+        return array($id, $tasklist);
     }
 
     /**
@@ -657,6 +667,9 @@ class Nag_Driver_kolab_wrapper_new exten
      */
     function _uniqueId($id)
     {
+        if ($this->_tasklist == Auth::getAuth()) {
+            return $id;
+        }
         return $id . '@' . $this->_tasklist;
     }
 
diff -r dbd8e4436693 nag/lib/api.php
--- a/nag/lib/api.php	Wed Nov 07 08:49:33 2007 +0100
+++ b/nag/lib/api.php	Wed Nov 07 08:51:18 2007 +0100
@@ -327,8 +327,7 @@ function _nag_list($tasklist = null)
 {
     require_once dirname(__FILE__) . '/base.php';
 
-    if (!isset($GLOBALS['conf']['storage']['driver']) ||
-        !isset($GLOBALS['conf']['storage']['params'])) {
+    if (!isset($GLOBALS['conf']['storage']['driver'])) {
         return PEAR::raiseError('Not configured');
     }
 
diff -r dbd8e4436693 turba/config/sources.php.dist
--- a/turba/config/sources.php.dist	Wed Nov 07 08:49:33 2007 +0100
+++ b/turba/config/sources.php.dist	Wed Nov 07 08:51:18 2007 +0100
@@ -812,6 +812,7 @@ if (!empty($GLOBALS['conf']['kolab']['en
         ),
         'map' => array(
             '__key' => 'uid',
+            '__uid' => 'uid',
             'name'              => 'full-name',
             'firstname'         => 'given-name',
             'lastname'          => 'last-name',

--- NEW FILE: README_SyncML.patch ---
DESCRIPTION:

This fixes some obvious problems with the Horde application APIs
and might allow to get SyncML working on a basic level.

IMPACT:

The APIs - and thus the remote procedure calls offered by Horde - 
won't work. SyncML is among the RPCs offered

REFERENCES:

Mercurial patch repository:

http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_ALPHA/summary

HISTORY

Has been submitted upstream since it fixes obvious bugs.

Index: README_Share_caching.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/README_Share_caching.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README_Share_caching.patch	10 Oct 2007 09:46:37 -0000	1.1
+++ README_Share_caching.patch	7 Nov 2007 07:58:48 -0000	1.2
@@ -15,5 +15,4 @@
 
 HISTORY
 
-This is still rather fresh and might have side effects so this has not
-yet been applied upstream even if it is Kolab specific.
\ No newline at end of file
+Applied upstream.