gunnar: server/patches/horde/3.2-rc3/framework HK-GW-Freebusy_free_events_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-LDAP_user_alias_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-xfb_correction_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Sat Apr 5 20:01:51 CEST 2008
Author: gunnar
Update of /kolabrepository/server/patches/horde/3.2-rc3/framework
In directory doto:/tmp/cvs-serv1684/patches/horde/3.2-rc3/framework
Modified Files:
HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch
Added Files:
HK-GW-Freebusy_free_events_framework-3.2-rc3.patch
HK-GW-LDAP_user_alias_framework-3.2-rc3.patch
HK-GW-xfb_correction_framework-3.2-rc3.patch
Log Message:
kolab/issue2587 (ifb retrieval does not work for aliases anymore), kolab/issue2588 (whole day event with show-time-as free gets into the pfb)
--- NEW FILE: HK-GW-Freebusy_free_events_framework-3.2-rc3.patch ---
diff -r 339316b5cb1d framework/Kolab/Kolab/Freebusy.php
--- a/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 09:52:13 2008 +0200
+++ b/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 16:56:53 2008 +0200
@@ -453,7 +453,7 @@ class Kolab_Event {
if (isset($event['show-time-as'])) {
switch ($event['show-time-as']) {
case 'free':
- $this->status = KRONOLITH_STATUS_CANCELLED;
+ $this->status = KRONOLITH_STATUS_FREE;
break;
case 'tentative':
--- NEW FILE: HK-GW-LDAP_user_alias_framework-3.2-rc3.patch ---
diff -r 339316b5cb1d framework/Kolab/Kolab/LDAP.php
--- a/framework/Kolab/Kolab/LDAP.php Sat Apr 05 09:52:13 2008 +0200
+++ b/framework/Kolab/Kolab/LDAP.php Sat Apr 05 17:30:50 2008 +0200
@@ -235,6 +235,7 @@ class Horde_Kolab_LDAP {
$GLOBALS['conf']['kolab']['ldap']['basedn'],
'(&(objectClass=kolabInetOrgPerson)(|(uid='.
Horde_LDAP::quote($uid) . ')(mail=' .
+ Horde_LDAP::quote($uid) . ')(alias=' .
Horde_LDAP::quote($uid) . ')))',
array('dn', 'cn', 'mail', 'uid', 'kolabHomeServer',
'kolabFreeBusyFuture'));
--- NEW FILE: HK-GW-xfb_correction_framework-3.2-rc3.patch ---
diff -r d446e77a7821 framework/Kolab/Kolab.php
--- a/framework/Kolab/Kolab.php Sat Apr 05 17:30:58 2008 +0200
+++ b/framework/Kolab/Kolab.php Sat Apr 05 19:49:09 2008 +0200
@@ -794,7 +794,7 @@ class Kolab {
$folder = isset($matches[3]) ? $matches[3] : '';
$url = 'https://' . Kolab::getServer("imap") .
- '/freebusy/trigger/' . $owner . '/' . $folder . '.xpfb';
+ '/freebusy/trigger/' . $owner . '/' . $folder . '.pfb';
// now start the request
$options['method'] = 'GET';
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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 13 Mar 2008 15:37:25 -0000 1.1
+++ HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 5 Apr 2008 18:01:49 -0000 1.2
@@ -1,6 +1,18 @@
-diff -r 7d4ae482d6a2 framework/Share/Share/kolab.php
---- a/framework/Share/Share/kolab.php Thu Mar 13 07:16:33 2008 +0100
-+++ b/framework/Share/Share/kolab.php Thu Mar 13 07:16:38 2008 +0100
+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
+@@ -246,7 +246,7 @@ class Horde_Kolab_Freebusy {
+ return $this->_xacl;
+ }
+
+- $annotation = $this->_store->_imap->getAnnotation('/vendor/kolab/xfb-readable',
++ $annotation = $this->_store->_imap->getAnnotation('/vendor/kolab/pxfb-readable-for',
+ 'value.shared',
+ $this->_folder);
+ 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
@@ -17,6 +17,13 @@ define('HORDE_ANNOT_SHARE_ATTR', HORDE_A
* Marks a share without a name. These shares are still invalid
*/
@@ -15,14 +27,19 @@
/**
* Horde_Share_kolab:: provides the kolab backend for the horde share driver.
-@@ -894,16 +901,135 @@ class Horde_Share_Object_kolab extends H
+@@ -890,16 +897,135 @@ class Horde_Share_Object_kolab extends H
*/
function isDefault()
{
+- $imap = &$this->_shareOb->getImap();
+- $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder);
+- if (is_a($annotation, 'PEAR_Error')) {
+ $type = $this->getType();
+ if (is_a($type, 'PEAR_Error')) {
-+ return false;
-+ }
+ return false;
+ }
+- if (empty($annotation)) {
+- return false;
+ return $type[1];
+ }
+
@@ -36,21 +53,15 @@
+ */
+ function getType()
+ {
- $imap = &$this->_shareOb->getImap();
-- $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder);
++ $imap = &$this->_shareOb->getImap();
+ $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE,
+ 'value.shared',
+ $this->_folder);
- if (is_a($annotation, 'PEAR_Error')) {
-- return false;
-- }
-- if (empty($annotation)) {
-- return false;
-- }
++ if (is_a($annotation, 'PEAR_Error')) {
++ return $annotation;
+ }
- $type = explode('.', $annotation);
- return (!empty($type[1]) && $type[1] == 'default');
-+ return $annotation;
-+ }
+
+ if (!empty($annotation)) {
+ $default = false;
@@ -159,7 +170,7 @@
}
/**
-@@ -982,6 +1108,13 @@ class Horde_Share_Object_kolab extends H
+@@ -978,6 +1104,13 @@ class Horde_Share_Object_kolab extends H
$default = array('source' => 'kolab',
'default' => $this->get('default'),
'name' => $this->get('name'));
@@ -173,19 +184,18 @@
if (is_a($params, 'PEAR_Error') || $params == '') {
$params = $default;
}
-@@ -1036,8 +1169,9 @@ class Horde_Share_Object_kolab extends H
+@@ -1032,8 +1165,9 @@ class Horde_Share_Object_kolab extends H
$value = unserialize($value);
if (isset($value['default'])) {
$this->data['default'] = $value['default'];
-- }
-- break;
+ unset($value['default']);
-+ }
+ }
+- break;
+ $value = serialize($value);
default:
$this->data[$attribute] = $value;
-@@ -1086,6 +1220,7 @@ class Horde_Share_Object_kolab extends H
+@@ -1082,6 +1216,7 @@ class Horde_Share_Object_kolab extends H
}
} elseif ($attribute == 'default') {
$imap = &$this->_shareOb->getImap();
@@ -193,7 +203,7 @@
$annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder);
if (is_a($annotation, 'PEAR_Error')) {
return $annotation;
-@@ -1106,6 +1241,40 @@ class Horde_Share_Object_kolab extends H
+@@ -1102,6 +1237,40 @@ class Horde_Share_Object_kolab extends H
continue;
} elseif ($attribute == 'folder') {
continue;
More information about the commits
mailing list