gunnar: server/patches/horde/3.2-rc3/framework HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, 1.2, 1.3
cvs at kolab.org
cvs at kolab.org
Tue Apr 15 11:13:52 CEST 2008
Author: gunnar
Update of /kolabrepository/server/patches/horde/3.2-rc3/framework
In directory doto:/tmp/cvs-serv21914/3.2-rc3/framework
Modified Files:
HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch
Log Message:
Fix the xfb names.
Index: HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/3.2-rc3/framework/HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 5 Apr 2008 18:01:49 -0000 1.2
+++ HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 15 Apr 2008 09:13:50 -0000 1.3
@@ -1,6 +1,6 @@
diff -r e1996d696f1b framework/Kolab/Kolab/Freebusy.php
--- a/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 17:30:58 2008 +0200
-+++ b/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 19:50:58 2008 +0200
++++ b/framework/Kolab/Kolab/Freebusy.php Tue Apr 15 11:07:33 2008 +0200
@@ -246,7 +246,7 @@ class Horde_Kolab_Freebusy {
return $this->_xacl;
}
@@ -12,7 +12,7 @@
if (is_a($annotation, 'PEAR_Error')) {
diff -r e1996d696f1b framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php Sat Apr 05 17:30:58 2008 +0200
-+++ b/framework/Share/Share/kolab.php Sat Apr 05 19:50:58 2008 +0200
++++ b/framework/Share/Share/kolab.php Tue Apr 15 11:07:33 2008 +0200
@@ -17,6 +17,13 @@ define('HORDE_ANNOT_SHARE_ATTR', HORDE_A
* Marks a share without a name. These shares are still invalid
*/
@@ -145,7 +145,7 @@
+ function getXfbaccess()
+ {
+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
++ $entry = KOLAB_ANNOT_ROOT . 'pxfb-readable-for';
+
+ $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
+ if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
@@ -165,7 +165,7 @@
+ function setXfbaccess($access)
+ {
+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
++ $entry = KOLAB_ANNOT_ROOT . 'pxfb-readable-for';
+ return $imap->setAnnotation($entry, array('value.shared' => join(' ', $access)), $this->_folder);
}
More information about the commits
mailing list