gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.8, 1.9
cvs at kolab.org
cvs at kolab.org
Fri Nov 14 07:54:49 CET 2008
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv17982/patches/horde-webmail/1.2.0
Modified Files:
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Update the Horde patch with the fixes that recently went into the filter and free/busy systems. It should not really affect horde though.
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- horde-webmail-1.2.0_kolab_openpkg.patch 12 Nov 2008 11:27:13 -0000 1.8
+++ horde-webmail-1.2.0_kolab_openpkg.patch 14 Nov 2008 06:54:47 -0000 1.9
@@ -1,6 +1,6 @@
diff -r f832e54a827a config/conf.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php Wed Nov 12 12:26:48 2008 +0100
++++ b/config/conf.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,118 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -122,7 +122,7 @@
+}
diff -r f832e54a827a config/conf.xml
--- a/config/conf.xml Thu Oct 30 15:14:54 2008 +0100
-+++ b/config/conf.xml Wed Nov 12 12:26:48 2008 +0100
++++ b/config/conf.xml Fri Nov 14 07:53:22 2008 +0100
@@ -1803,8 +1803,8 @@
<configinteger name="sieveport" desc="Sieve port:">2000</configinteger>
<configstring name="maildomain" desc="Default
@@ -160,7 +160,7 @@
</configswitch>
diff -r f832e54a827a config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/config/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,37 @@
+<?php
+/* Add additional admins here */
@@ -201,7 +201,7 @@
+?>
diff -r f832e54a827a config/prefs.php
--- a/config/prefs.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/config/prefs.php Wed Nov 12 12:26:48 2008 +0100
++++ b/config/prefs.php Fri Nov 14 07:53:22 2008 +0100
@@ -357,7 +357,7 @@
// UI theme
@@ -213,7 +213,7 @@
'type' => 'select',
diff -r f832e54a827a imp/config/conf.php
--- a/imp/config/conf.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/imp/config/conf.php Wed Nov 12 12:26:48 2008 +0100
++++ b/imp/config/conf.php Fri Nov 14 07:53:22 2008 +0100
@@ -1,7 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -246,7 +246,7 @@
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r f832e54a827a imp/config/servers.php
--- a/imp/config/servers.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/imp/config/servers.php Wed Nov 12 12:26:48 2008 +0100
++++ b/imp/config/servers.php Fri Nov 14 07:53:22 2008 +0100
@@ -226,10 +226,30 @@
/* Example configurations: */
@@ -287,7 +287,7 @@
+}
diff -r f832e54a827a ingo/config/backends.php
--- a/ingo/config/backends.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/ingo/config/backends.php Wed Nov 12 12:26:48 2008 +0100
++++ b/ingo/config/backends.php Fri Nov 14 07:53:22 2008 +0100
@@ -40,6 +40,8 @@
* give them permissions to do so. If you want to enable this
* feature, you need to set this parameter to true.
@@ -308,7 +308,7 @@
require_once 'Horde/Kolab.php';
diff -r f832e54a827a ingo/config/conf.php
--- a/ingo/config/conf.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/ingo/config/conf.php Wed Nov 12 12:26:48 2008 +0100
++++ b/ingo/config/conf.php Fri Nov 14 07:53:22 2008 +0100
@@ -2,8 +2,7 @@
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: ingo/config/conf.xml,v 1.13.12.1 2007/12/20 14:05:46 jan Exp $
@@ -321,7 +321,7 @@
$conf['rules']['userheader'] = true;
diff -r f832e54a827a kronolith/attendees.php
--- a/kronolith/attendees.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/attendees.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/attendees.php Fri Nov 14 07:53:22 2008 +0100
@@ -178,6 +178,16 @@
$attendees = array();
$_SESSION['kronolith']['attendees'] = $attendees;
@@ -356,7 +356,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r f832e54a827a kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/calendars/edit.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/calendars/edit.php Fri Nov 14 07:53:22 2008 +0100
@@ -53,6 +53,10 @@
$vars->set('name', $calendar->get('name'));
@@ -370,7 +370,7 @@
require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r f832e54a827a kronolith/config/conf.php
--- a/kronolith/config/conf.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/config/conf.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/config/conf.php Fri Nov 14 07:53:22 2008 +0100
@@ -1,12 +1,11 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -398,7 +398,7 @@
+}
diff -r f832e54a827a kronolith/config/conf.xml
--- a/kronolith/config/conf.xml Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/config/conf.xml Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/config/conf.xml Fri Nov 14 07:53:22 2008 +0100
@@ -49,6 +49,12 @@
</configswitch>
</configsection>
@@ -414,7 +414,7 @@
<configboolean name="keywords" desc="Should keywords be loaded from
diff -r f832e54a827a kronolith/config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/config/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/config/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,10 @@
+<?php
+/* Primary mail domain of your Kolab server */
@@ -428,7 +428,7 @@
+?>
diff -r f832e54a827a kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/config/prefs.php.dist Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/config/prefs.php.dist Fri Nov 14 07:53:22 2008 +0100
@@ -457,6 +457,14 @@
'shared' => false,
'type' => 'implicit'
@@ -446,7 +446,7 @@
'locked' => false,
diff -r f832e54a827a kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/lib/Driver/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/lib/Driver/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -62,6 +62,7 @@
$this->_calendar = $calendar;
$this->_wrapper->reset();
@@ -480,7 +480,7 @@
*/
diff -r f832e54a827a kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/lib/FBView.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/lib/FBView.php Fri Nov 14 07:53:22 2008 +0100
@@ -87,7 +87,7 @@
$rows = '';
foreach ($this->_requiredMembers as $member) {
@@ -552,7 +552,7 @@
} else {
diff -r f832e54a827a kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/lib/Forms/CreateCalendar.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/lib/Forms/CreateCalendar.php Fri Nov 14 07:53:22 2008 +0100
@@ -35,6 +35,9 @@
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -573,7 +573,7 @@
diff -r f832e54a827a kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/lib/Forms/EditCalendar.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/lib/Forms/EditCalendar.php Fri Nov 14 07:53:22 2008 +0100
@@ -42,6 +42,9 @@
$this->addHidden('', 'c', 'text', true);
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -612,7 +612,7 @@
}
diff -r f832e54a827a kronolith/lib/FreeBusy.php
--- a/kronolith/lib/FreeBusy.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/lib/FreeBusy.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/lib/FreeBusy.php Fri Nov 14 07:53:22 2008 +0100
@@ -187,6 +187,9 @@
require_once 'HTTP/Request.php';
@@ -625,7 +625,7 @@
}
diff -r f832e54a827a kronolith/lib/Storage/kolab.php
--- a/kronolith/lib/Storage/kolab.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/lib/Storage/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/lib/Storage/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -29,17 +29,24 @@
{
global $conf;
@@ -661,7 +661,7 @@
$options['timeout'] = 5;
diff -r f832e54a827a kronolith/lib/api.php
--- a/kronolith/lib/api.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/lib/api.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/lib/api.php Fri Nov 14 07:53:22 2008 +0100
@@ -694,6 +694,7 @@
function _kronolith_listBy($action, $timestamp, $calendar = null)
{
@@ -681,7 +681,7 @@
$histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar);
diff -r f832e54a827a kronolith/perms.php
--- a/kronolith/perms.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/perms.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/perms.php Fri Nov 14 07:53:22 2008 +0100
@@ -14,6 +14,34 @@
@define('KRONOLITH_BASE', dirname(__FILE__));
require_once KRONOLITH_BASE . '/lib/base.php';
@@ -753,7 +753,7 @@
$notification->push($result, 'horde.error');
diff -r f832e54a827a kronolith/savedattlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/savedattlist.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
@@ -834,7 +834,7 @@
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r f832e54a827a kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/templates/attendees/attendees.inc Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/templates/attendees/attendees.inc Fri Nov 14 07:53:22 2008 +0100
@@ -92,6 +92,8 @@
<div>
<input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -846,7 +846,7 @@
diff -r f832e54a827a kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/javascript/open_savedattlist_win.js Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/templates/javascript/open_savedattlist_win.js Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
@@ -886,7 +886,7 @@
+<?php endif; ?>
diff -r f832e54a827a kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc Thu Oct 30 15:14:54 2008 +0100
-+++ b/kronolith/templates/perms/perms.inc Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/templates/perms/perms.inc Fri Nov 14 07:53:22 2008 +0100
@@ -330,6 +330,61 @@
<td> </td>
</tr>
@@ -951,7 +951,7 @@
</tr>
diff -r f832e54a827a kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/savedattlist/savedattlist.inc Wed Nov 12 12:26:48 2008 +0100
++++ b/kronolith/templates/savedattlist/savedattlist.inc Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
@@ -1023,7 +1023,7 @@
+</form>
diff -r f832e54a827a lib/Horde/Auth/kolab.php
--- a/lib/Horde/Auth/kolab.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Auth/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Auth/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -1,6 +1,4 @@
<?php
-
@@ -1308,7 +1308,7 @@
}
diff -r f832e54a827a lib/Horde/Kolab.php
--- a/lib/Horde/Kolab.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -711,7 +711,7 @@
* Returns an array of application-specific constants, that are used in
* a generic manner throughout the library.
@@ -1401,7 +1401,7 @@
}
diff -r f832e54a827a lib/Horde/Kolab/Deprecated.php
--- a/lib/Horde/Kolab/Deprecated.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Deprecated.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Deprecated.php Fri Nov 14 07:53:22 2008 +0100
@@ -180,7 +180,7 @@
/** We need the DOM library for xml handling (PHP4/5). */
require_once 'Horde/DOM.php';
@@ -1433,7 +1433,7 @@
if (is_a($result, 'PEAR_Error')) {
diff -r f832e54a827a lib/Horde/Kolab/Format/XML.php
--- a/lib/Horde/Kolab/Format/XML.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML.php Fri Nov 14 07:53:22 2008 +0100
@@ -117,11 +117,18 @@
var $_version = 1;
@@ -1543,7 +1543,7 @@
$primary_category = '';
diff -r f832e54a827a lib/Horde/Kolab/Format/XML/hprefs.php
--- a/lib/Horde/Kolab/Format/XML/hprefs.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML/hprefs.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML/hprefs.php Fri Nov 14 07:53:22 2008 +0100
@@ -46,6 +46,10 @@
/** Specific preferences fields, in kolab format specification order
*/
@@ -1606,7 +1606,7 @@
}
diff -r f832e54a827a lib/Horde/Kolab/IMAP.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/IMAP.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,139 @@
+<?php
+/**
@@ -1749,7 +1749,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/IMAP/cclient.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/cclient.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/cclient.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,778 @@
+<?php
+/**
@@ -2531,7 +2531,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/IMAP/pear.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/pear.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/pear.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,520 @@
+<?php
+/**
@@ -3055,7 +3055,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/IMAP/test.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/test.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/test.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,728 @@
+<?php
+/**
@@ -3787,7 +3787,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Server.php
--- a/lib/Horde/Kolab/Server.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server.php,v 1.2.2.3 2008/09/22 12:22:33 wrobel Exp $
@@ -4467,7 +4467,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object.php
--- a/lib/Horde/Kolab/Server/Object.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object.php Fri Nov 14 07:53:22 2008 +0100
@@ -5,7 +5,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php,v 1.2.2.3 2008/09/22 16:20:59 wrobel Exp $
@@ -5020,7 +5020,7 @@
};
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/address.php
--- a/lib/Horde/Kolab/Server/Object/address.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/address.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/address.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5104,7 +5104,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/administrator.php
--- a/lib/Horde/Kolab/Server/Object/administrator.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/administrator.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/administrator.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,8 +4,16 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5163,7 +5163,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/adminrole.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Server/Object/adminrole.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/adminrole.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,157 @@
+<?php
+/**
@@ -5324,7 +5324,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/distlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Server/Object/distlist.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/distlist.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,52 @@
+<?php
+/**
@@ -5380,7 +5380,7 @@
+};
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/domainmaintainer.php
--- a/lib/Horde/Kolab/Server/Object/domainmaintainer.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,8 +4,16 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5515,7 +5515,7 @@
}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/group.php
--- a/lib/Horde/Kolab/Server/Object/group.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/group.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/group.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5752,7 +5752,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/maintainer.php
--- a/lib/Horde/Kolab/Server/Object/maintainer.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/maintainer.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/maintainer.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,8 +4,16 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5812,7 +5812,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/server.php
--- a/lib/Horde/Kolab/Server/Object/server.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/server.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/server.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5851,7 +5851,7 @@
\ No newline at end of file
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/sharedfolder.php
--- a/lib/Horde/Kolab/Server/Object/sharedfolder.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5956,7 +5956,7 @@
}
diff -r f832e54a827a lib/Horde/Kolab/Server/Object/user.php
--- a/lib/Horde/Kolab/Server/Object/user.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/user.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/user.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php,v 1.2.2.3 2008/09/12 16:52:07 wrobel Exp $
@@ -6138,7 +6138,7 @@
}
/**
-@@ -64,19 +187,121 @@
+@@ -64,19 +187,124 @@
*
* This method is used to encapsulate multidomain support.
*
@@ -6163,6 +6163,9 @@
+ if (empty($server)) {
+ $server = $_SERVER['SERVER_NAME'];
+ }
++ if (isset($conf['kolab']['freebusy']['server'])) {
++ return $conf['kolab']['freebusy']['server'];
++ }
+ if (isset($conf['kolab']['server']['freebusy_url_format'])) {
+ return sprintf($conf['kolab']['server']['freebusy_url_format'],
+ $server);
@@ -6264,7 +6267,7 @@
};
diff -r f832e54a827a lib/Horde/Kolab/Server/ldap.php
--- a/lib/Horde/Kolab/Server/ldap.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/ldap.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/ldap.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.2.2.2 2008/08/01 07:56:19 wrobel Exp $
@@ -6641,7 +6644,7 @@
$i = 0;
foreach ($entries as $entry) {
$result[$i] = array();
-@@ -450,10 +591,12 @@
+@@ -450,15 +591,17 @@
if (in_array('cn=admin,cn=internal,' . $this->_base_dn, $groups)) {
return KOLAB_OBJECT_ADMINISTRATOR;
}
@@ -6656,6 +6659,12 @@
return KOLAB_OBJECT_DOMAINMAINTAINER;
}
}
+
+- if (strpos($dn, 'cn=internal') !== false) {
++ if (strpos($dn, 'cn=external') !== false) {
+ return KOLAB_OBJECT_ADDRESS;
+ }
+
@@ -472,10 +615,14 @@
*
* @return array|PEAR_Error An array of object classes.
@@ -6938,7 +6947,7 @@
+ return sprintf('cn=%s,%s', $id, $this->_base_dn);
+ }
+ case KOLAB_OBJECT_ADDRESS:
-+ return sprintf('cn=%s,cn=internal,%s', $id, $this->_base_dn);
++ return sprintf('cn=%s,cn=external,%s', $id, $this->_base_dn);
+ case KOLAB_OBJECT_SHAREDFOLDER:
+ case KOLAB_OBJECT_ADMINISTRATOR:
+ case KOLAB_OBJECT_MAINTAINER:
@@ -6976,7 +6985,7 @@
}
diff -r f832e54a827a lib/Horde/Kolab/Server/test.php
--- a/lib/Horde/Kolab/Server/test.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Server/test.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Server/test.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,7 +4,13 @@
*
* $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/test.php,v 1.2.2.2 2008/08/01 07:56:19 wrobel Exp $
@@ -7517,8 +7526,8 @@
}
diff -r f832e54a827a lib/Horde/Kolab/Session.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Session.php Wed Nov 12 12:26:48 2008 +0100
-@@ -0,0 +1,336 @@
++++ b/lib/Horde/Kolab/Session.php Fri Nov 14 07:53:22 2008 +0100
+@@ -0,0 +1,328 @@
+<?php
+/**
+ * @package Kolab_Server
@@ -7702,14 +7711,6 @@
+ }
+
+ $this->_imap_params['protocol'] = 'imap/notls/novalidate-cert';
-+
-+ if (!isset($this->freebusy_server)) {
-+ if (isset($conf['kolab']['freebusy']['server'])) {
-+ $this->freebusy_server = $conf['kolab']['freebusy']['server'];
-+ } else {
-+ $this->freebusy_server = 'https://localhost/freebusy';
-+ }
-+ }
+ }
+
+ /**
@@ -7857,7 +7858,7 @@
+}
diff -r f832e54a827a lib/Horde/Kolab/Storage/Cache.php
--- a/lib/Horde/Kolab/Storage/Cache.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Cache.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Cache.php Fri Nov 14 07:53:22 2008 +0100
@@ -187,6 +187,31 @@
}
@@ -7892,7 +7893,7 @@
function reset()
diff -r f832e54a827a lib/Horde/Kolab/Storage/Data.php
--- a/lib/Horde/Kolab/Storage/Data.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Data.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Data.php Fri Nov 14 07:53:22 2008 +0100
@@ -46,14 +46,6 @@
* @var string
*/
@@ -8049,7 +8050,7 @@
* @return array The object ids.
diff -r f832e54a827a lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Folder.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Folder.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,6 +4,9 @@
*
* $Horde: framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php,v 1.7.2.3 2008/09/25 14:44:03 wrobel Exp $
@@ -10641,7 +10642,7 @@
-}
diff -r f832e54a827a lib/Horde/Kolab/Storage/List.php
--- a/lib/Horde/Kolab/Storage/List.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/List.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Kolab/Storage/List.php Fri Nov 14 07:53:22 2008 +0100
@@ -4,9 +4,6 @@
*
* $Horde: framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php,v 1.3.2.2 2008/09/25 09:20:07 wrobel Exp $
@@ -11082,7 +11083,7 @@
-}
diff -r f832e54a827a lib/Horde/Prefs/kolab.php
--- a/lib/Horde/Prefs/kolab.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Prefs/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Prefs/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -1,5 +1,6 @@
<?php
@@ -11102,7 +11103,7 @@
}
diff -r f832e54a827a lib/Horde/Prefs/kolab_imap.php
--- a/lib/Horde/Prefs/kolab_imap.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Prefs/kolab_imap.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Prefs/kolab_imap.php Fri Nov 14 07:53:22 2008 +0100
@@ -163,7 +163,7 @@
}
@@ -11123,7 +11124,7 @@
$result = $this->_connection->_storage->save($object, $old_uid);
diff -r f832e54a827a lib/Horde/Share/kolab.php
--- a/lib/Horde/Share/kolab.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/Share/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/Share/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -525,6 +525,13 @@
$default = array('source' => 'kolab',
'default' => $this->get('default'),
@@ -11140,7 +11141,7 @@
}
diff -r f832e54a827a lib/Horde/iCalendar.php
--- a/lib/Horde/iCalendar.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/Horde/iCalendar.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/Horde/iCalendar.php Fri Nov 14 07:53:22 2008 +0100
@@ -151,6 +151,41 @@
'value' => $value,
'values' => $values
@@ -11185,7 +11186,7 @@
diff -r f832e54a827a lib/SyncML/Backend.php
--- a/lib/SyncML/Backend.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/SyncML/Backend.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/SyncML/Backend.php Fri Nov 14 07:53:22 2008 +0100
@@ -567,6 +567,24 @@
}
@@ -11213,7 +11214,7 @@
* For some types of authentications (notably auth:basic) the username
diff -r f832e54a827a lib/SyncML/Backend/Horde.php
--- a/lib/SyncML/Backend/Horde.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/SyncML/Backend/Horde.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/SyncML/Backend/Horde.php Fri Nov 14 07:53:22 2008 +0100
@@ -204,6 +204,11 @@
__FILE__, __LINE__, PEAR_LOG_DEBUG);
continue;
@@ -11324,7 +11325,7 @@
diff -r f832e54a827a lib/SyncML/Constants.php
--- a/lib/SyncML/Constants.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/SyncML/Constants.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/SyncML/Constants.php Fri Nov 14 07:53:22 2008 +0100
@@ -66,7 +66,7 @@
define('RESPONSE_PARTIAL_CONTENT', 206);
define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -11336,7 +11337,7 @@
define('RESPONSE_AUTHENTICATION_ACCEPTED', 212);
diff -r f832e54a827a lib/SyncML/Device.php
--- a/lib/SyncML/Device.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/SyncML/Device.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/SyncML/Device.php Fri Nov 14 07:53:22 2008 +0100
@@ -159,12 +159,81 @@
SYNCML_LOGFILE_DATA,
"\nInput received from client ($contentType):\n$content\n");
@@ -11421,7 +11422,7 @@
* Converts the content from the backend to a format suitable for the
diff -r f832e54a827a lib/SyncML/Sync.php
--- a/lib/SyncML/Sync.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/SyncML/Sync.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/SyncML/Sync.php Fri Nov 14 07:53:22 2008 +0100
@@ -283,7 +283,13 @@
}
} elseif ($item->elementType == 'Delete') {
@@ -11480,7 +11481,7 @@
diff -r f832e54a827a lib/VFS/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/VFS/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/VFS/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,631 @@
+<?php
+
@@ -12115,7 +12116,7 @@
+}
diff -r f832e54a827a lib/core.php
--- a/lib/core.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/lib/core.php Wed Nov 12 12:26:48 2008 +0100
++++ b/lib/core.php Fri Nov 14 07:53:22 2008 +0100
@@ -31,6 +31,12 @@
* include_path, you must add an ini_set() call here to add their location to
* the include_path. */
@@ -12131,13 +12132,13 @@
include_once 'PEAR.php';
diff -r f832e54a827a log/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess Wed Nov 12 12:26:48 2008 +0100
++++ b/log/.htaccess Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r f832e54a827a mnemo/config/conf.php
--- a/mnemo/config/conf.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/mnemo/config/conf.php Wed Nov 12 12:26:48 2008 +0100
++++ b/mnemo/config/conf.php Fri Nov 14 07:53:22 2008 +0100
@@ -1,9 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12152,7 +12153,7 @@
$conf['menu']['apps'] = array();
diff -r f832e54a827a nag/config/conf.php
--- a/nag/config/conf.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/nag/config/conf.php Wed Nov 12 12:26:48 2008 +0100
++++ b/nag/config/conf.php Fri Nov 14 07:53:22 2008 +0100
@@ -1,9 +1,7 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12166,7 +12167,7 @@
$conf['menu']['apps'] = array();
diff -r f832e54a827a nag/lib/Driver.php
--- a/nag/lib/Driver.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/nag/lib/Driver.php Wed Nov 12 12:26:48 2008 +0100
++++ b/nag/lib/Driver.php Fri Nov 14 07:53:22 2008 +0100
@@ -319,33 +319,40 @@
$new_task = $this->get($task->id);
@@ -12233,19 +12234,19 @@
diff -r f832e54a827a storage/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess Wed Nov 12 12:26:48 2008 +0100
++++ b/storage/.htaccess Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r f832e54a827a tmp/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/tmp/.htaccess Wed Nov 12 12:26:48 2008 +0100
++++ b/tmp/.htaccess Fri Nov 14 07:53:22 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r f832e54a827a turba/config/attributes.php
--- a/turba/config/attributes.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/config/attributes.php Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/config/attributes.php Fri Nov 14 07:53:22 2008 +0100
@@ -356,6 +356,12 @@
);
@@ -12261,7 +12262,7 @@
'type' => 'text',
diff -r f832e54a827a turba/config/attributes.php.dist
--- a/turba/config/attributes.php.dist Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/config/attributes.php.dist Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/config/attributes.php.dist Fri Nov 14 07:53:22 2008 +0100
@@ -402,6 +402,12 @@
// );
@@ -12277,7 +12278,7 @@
'type' => 'text',
diff -r f832e54a827a turba/config/conf.php
--- a/turba/config/conf.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/config/conf.php Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/config/conf.php Fri Nov 14 07:53:22 2008 +0100
@@ -3,8 +3,8 @@
// $Horde: turba/config/conf.xml,v 1.6.2.6 2008/06/25 15:52:54 jan Exp $
$conf['menu']['import_export'] = true;
@@ -12291,7 +12292,7 @@
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r f832e54a827a turba/config/sources.php
--- a/turba/config/sources.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/config/sources.php Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/config/sources.php Fri Nov 14 07:53:22 2008 +0100
@@ -154,6 +154,8 @@
* Here are some example configurations:
*/
@@ -12556,7 +12557,7 @@
* read-only. The address book content is provided by the
diff -r f832e54a827a turba/config/sources.php.dist
--- a/turba/config/sources.php.dist Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/config/sources.php.dist Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/config/sources.php.dist Fri Nov 14 07:53:22 2008 +0100
@@ -825,7 +825,9 @@
'cellPhone' => 'mobile',
'fax' => 'fax',
@@ -12588,7 +12589,7 @@
'homePostalCode', 'homeCountry', 'workStreet',
diff -r f832e54a827a turba/lib/Driver.php
--- a/turba/lib/Driver.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/lib/Driver.php Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/lib/Driver.php Fri Nov 14 07:53:22 2008 +0100
@@ -1466,9 +1466,6 @@
$hash = array();
$attr = $vcard->getAllAttributes();
@@ -12601,7 +12602,7 @@
case 'FN':
diff -r f832e54a827a turba/lib/Driver/kolab.php
--- a/turba/lib/Driver/kolab.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/lib/Driver/kolab.php Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/lib/Driver/kolab.php Fri Nov 14 07:53:22 2008 +0100
@@ -56,6 +56,7 @@
}
@@ -12697,7 +12698,7 @@
$result = $this->_store->save($attributes, $object_id);
diff -r f832e54a827a turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/lib/Driver/share.php Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/lib/Driver/share.php Fri Nov 14 07:53:22 2008 +0100
@@ -145,7 +145,7 @@
function _deleteAll($sourceName = null)
{
@@ -12709,7 +12710,7 @@
}
diff -r f832e54a827a turba/lib/Object.php
--- a/turba/lib/Object.php Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/lib/Object.php Wed Nov 12 12:26:48 2008 +0100
++++ b/turba/lib/Object.php Fri Nov 14 07:53:22 2008 +0100
@@ -249,7 +249,10 @@
*/
function addFile($info)
More information about the commits
mailing list