Thu Nov 29 09:22:55 CET 2007

Author: gunnar

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

Added Files:
	HK-GW-framework_3.2_RC1-Fix_Prefs_for_Ingo.patch 
	HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch 
	HK-GW-turba_2.2_RC1-Fix_share_id_change.patch 
	HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch 
Removed Files:
	HK-GW-framework_3.2_ALPHA-Fix_Prefs_for_Ingo.patch 
	HK-GW-framework_3.2_ALPHA-Fix_annotation_use.patch 
	HK-GW-framework_3.2_ALPHA-Fix_contact_XML.patch 
	HK-GW-framework_3.2_ALPHA-Fix_the_share_params.patch 
	HK-GW-framework_3.2_ALPHA-Kolab_extensions.patch 
	HK-GW-framework_3.2_ALPHA-Kolab_issue_2138.patch 
	HK-GW-framework_3.2_ALPHA-Kolab_issue_2144.patch 
	HK-GW-framework_3.2_ALPHA-Share_caching.patch 
	HK-GW-global_3.2_ALPHA-SyncML.patch 
	HK-GW-horde_3.2_ALPHA-Deleting_categories.patch 
	HK-GW-kronolith_2.2-Fix_create_new_event.patch 
	HK-GW-kronolith_2.2-Fix_share_right_editing.patch 
	HK-GW-kronolith_2.2_ALPHA-Kolab_issue_2138.patch 
	HK-GW-mnemo_2.2_ALPHA-Edit_share_rights.patch 
	HK-GW-nag_2.2_ALPHA-Fix_share_right_editing.patch 
	HK-GW-turba_2.2-Changes_after_ALPHA.patch 
	HK-GW-turba_2.2-Fix_address_book_deletion_1.patch 
	HK-GW-turba_2.2-Fix_editing_contacts.patch 
	HK-GW-turba_2.2-Fix_notice_on_addressbook_creation.patch 
	HK-GW-turba_2.2-Fix_share_id_change.patch 
	HK-GW-turba_2.2-Ldap_read_only_fix.patch 
	HK-UV-kronolith_2.2-Fix_list_events.patch 
	README_Changes_after_ALPHA.patch 
	README_Deleting_categories.patch 
	README_Edit_share_rights.patch 
	README_Fix_address_book_deletion_1.patch 
	README_Fix_annotation_use.patch README_Fix_contact_XML.patch 
	README_Fix_create_new_event.patch README_Fix_list_events.patch 
	README_Fix_notice_on_addressbook_creation.patch 
	README_Fix_share_right_editing.patch 
	README_Fix_the_share_params.patch 
	README_Kolab_extensions.patch README_Kolab_issue_2138.patch 
	README_Kolab_issue_2144.patch README_Share_caching.patch 
	README_SyncML.patch 
Log Message:
Horde patch update for the new RC1 release.

--- NEW FILE: HK-GW-framework_3.2_RC1-Fix_Prefs_for_Ingo.patch ---
This patch is required if you want to use Ingo with the Kolab server.

diff -r 56b552eb6b01 framework/Prefs/Prefs/kolab.php
--- a/framework/Prefs/Prefs/kolab.php	Wed Nov 28 17:00:34 2007 +0100
+++ b/framework/Prefs/Prefs/kolab.php	Wed Nov 28 17:04:21 2007 +0100
@@ -1,5 +1,6 @@
 <?php
 
+require_once 'Horde/Auth.php';
 require_once 'Horde/Prefs/ldap.php';
 require_once 'Horde/Kolab.php';
 
@@ -38,6 +39,8 @@ class Prefs_kolab extends Prefs_ldap {
                         'version' => '3',
                         'basedn' => $GLOBALS['conf']['kolab']['ldap']['basedn'],
                         'fetchdn' => true,
+                        'username' => Auth::getAuth(),
+                        'password' => Auth::getCredential('password'),
                         'searchdn' => $GLOBALS['conf']['kolab']['ldap']['phpdn'],
                         'searchpass' => $GLOBALS['conf']['kolab']['ldap']['phppw'],
                         'uid' => array('mail', 'uid'));

--- NEW FILE: HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch ---
Fixes editing contacts.

diff -r e2bcaaed2d6b turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Wed Nov 28 17:23:14 2007 +0100
+++ b/turba/lib/Driver/share.php	Wed Nov 28 17:24:17 2007 +0100
@@ -58,7 +58,7 @@ class Turba_Driver_share extends Turba_D
      */
     function getName()
     {
-        $share_parts = explode(':', $this->_share->getName());
+        $share_parts = explode(':', $this->_share->getId());
         return array_pop($share_parts);
     }
 

--- NEW FILE: HK-GW-turba_2.2_RC1-Fix_share_id_change.patch ---
This fixes a problem with the way the Kolab share driver handles ids.

diff -r 0ffb2574c923 turba/lib/Turba.php
--- a/turba/lib/Turba.php	Wed Nov 28 17:04:21 2007 +0100
+++ b/turba/lib/Turba.php	Wed Nov 28 17:23:14 2007 +0100
@@ -439,7 +439,7 @@ class Turba {
 
                         $source_config = $sources[$source];
                         $source_config['params']['share'] = &$share;
-                        $sources[$sourceKey] = $source_config;
+                        $sources[$share->getId()] = $source_config;
                     } else {
                         $notification->push($driver, 'horde.error');
                     }
