gunnar: server/patches/horde-webmail/1.1.2 horde-webmail-1.1.2_kolab_openpkg.patch, NONE, 1.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.1.2
In directory doto:/tmp/cvs-serv8109

Added Files:
	horde-webmail-1.1.2_kolab_openpkg.patch 
Log Message:
Fixed ingo configuration issue, added some patches for the IMP<->turba interaction (storing addresses, gpg keys).

--- NEW FILE: horde-webmail-1.1.2_kolab_openpkg.patch ---
diff -r 6ddf0bc2c0f1 config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/conf.php	Thu Aug 21 06:55:39 2008 +0200
@@ -0,0 +1,115 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.69 2008/06/05 09:05:50 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
[...2761 lines suppressed...]
+        }
+        if (isset($attributes['given-name'])) {
+            $attributes['full-name'] = $attributes['given-name'] . ' ' . $attributes['full-name'];
+        }
+
         $group = false;
         if (isset($attributes['__type']) && $attributes['__type'] == 'Group') {
             $group = true;
diff -r 6ddf0bc2c0f1 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Thu Aug 21 06:52:30 2008 +0200
+++ b/turba/lib/Driver/share.php	Thu Aug 21 06:55:39 2008 +0200
@@ -145,7 +145,7 @@
     function _deleteAll($sourceName = null)
     {
         if (is_null($sourceName)) {
-            $sourceName = $this->getContactOwner();
+            $sourceName = $this->getName();
         }
         return $this->_driver->_deleteAll($sourceName);
     }