gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 t_framework_HK_GW_ZpushAnnotations.diff, 1.2, 1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
In directory doto:/tmp/cvs-serv29677/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0

Modified Files:
	t_framework_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_framework_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_framework_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:14:07 -0000	1.2
+++ t_framework_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -10,7 +10,7 @@
              $result = $this->_setAnnotation(KOLAB_ANNOT_FOLDER_TYPE, $folder_type);
              if (is_a($result, 'PEAR_Error')) {
                  $this->_type = null;
-@@ -412,13 +412,26 @@
+@@ -412,19 +412,38 @@
                          if (is_a($result, 'PEAR_Error')) {
                              return $result;
                          }
@@ -37,6 +37,19 @@
                  }
  
                  // setAnnotation apparently does not suppoort UTF-8 nor any special characters
+                 $store = base64_encode($value);
+                 if ($key == 'desc') {
+-                    $entry = '/comment';
++                    if ($this->_owner == Auth::getAuth()) {
++                        $entry = '/comment';
++                    } else {
++                        continue;
++                    }
++                } else if ($key == 'params' && $this->_owner != Auth::getAuth()) {
++                    continue;
+                 } else {
+                     $entry = HORDE_ANNOT_SHARE_ATTR . $key;
+                 }
 @@ -447,7 +450,7 @@
          }