@@ -564,7 +564,7 @@ class Turba {
         /* Add the new addressbook to the user's list of visible
          * address books. */
         $prefs = explode("\n", $GLOBALS['prefs']->getValue('addressbooks'));
-        if (array_search($share_id, $prefs) === false) {
+        if (array_search($share->getId(), $prefs) === false) {
             $GLOBALS['prefs']->setValue('addressbooks', $GLOBALS['prefs']->getValue('addressbooks') . "\n" . $share_id);
         }
         return $share;

--- NEW FILE: HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch ---
This is a temporary fix to mark the ldap addressbook as read-only. This should be solved with the Horde Perms package but this needs a new driver.

diff -r 449ef255c5ff turba/lib/Driver/ldap.php
--- a/turba/lib/Driver/ldap.php	Wed Nov 28 17:24:17 2007 +0100
+++ b/turba/lib/Driver/ldap.php	Wed Nov 28 17:26:17 2007 +0100
@@ -53,6 +53,9 @@ class Turba_Driver_ldap extends Turba_Dr
         }
         if (empty($params['deref'])) {
             $params['deref'] = LDAP_DEREF_NEVER;
+        }
+        if (empty($params['read_only'])) {
+            $params['read_only'] = false;
         }
 
         parent::Turba_Driver($params);
@@ -749,4 +752,25 @@ class Turba_Driver_ldap extends Turba_Dr
         return $dn;
     }
 
+    /**
+     * Checks if the current user has the requested permission
+     * on this source.
+     *
+     * @param integer $perm  The permission to check for.
+     *
+     * @return boolean  true if user has permission, false otherwise.
+     */
+     function hasPermission($perm)
+    {
+        if ($this->_params['read_only'] === false) {
+            return parent::hasPermission($perm);
+        } else {
+            switch ($perm) {
+                case PERMS_EDIT: return false;
+                case PERMS_DELETE: return false;
+                default: return parent::hasPermission($perm);
+            }
+        }
+    }
+
 }

--- HK-GW-framework_3.2_ALPHA-Fix_Prefs_for_Ingo.patch DELETED ---

--- HK-GW-framework_3.2_ALPHA-Fix_annotation_use.patch DELETED ---

--- HK-GW-framework_3.2_ALPHA-Fix_contact_XML.patch DELETED ---

--- HK-GW-framework_3.2_ALPHA-Fix_the_share_params.patch DELETED ---

--- HK-GW-framework_3.2_ALPHA-Kolab_extensions.patch DELETED ---

--- HK-GW-framework_3.2_ALPHA-Kolab_issue_2138.patch DELETED ---

--- HK-GW-framework_3.2_ALPHA-Kolab_issue_2144.patch DELETED ---

--- HK-GW-framework_3.2_ALPHA-Share_caching.patch DELETED ---

--- HK-GW-global_3.2_ALPHA-SyncML.patch DELETED ---

--- HK-GW-horde_3.2_ALPHA-Deleting_categories.patch DELETED ---

--- HK-GW-kronolith_2.2-Fix_create_new_event.patch DELETED ---

--- HK-GW-kronolith_2.2-Fix_share_right_editing.patch DELETED ---

--- HK-GW-kronolith_2.2_ALPHA-Kolab_issue_2138.patch DELETED ---

--- HK-GW-mnemo_2.2_ALPHA-Edit_share_rights.patch DELETED ---

--- HK-GW-nag_2.2_ALPHA-Fix_share_right_editing.patch DELETED ---

--- HK-GW-turba_2.2-Changes_after_ALPHA.patch DELETED ---

--- HK-GW-turba_2.2-Fix_address_book_deletion_1.patch DELETED ---

--- HK-GW-turba_2.2-Fix_editing_contacts.patch DELETED ---

--- HK-GW-turba_2.2-Fix_notice_on_addressbook_creation.patch DELETED ---

--- HK-GW-turba_2.2-Fix_share_id_change.patch DELETED ---

--- HK-GW-turba_2.2-Ldap_read_only_fix.patch DELETED ---

--- HK-UV-kronolith_2.2-Fix_list_events.patch DELETED ---

--- README_Changes_after_ALPHA.patch DELETED ---

--- README_Deleting_categories.patch DELETED ---

--- README_Edit_share_rights.patch DELETED ---

--- README_Fix_address_book_deletion_1.patch DELETED ---

--- README_Fix_annotation_use.patch DELETED ---

--- README_Fix_contact_XML.patch DELETED ---

--- README_Fix_create_new_event.patch DELETED ---

--- README_Fix_list_events.patch DELETED ---

--- README_Fix_notice_on_addressbook_creation.patch DELETED ---

--- README_Fix_share_right_editing.patch DELETED ---

--- README_Fix_the_share_params.patch DELETED ---

--- README_Kolab_extensions.patch DELETED ---

--- README_Kolab_issue_2138.patch DELETED ---

--- README_Kolab_issue_2144.patch DELETED ---

--- README_Share_caching.patch DELETED ---

--- README_SyncML.patch DELETED ---



