gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.15, 1.16
cvs at kolab.org
cvs at kolab.org
Mon Nov 17 16:58:48 CET 2008
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv21859/patches/horde-webmail/1.2.0
Modified Files:
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Completed kolab/issue3241 and kolab/issue3243.
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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- horde-webmail-1.2.0_kolab_openpkg.patch 17 Nov 2008 15:29:39 -0000 1.15
+++ horde-webmail-1.2.0_kolab_openpkg.patch 17 Nov 2008 15:58:46 -0000 1.16
@@ -1,7 +1,7 @@
diff -r 0a5153c325f0 config/conf.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php Mon Nov 17 16:28:52 2008 +0100
-@@ -0,0 +1,118 @@
++++ b/config/conf.php Mon Nov 17 16:55:24 2008 +0100
+@@ -0,0 +1,119 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.78 2008/09/12 10:01:41 jan Exp $
@@ -48,6 +48,7 @@
+$conf['log']['enabled'] = true;
+$conf['log_accesskeys'] = false;
+$conf['prefs']['driver'] = 'file';
++$conf['prefs']['params']['directory'] = dirname(__FILE__) . '/../storage/';
+$conf['alarms']['params']['driverconfig'] = 'horde';
+$conf['alarms']['params']['ttl'] = 300;
+$conf['alarms']['driver'] = 'sql';
@@ -122,7 +123,7 @@
+}
diff -r 0a5153c325f0 config/conf.xml
--- a/config/conf.xml Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/conf.xml Mon Nov 17 16:28:52 2008 +0100
++++ b/config/conf.xml Mon Nov 17 16:55:24 2008 +0100
@@ -1803,8 +1803,8 @@
<configinteger name="sieveport" desc="Sieve port:">2000</configinteger>
<configstring name="maildomain" desc="Default
@@ -160,7 +161,7 @@
</configswitch>
diff -r 0a5153c325f0 config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/config/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,37 @@
+<?php
+/* Add additional admins here */
@@ -201,7 +202,7 @@
+?>
diff -r 0a5153c325f0 config/prefs.php
--- a/config/prefs.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/prefs.php Mon Nov 17 16:28:52 2008 +0100
++++ b/config/prefs.php Mon Nov 17 16:55:24 2008 +0100
@@ -357,7 +357,7 @@
// UI theme
@@ -213,7 +214,7 @@
'type' => 'select',
diff -r 0a5153c325f0 imp/config/conf.php
--- a/imp/config/conf.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/imp/config/conf.php Mon Nov 17 16:28:52 2008 +0100
++++ b/imp/config/conf.php Mon Nov 17 16:55:24 2008 +0100
@@ -1,7 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -246,7 +247,7 @@
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 0a5153c325f0 imp/config/servers.php
--- a/imp/config/servers.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/imp/config/servers.php Mon Nov 17 16:28:52 2008 +0100
++++ b/imp/config/servers.php Mon Nov 17 16:55:24 2008 +0100
@@ -226,10 +226,30 @@
/* Example configurations: */
@@ -287,7 +288,7 @@
+}
diff -r 0a5153c325f0 imp/lib/MIME/Viewer/itip.php
--- a/imp/lib/MIME/Viewer/itip.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/imp/lib/MIME/Viewer/itip.php Mon Nov 17 16:28:52 2008 +0100
++++ b/imp/lib/MIME/Viewer/itip.php Mon Nov 17 16:55:24 2008 +0100
@@ -86,6 +86,29 @@
// Get the iCalendar file components.
@@ -340,7 +341,7 @@
} else {
diff -r 0a5153c325f0 ingo/config/backends.php
--- a/ingo/config/backends.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/ingo/config/backends.php Mon Nov 17 16:28:52 2008 +0100
++++ b/ingo/config/backends.php Mon Nov 17 16:55:24 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.
@@ -361,7 +362,7 @@
require_once 'Horde/Kolab.php';
diff -r 0a5153c325f0 ingo/config/conf.php
--- a/ingo/config/conf.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/ingo/config/conf.php Mon Nov 17 16:28:52 2008 +0100
++++ b/ingo/config/conf.php Mon Nov 17 16:55:24 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 $
@@ -374,7 +375,7 @@
$conf['rules']['userheader'] = true;
diff -r 0a5153c325f0 kronolith/attendees.php
--- a/kronolith/attendees.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/attendees.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/attendees.php Mon Nov 17 16:55:24 2008 +0100
@@ -178,6 +178,16 @@
$attendees = array();
$_SESSION['kronolith']['attendees'] = $attendees;
@@ -409,7 +410,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/edit.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/calendars/edit.php Mon Nov 17 16:55:24 2008 +0100
@@ -53,6 +53,10 @@
$vars->set('name', $calendar->get('name'));
@@ -423,7 +424,7 @@
require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r 0a5153c325f0 kronolith/config/conf.php
--- a/kronolith/config/conf.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/config/conf.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/config/conf.php Mon Nov 17 16:55:24 2008 +0100
@@ -1,16 +1,19 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -452,7 +453,7 @@
+}
diff -r 0a5153c325f0 kronolith/config/conf.xml
--- a/kronolith/config/conf.xml Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/config/conf.xml Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/config/conf.xml Mon Nov 17 16:55:24 2008 +0100
@@ -49,6 +49,12 @@
</configswitch>
</configsection>
@@ -468,7 +469,7 @@
<configboolean name="keywords" desc="Should keywords be loaded from
diff -r 0a5153c325f0 kronolith/config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/config/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/config/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,10 @@
+<?php
+/* Primary mail domain of your Kolab server */
@@ -482,7 +483,7 @@
+?>
diff -r 0a5153c325f0 kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/config/prefs.php.dist Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/config/prefs.php.dist Mon Nov 17 16:55:24 2008 +0100
@@ -457,6 +457,14 @@
'shared' => false,
'type' => 'implicit'
@@ -500,7 +501,7 @@
'locked' => false,
diff -r 0a5153c325f0 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Driver/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/lib/Driver/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -62,6 +62,7 @@
$this->_calendar = $calendar;
$this->_wrapper->reset();
@@ -534,7 +535,7 @@
*/
diff -r 0a5153c325f0 kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/FBView.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/lib/FBView.php Mon Nov 17 16:55:24 2008 +0100
@@ -87,7 +87,7 @@
$rows = '';
foreach ($this->_requiredMembers as $member) {
@@ -606,7 +607,7 @@
} else {
diff -r 0a5153c325f0 kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Forms/CreateCalendar.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/lib/Forms/CreateCalendar.php Mon Nov 17 16:55:24 2008 +0100
@@ -35,6 +35,9 @@
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -627,7 +628,7 @@
diff -r 0a5153c325f0 kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Forms/EditCalendar.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/lib/Forms/EditCalendar.php Mon Nov 17 16:55:24 2008 +0100
@@ -42,6 +42,9 @@
$this->addHidden('', 'c', 'text', true);
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -666,7 +667,7 @@
}
diff -r 0a5153c325f0 kronolith/lib/FreeBusy.php
--- a/kronolith/lib/FreeBusy.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/FreeBusy.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/lib/FreeBusy.php Mon Nov 17 16:55:24 2008 +0100
@@ -187,6 +187,9 @@
require_once 'HTTP/Request.php';
@@ -679,7 +680,7 @@
}
diff -r 0a5153c325f0 kronolith/lib/Storage/kolab.php
--- a/kronolith/lib/Storage/kolab.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Storage/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/lib/Storage/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -29,17 +29,24 @@
{
global $conf;
@@ -715,7 +716,7 @@
$options['timeout'] = 5;
diff -r 0a5153c325f0 kronolith/lib/api.php
--- a/kronolith/lib/api.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/api.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/lib/api.php Mon Nov 17 16:55:24 2008 +0100
@@ -694,6 +694,7 @@
function _kronolith_listBy($action, $timestamp, $calendar = null)
{
@@ -735,7 +736,7 @@
$histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar);
diff -r 0a5153c325f0 kronolith/perms.php
--- a/kronolith/perms.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/perms.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/perms.php Mon Nov 17 16:55:24 2008 +0100
@@ -14,6 +14,34 @@
@define('KRONOLITH_BASE', dirname(__FILE__));
require_once KRONOLITH_BASE . '/lib/base.php';
@@ -807,7 +808,7 @@
$notification->push($result, 'horde.error');
diff -r 0a5153c325f0 kronolith/savedattlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/savedattlist.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
@@ -888,7 +889,7 @@
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/templates/attendees/attendees.inc Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/templates/attendees/attendees.inc Mon Nov 17 16:55:24 2008 +0100
@@ -92,6 +92,8 @@
<div>
<input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -900,13 +901,13 @@
diff -r 0a5153c325f0 kronolith/templates/fbview/busyblock.html
--- a/kronolith/templates/fbview/busyblock.html Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/templates/fbview/busyblock.html Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/templates/fbview/busyblock.html Mon Nov 17 16:55:24 2008 +0100
@@ -1,1 +1,1 @@
-<td><div class="busy" style="left:<tag:left />;width:<tag:width />;"> </div></td>
+<td><div class="busy" onclick="<tag:evclick />" style="cursor:pointer;left:<tag:left />;width:<tag:width />;" title="<tag:label />"> </div></td>
diff -r 0a5153c325f0 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 Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/templates/javascript/open_savedattlist_win.js Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
@@ -946,7 +947,7 @@
+<?php endif; ?>
diff -r 0a5153c325f0 kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/templates/perms/perms.inc Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/templates/perms/perms.inc Mon Nov 17 16:55:24 2008 +0100
@@ -330,6 +330,61 @@
<td> </td>
</tr>
@@ -1011,7 +1012,7 @@
</tr>
diff -r 0a5153c325f0 kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/savedattlist/savedattlist.inc Mon Nov 17 16:28:52 2008 +0100
++++ b/kronolith/templates/savedattlist/savedattlist.inc Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
@@ -1083,7 +1084,7 @@
+</form>
diff -r 0a5153c325f0 lib/Horde/Auth/kolab.php
--- a/lib/Horde/Auth/kolab.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Auth/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Auth/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -1,6 +1,4 @@
<?php
-
@@ -1368,7 +1369,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Kolab.php
--- a/lib/Horde/Kolab.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -711,7 +711,7 @@
* Returns an array of application-specific constants, that are used in
* a generic manner throughout the library.
@@ -1461,7 +1462,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Kolab/Deprecated.php
--- a/lib/Horde/Kolab/Deprecated.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Deprecated.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Deprecated.php Mon Nov 17 16:55:24 2008 +0100
@@ -180,7 +180,7 @@
/** We need the DOM library for xml handling (PHP4/5). */
require_once 'Horde/DOM.php';
@@ -1493,7 +1494,7 @@
if (is_a($result, 'PEAR_Error')) {
diff -r 0a5153c325f0 lib/Horde/Kolab/Format/XML.php
--- a/lib/Horde/Kolab/Format/XML.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML.php Mon Nov 17 16:55:24 2008 +0100
@@ -117,11 +117,18 @@
var $_version = 1;
@@ -1603,7 +1604,7 @@
$primary_category = '';
diff -r 0a5153c325f0 lib/Horde/Kolab/Format/XML/hprefs.php
--- a/lib/Horde/Kolab/Format/XML/hprefs.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML/hprefs.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML/hprefs.php Mon Nov 17 16:55:24 2008 +0100
@@ -46,6 +46,10 @@
/** Specific preferences fields, in kolab format specification order
*/
@@ -1666,7 +1667,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,139 @@
+<?php
+/**
@@ -1809,7 +1810,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP/cclient.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/cclient.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/cclient.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,778 @@
+<?php
+/**
@@ -2591,7 +2592,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP/pear.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/pear.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/pear.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,520 @@
+<?php
+/**
@@ -3115,7 +3116,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP/test.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/test.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/test.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,728 @@
+<?php
+/**
@@ -3847,7 +3848,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server.php
--- a/lib/Horde/Kolab/Server.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server.php Mon Nov 17 16:55:24 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 $
@@ -4527,7 +4528,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object.php
--- a/lib/Horde/Kolab/Server/Object.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object.php Mon Nov 17 16:55:24 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 $
@@ -5080,7 +5081,7 @@
};
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/address.php
--- a/lib/Horde/Kolab/Server/Object/address.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/address.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/address.php Mon Nov 17 16:55:24 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 $
@@ -5164,7 +5165,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/administrator.php
--- a/lib/Horde/Kolab/Server/Object/administrator.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/administrator.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/administrator.php Mon Nov 17 16:55:24 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 $
@@ -5223,7 +5224,7 @@
+}
diff -r 0a5153c325f0 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 Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/adminrole.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,157 @@
+<?php
+/**
@@ -5384,7 +5385,7 @@
+}
diff -r 0a5153c325f0 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 Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/distlist.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,52 @@
+<?php
+/**
@@ -5440,7 +5441,7 @@
+};
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/domainmaintainer.php
--- a/lib/Horde/Kolab/Server/Object/domainmaintainer.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Mon Nov 17 16:55:24 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 $
@@ -5575,7 +5576,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/group.php
--- a/lib/Horde/Kolab/Server/Object/group.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/group.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/group.php Mon Nov 17 16:55:24 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 $
@@ -5812,7 +5813,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/maintainer.php
--- a/lib/Horde/Kolab/Server/Object/maintainer.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/maintainer.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/maintainer.php Mon Nov 17 16:55:24 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 $
@@ -5872,7 +5873,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/server.php
--- a/lib/Horde/Kolab/Server/Object/server.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/server.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/server.php Mon Nov 17 16:55:24 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 $
@@ -5911,7 +5912,7 @@
\ No newline at end of file
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/sharedfolder.php
--- a/lib/Horde/Kolab/Server/Object/sharedfolder.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Mon Nov 17 16:55:24 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 $
@@ -6016,7 +6017,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/user.php
--- a/lib/Horde/Kolab/Server/Object/user.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/user.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/user.php Mon Nov 17 16:55:24 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 $
@@ -6327,7 +6328,7 @@
};
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/ldap.php
--- a/lib/Horde/Kolab/Server/ldap.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/ldap.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/ldap.php Mon Nov 17 16:55:24 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 $
@@ -7045,7 +7046,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Kolab/Server/test.php
--- a/lib/Horde/Kolab/Server/test.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/test.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/test.php Mon Nov 17 16:55:24 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 $
@@ -7586,7 +7587,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Kolab/Session.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Session.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Session.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,328 @@
+<?php
+/**
@@ -7918,7 +7919,7 @@
+}
diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/Cache.php
--- a/lib/Horde/Kolab/Storage/Cache.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Cache.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Cache.php Mon Nov 17 16:55:24 2008 +0100
@@ -187,6 +187,31 @@
}
@@ -7953,7 +7954,7 @@
function reset()
diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/Data.php
--- a/lib/Horde/Kolab/Storage/Data.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Data.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Data.php Mon Nov 17 16:55:24 2008 +0100
@@ -46,14 +46,6 @@
* @var string
*/
@@ -8110,7 +8111,7 @@
* @return array The object ids.
diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Folder.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Folder.php Mon Nov 17 16:55:24 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 $
@@ -10684,7 +10685,7 @@
-}
diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/List.php
--- a/lib/Horde/Kolab/Storage/List.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/List.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/List.php Mon Nov 17 16:55:24 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 $
@@ -11125,7 +11126,7 @@
-}
diff -r 0a5153c325f0 lib/Horde/Prefs/kolab.php
--- a/lib/Horde/Prefs/kolab.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Prefs/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Prefs/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -1,5 +1,6 @@
<?php
@@ -11145,7 +11146,7 @@
}
diff -r 0a5153c325f0 lib/Horde/Prefs/kolab_imap.php
--- a/lib/Horde/Prefs/kolab_imap.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Prefs/kolab_imap.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Prefs/kolab_imap.php Mon Nov 17 16:55:24 2008 +0100
@@ -163,7 +163,7 @@
}
@@ -11166,7 +11167,7 @@
$result = $this->_connection->_storage->save($object, $old_uid);
diff -r 0a5153c325f0 lib/Horde/Share/kolab.php
--- a/lib/Horde/Share/kolab.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Share/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/Share/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -525,6 +525,13 @@
$default = array('source' => 'kolab',
'default' => $this->get('default'),
@@ -11194,7 +11195,7 @@
$this->_data[$attribute] = $value;
diff -r 0a5153c325f0 lib/Horde/iCalendar.php
--- a/lib/Horde/iCalendar.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/iCalendar.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/Horde/iCalendar.php Mon Nov 17 16:55:24 2008 +0100
@@ -151,6 +151,41 @@
'value' => $value,
'values' => $values
@@ -11239,7 +11240,7 @@
diff -r 0a5153c325f0 lib/SyncML/Backend.php
--- a/lib/SyncML/Backend.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Backend.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/SyncML/Backend.php Mon Nov 17 16:55:24 2008 +0100
@@ -567,6 +567,24 @@
}
@@ -11267,7 +11268,7 @@
* For some types of authentications (notably auth:basic) the username
diff -r 0a5153c325f0 lib/SyncML/Backend/Horde.php
--- a/lib/SyncML/Backend/Horde.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Backend/Horde.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/SyncML/Backend/Horde.php Mon Nov 17 16:55:24 2008 +0100
@@ -204,6 +204,11 @@
__FILE__, __LINE__, PEAR_LOG_DEBUG);
continue;
@@ -11378,7 +11379,7 @@
diff -r 0a5153c325f0 lib/SyncML/Constants.php
--- a/lib/SyncML/Constants.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Constants.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/SyncML/Constants.php Mon Nov 17 16:55:24 2008 +0100
@@ -66,7 +66,7 @@
define('RESPONSE_PARTIAL_CONTENT', 206);
define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -11390,7 +11391,7 @@
define('RESPONSE_AUTHENTICATION_ACCEPTED', 212);
diff -r 0a5153c325f0 lib/SyncML/Device.php
--- a/lib/SyncML/Device.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Device.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/SyncML/Device.php Mon Nov 17 16:55:24 2008 +0100
@@ -159,12 +159,81 @@
SYNCML_LOGFILE_DATA,
"\nInput received from client ($contentType):\n$content\n");
@@ -11475,7 +11476,7 @@
* Converts the content from the backend to a format suitable for the
diff -r 0a5153c325f0 lib/SyncML/Sync.php
--- a/lib/SyncML/Sync.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Sync.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/SyncML/Sync.php Mon Nov 17 16:55:24 2008 +0100
@@ -283,7 +283,13 @@
}
} elseif ($item->elementType == 'Delete') {
@@ -11534,7 +11535,7 @@
diff -r 0a5153c325f0 lib/VFS/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/VFS/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/VFS/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,631 @@
+<?php
+
@@ -12169,7 +12170,7 @@
+}
diff -r 0a5153c325f0 lib/core.php
--- a/lib/core.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/core.php Mon Nov 17 16:28:52 2008 +0100
++++ b/lib/core.php Mon Nov 17 16:55:24 2008 +0100
@@ -31,6 +31,12 @@
* include_path, you must add an ini_set() call here to add their location to
* the include_path. */
@@ -12185,13 +12186,13 @@
include_once 'PEAR.php';
diff -r 0a5153c325f0 log/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess Mon Nov 17 16:28:52 2008 +0100
++++ b/log/.htaccess Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 0a5153c325f0 mnemo/config/conf.php
--- a/mnemo/config/conf.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/mnemo/config/conf.php Mon Nov 17 16:28:52 2008 +0100
++++ b/mnemo/config/conf.php Mon Nov 17 16:55:24 2008 +0100
@@ -1,9 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12206,7 +12207,7 @@
$conf['menu']['apps'] = array();
diff -r 0a5153c325f0 nag/config/conf.php
--- a/nag/config/conf.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/nag/config/conf.php Mon Nov 17 16:28:52 2008 +0100
++++ b/nag/config/conf.php Mon Nov 17 16:55:24 2008 +0100
@@ -1,9 +1,7 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12220,7 +12221,7 @@
$conf['menu']['apps'] = array();
diff -r 0a5153c325f0 nag/lib/Driver.php
--- a/nag/lib/Driver.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/nag/lib/Driver.php Mon Nov 17 16:28:52 2008 +0100
++++ b/nag/lib/Driver.php Mon Nov 17 16:55:24 2008 +0100
@@ -319,33 +319,40 @@
$new_task = $this->get($task->id);
@@ -12287,7 +12288,7 @@
diff -r 0a5153c325f0 pear/DB/sqlite.php
--- a/pear/DB/sqlite.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/pear/DB/sqlite.php Mon Nov 17 16:28:52 2008 +0100
++++ b/pear/DB/sqlite.php Mon Nov 17 16:55:24 2008 +0100
@@ -742,7 +742,7 @@
// PHP 5.2+ prepends the function name to $php_errormsg, so we need
@@ -12299,19 +12300,19 @@
$error_regexps = array(
diff -r 0a5153c325f0 storage/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess Mon Nov 17 16:28:52 2008 +0100
++++ b/storage/.htaccess Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 0a5153c325f0 tmp/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/tmp/.htaccess Mon Nov 17 16:28:52 2008 +0100
++++ b/tmp/.htaccess Mon Nov 17 16:55:24 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 0a5153c325f0 turba/config/attributes.php
--- a/turba/config/attributes.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/attributes.php Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/config/attributes.php Mon Nov 17 16:55:24 2008 +0100
@@ -356,6 +356,12 @@
);
@@ -12327,7 +12328,7 @@
'type' => 'text',
diff -r 0a5153c325f0 turba/config/attributes.php.dist
--- a/turba/config/attributes.php.dist Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/attributes.php.dist Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/config/attributes.php.dist Mon Nov 17 16:55:24 2008 +0100
@@ -402,6 +402,12 @@
// );
@@ -12343,7 +12344,7 @@
'type' => 'text',
diff -r 0a5153c325f0 turba/config/conf.php
--- a/turba/config/conf.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/conf.php Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/config/conf.php Mon Nov 17 16:55:24 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;
@@ -12357,7 +12358,7 @@
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 0a5153c325f0 turba/config/sources.php
--- a/turba/config/sources.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/sources.php Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/config/sources.php Mon Nov 17 16:55:24 2008 +0100
@@ -154,6 +154,8 @@
* Here are some example configurations:
*/
@@ -12622,7 +12623,7 @@
* read-only. The address book content is provided by the
diff -r 0a5153c325f0 turba/config/sources.php.dist
--- a/turba/config/sources.php.dist Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/sources.php.dist Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/config/sources.php.dist Mon Nov 17 16:55:24 2008 +0100
@@ -825,7 +825,9 @@
'cellPhone' => 'mobile',
'fax' => 'fax',
@@ -12654,7 +12655,7 @@
'homePostalCode', 'homeCountry', 'workStreet',
diff -r 0a5153c325f0 turba/lib/Driver.php
--- a/turba/lib/Driver.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver.php Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/lib/Driver.php Mon Nov 17 16:55:24 2008 +0100
@@ -1466,9 +1466,6 @@
$hash = array();
$attr = $vcard->getAllAttributes();
@@ -12667,7 +12668,7 @@
case 'FN':
diff -r 0a5153c325f0 turba/lib/Driver/kolab.php
--- a/turba/lib/Driver/kolab.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver/kolab.php Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/lib/Driver/kolab.php Mon Nov 17 16:55:24 2008 +0100
@@ -56,6 +56,7 @@
}
@@ -12763,7 +12764,7 @@
$result = $this->_store->save($attributes, $object_id);
diff -r 0a5153c325f0 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver/share.php Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/lib/Driver/share.php Mon Nov 17 16:55:24 2008 +0100
@@ -145,7 +145,7 @@
function _deleteAll($sourceName = null)
{
@@ -12775,7 +12776,7 @@
}
diff -r 0a5153c325f0 turba/lib/Object.php
--- a/turba/lib/Object.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Object.php Mon Nov 17 16:28:52 2008 +0100
++++ b/turba/lib/Object.php Mon Nov 17 16:55:24 2008 +0100
@@ -249,7 +249,10 @@
*/
function addFile($info)
More information about the commits
mailing list