gunnar: server/horde/horde-framework HK-GW-Fix_annotation_use.patch, NONE, 1.1 horde-framework-kolab.spec, 1.22, 1.23

cvs at kolab.org cvs at kolab.org
Thu Oct 4 11:47:57 CEST 2007


Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv11291/horde/horde-framework

Modified Files:
	horde-framework-kolab.spec 
Added Files:
	HK-GW-Fix_annotation_use.patch 
Log Message:
Make horde ready for the beta release.

--- NEW FILE: HK-GW-Fix_annotation_use.patch ---
Move to better IMAP annotation entries.

diff -r 47e8cc47adcf framework/Kolab/Kolab/IMAP.php
--- a/framework/Kolab/Kolab/IMAP.php	Wed Oct 03 19:30:01 2007 +0200
+++ b/framework/Kolab/Kolab/IMAP.php	Wed Oct 03 19:33:53 2007 +0200
@@ -31,6 +31,11 @@ require_once 'Horde/MIME/Structure.php';
  * that are used by Kolab clients.
  */
 define('KOLAB_ANNOT_ROOT', '/vendor/kolab/');
+
+/**
+ * The root of the Horde annotation hierarchy on the IMAP server
+ */
+define('HORDE_ANNOT_ROOT', '/vendor/horde/');
 
 /**
  * The annotation, as defined by the Kolab format spec, that is used to store
diff -r 47e8cc47adcf framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php	Wed Oct 03 19:30:01 2007 +0200
+++ b/framework/Share/Share/kolab.php	Wed Oct 03 19:33:53 2007 +0200
@@ -11,7 +11,7 @@ require_once 'Horde/Kolab.php';
 /**
  * Horde-specific annotations on the imap folder have this prefix.
  */
-define('KOLAB_ANNOT_SHARE_ATTR', KOLAB_ANNOT_ROOT . 'h-share-attr-');
+define('HORDE_ANNOT_SHARE_ATTR', HORDE_ANNOT_ROOT . 'share-');
 
 /**
  * Marks a share without a name. These shares are still invalid
@@ -1000,7 +1000,12 @@ class ImapObject_Share {
     function getAttribute($attribute)
     {
         $imap = &$this->_storage->getImap();
-        $annotation = $imap->getAnnotation(KOLAB_ANNOT_SHARE_ATTR . $attribute, 'value.shared', $this->_folder);
+        if ($attribute == 'desc') {
+            $entry = '/comment';
+        } else {
+            $entry = HORDE_ANNOT_SHARE_ATTR . $attribute;
+        }
+        $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
         if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
             $annotation = '';
         }
@@ -1170,7 +1175,12 @@ class ImapObject_Share {
                 $imap = &$this->_storage->getImap();
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters
                 $store = base64_encode($value);
-                $result = $imap->setAnnotation(KOLAB_ANNOT_SHARE_ATTR . $attribute, array('value.shared' => $store), $this->_folder);
+                if ($attribute == 'desc') {
+                    $entry = '/comment';
+                } else {
+                    $entry = HORDE_ANNOT_SHARE_ATTR . $attribute;
+                }
+                $result = $imap->setAnnotation($entry, array('value.shared' => $store), $this->_folder);
                 if (is_a($result, 'PEAR_Error')) {
                     return $result;
                 }

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- horde-framework-kolab.spec	2 Oct 2007 14:21:33 -0000	1.22
+++ horde-framework-kolab.spec	4 Oct 2007 09:47:55 -0000	1.23
@@ -3,7 +3,7 @@
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
 %define         V_month 10
-%define         V_day   02
+%define         V_day   04
 %define         V_version 3.2_ALPHA
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
@@ -28,6 +28,7 @@
 
 Patch0:         HK-GW-Fix_Prefs_for_Ingo.patch
 Patch1:         HK-GW-Fix_the_share_params.patch
+Patch2:         HK-GW-Fix_annotation_use.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -50,6 +51,7 @@
 	%setup -n framework
 	%patch -p2 -P 0
 	%patch -p2 -P 1
+	%patch -p2 -P 2
 
 %build
 





More information about the commits mailing list