gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_fbview_openpkg.patch, 1.3, 1.4 horde-webmail-1.2.0_kolab_openpkg.patch, 1.10, 1.11
cvs at kolab.org
cvs at kolab.org
Fri Nov 14 11:41:23 CET 2008
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv23129/patches/horde-webmail/1.2.0
Modified Files:
horde-webmail-1.2.0_kolab_fbview_openpkg.patch
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Fbview specific patches and and some fixes to the xfb access concept.
Index: horde-webmail-1.2.0_kolab_fbview_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_fbview_openpkg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-webmail-1.2.0_kolab_fbview_openpkg.patch 14 Nov 2008 07:50:56 -0000 1.3
+++ horde-webmail-1.2.0_kolab_fbview_openpkg.patch 14 Nov 2008 10:41:20 -0000 1.4
@@ -1,6 +1,6 @@
diff -r 0a5153c325f0 config/conf.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php Fri Nov 14 08:50:29 2008 +0100
++++ b/config/conf.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,118 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -122,7 +122,7 @@
+}
diff -r 0a5153c325f0 config/conf.xml
--- a/config/conf.xml Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/conf.xml Fri Nov 14 08:50:29 2008 +0100
++++ b/config/conf.xml Fri Nov 14 11:40:24 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 0a5153c325f0 config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php Fri Nov 14 08:50:29 2008 +0100
++++ b/config/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,37 @@
+<?php
+/* Add additional admins here */
@@ -201,7 +201,7 @@
+?>
diff -r 0a5153c325f0 config/prefs.php
--- a/config/prefs.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/prefs.php Fri Nov 14 08:50:29 2008 +0100
++++ b/config/prefs.php Fri Nov 14 11:40:24 2008 +0100
@@ -357,7 +357,7 @@
// UI theme
@@ -231,7 +231,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/imp/config/conf.php Fri Nov 14 11:40:24 2008 +0100
@@ -1,7 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -264,7 +264,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/imp/config/servers.php Fri Nov 14 11:40:24 2008 +0100
@@ -226,10 +226,30 @@
/* Example configurations: */
@@ -305,7 +305,7 @@
+}
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/ingo/config/backends.php Fri Nov 14 11:40: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.
@@ -326,7 +326,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/ingo/config/conf.php Fri Nov 14 11:40: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 $
@@ -339,7 +339,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/attendees.php Fri Nov 14 11:40:24 2008 +0100
@@ -178,6 +178,16 @@
$attendees = array();
$_SESSION['kronolith']['attendees'] = $attendees;
@@ -375,7 +375,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/calendars/create.php
--- a/kronolith/calendars/create.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/create.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/calendars/create.php Fri Nov 14 11:40:24 2008 +0100
@@ -39,6 +39,6 @@
$title = $form->getTitle();
@@ -386,7 +386,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/calendars/delete.php
--- a/kronolith/calendars/delete.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/delete.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/calendars/delete.php Fri Nov 14 11:40:24 2008 +0100
@@ -56,6 +56,6 @@
$title = $form->getTitle();
@@ -397,7 +397,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/calendars/edit.php Fri Nov 14 11:40:24 2008 +0100
@@ -53,8 +53,12 @@
$vars->set('name', $calendar->get('name'));
@@ -414,7 +414,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/calendars/index.php
--- a/kronolith/calendars/index.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/index.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/calendars/index.php Fri Nov 14 11:40:24 2008 +0100
@@ -73,6 +73,6 @@
Horde::addScriptFile('tables.js', 'kronolith', true);
$title = _("Manage Calendars");
@@ -425,7 +425,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/calendars/remote_edit.php
--- a/kronolith/calendars/remote_edit.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/remote_edit.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/calendars/remote_edit.php Fri Nov 14 11:40:24 2008 +0100
@@ -68,6 +68,6 @@
$vars->set('password', $password);
$title = $form->getTitle();
@@ -436,7 +436,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/calendars/remote_subscribe.php
--- a/kronolith/calendars/remote_subscribe.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/remote_subscribe.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/calendars/remote_subscribe.php Fri Nov 14 11:40:24 2008 +0100
@@ -39,6 +39,6 @@
$title = $form->getTitle();
@@ -447,7 +447,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 0a5153c325f0 kronolith/calendars/remote_unsubscribe.php
--- a/kronolith/calendars/remote_unsubscribe.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/remote_unsubscribe.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/calendars/remote_unsubscribe.php Fri Nov 14 11:40:24 2008 +0100
@@ -56,6 +56,6 @@
$vars->set('url', $calendar['url']);
$title = $form->getTitle();
@@ -458,7 +458,7 @@
require $registry->get('templates', 'horde') . '/common-footer.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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/config/conf.php Fri Nov 14 11:40:24 2008 +0100
@@ -1,12 +1,11 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -489,7 +489,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/config/conf.xml Fri Nov 14 11:40:24 2008 +0100
@@ -49,6 +49,12 @@
</configswitch>
</configsection>
@@ -505,7 +505,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/config/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,10 @@
+<?php
+/* Primary mail domain of your Kolab server */
@@ -519,7 +519,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/config/prefs.php.dist Fri Nov 14 11:40:24 2008 +0100
@@ -89,7 +89,7 @@
// default view
@@ -546,7 +546,7 @@
'locked' => false,
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/lib/FBView.php Fri Nov 14 11:40:24 2008 +0100
@@ -87,7 +87,7 @@
$rows = '';
foreach ($this->_requiredMembers as $member) {
@@ -618,7 +618,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/lib/Forms/CreateCalendar.php Fri Nov 14 11:40:24 2008 +0100
@@ -35,6 +35,9 @@
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -639,7 +639,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/lib/Forms/EditCalendar.php Fri Nov 14 11:40:24 2008 +0100
@@ -42,6 +42,9 @@
$this->addHidden('', 'c', 'text', true);
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -678,7 +678,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/lib/FreeBusy.php Fri Nov 14 11:40:24 2008 +0100
@@ -187,6 +187,9 @@
require_once 'HTTP/Request.php';
@@ -691,7 +691,7 @@
}
diff -r 0a5153c325f0 kronolith/lib/Kronolith.php
--- a/kronolith/lib/Kronolith.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Kronolith.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/lib/Kronolith.php Fri Nov 14 11:40:24 2008 +0100
@@ -2098,6 +2098,33 @@
}
@@ -728,7 +728,7 @@
function _sortEventStartTime($a, $b)
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/lib/Storage/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -29,17 +29,24 @@
{
global $conf;
@@ -764,7 +764,7 @@
$options['timeout'] = 5;
diff -r 0a5153c325f0 kronolith/perms.php
--- a/kronolith/perms.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/perms.php Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/perms.php Fri Nov 14 11:40:24 2008 +0100
@@ -14,6 +14,34 @@
@define('KRONOLITH_BASE', dirname(__FILE__));
require_once KRONOLITH_BASE . '/lib/base.php';
@@ -836,7 +836,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/savedattlist.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
@@ -917,7 +917,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/templates/attendees/attendees.inc Fri Nov 14 11:40:24 2008 +0100
@@ -92,6 +92,8 @@
<div>
<input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -929,7 +929,7 @@
diff -r 0a5153c325f0 kronolith/templates/fbview-menu.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/fbview-menu.inc Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/templates/fbview-menu.inc Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,4 @@
+<div id="menu">
+ <?php echo Kronolith::getFbviewMenu('string') ?>
@@ -937,7 +937,7 @@
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/templates/javascript/open_savedattlist_win.js Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
@@ -977,7 +977,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/templates/perms/perms.inc Fri Nov 14 11:40:24 2008 +0100
@@ -330,6 +330,61 @@
<td> </td>
</tr>
@@ -1015,7 +1015,7 @@
+ <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+ <select id="fb_names_new" name="fb_names[||new]">
+ <option value=""><?php echo _("Select a user to add:") ?></option>
-+ <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
++ <?php foreach ($userList as $user) { if (!isset($fbperms[$user])) { ?>
+ <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+ <?php } } ?>
+ </select>
@@ -1042,7 +1042,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/kronolith/templates/savedattlist/savedattlist.inc Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
@@ -1114,7 +1114,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Auth/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -1,6 +1,4 @@
<?php
-
@@ -1399,7 +1399,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -711,7 +711,7 @@
* Returns an array of application-specific constants, that are used in
* a generic manner throughout the library.
@@ -1492,7 +1492,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Deprecated.php Fri Nov 14 11:40:24 2008 +0100
@@ -180,7 +180,7 @@
/** We need the DOM library for xml handling (PHP4/5). */
require_once 'Horde/DOM.php';
@@ -1524,7 +1524,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML.php Fri Nov 14 11:40:24 2008 +0100
@@ -117,11 +117,18 @@
var $_version = 1;
@@ -1634,7 +1634,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML/hprefs.php Fri Nov 14 11:40:24 2008 +0100
@@ -46,6 +46,10 @@
/** Specific preferences fields, in kolab format specification order
*/
@@ -1697,7 +1697,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/IMAP.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,139 @@
+<?php
+/**
@@ -1840,7 +1840,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/cclient.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,778 @@
+<?php
+/**
@@ -2622,7 +2622,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/pear.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,520 @@
+<?php
+/**
@@ -3146,7 +3146,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/test.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,728 @@
+<?php
+/**
@@ -3878,7 +3878,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server.php Fri Nov 14 11:40: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 $
@@ -4558,7 +4558,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object.php Fri Nov 14 11:40: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 $
@@ -5111,7 +5111,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/address.php Fri Nov 14 11:40: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 $
@@ -5195,7 +5195,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/administrator.php Fri Nov 14 11:40: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 $
@@ -5254,7 +5254,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/adminrole.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,157 @@
+<?php
+/**
@@ -5415,7 +5415,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/distlist.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,52 @@
+<?php
+/**
@@ -5471,7 +5471,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Fri Nov 14 11:40: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 $
@@ -5606,7 +5606,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/group.php Fri Nov 14 11:40: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 $
@@ -5843,7 +5843,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/maintainer.php Fri Nov 14 11:40: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 $
@@ -5903,7 +5903,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/server.php Fri Nov 14 11:40: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 $
@@ -5942,7 +5942,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Fri Nov 14 11:40: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 $
@@ -6047,7 +6047,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/user.php Fri Nov 14 11:40: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 $
@@ -6358,7 +6358,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/ldap.php Fri Nov 14 11:40: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 $
@@ -7076,7 +7076,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Server/test.php Fri Nov 14 11:40: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 $
@@ -7617,7 +7617,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Session.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,328 @@
+<?php
+/**
@@ -7949,7 +7949,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Cache.php Fri Nov 14 11:40:24 2008 +0100
@@ -187,6 +187,31 @@
}
@@ -7984,7 +7984,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Data.php Fri Nov 14 11:40:24 2008 +0100
@@ -46,14 +46,6 @@
* @var string
*/
@@ -8141,7 +8141,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Folder.php Fri Nov 14 11:40: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 $
@@ -8959,7 +8959,7 @@
return $result;
}
-@@ -928,26 +1156,136 @@
+@@ -928,26 +1156,102 @@
*/
function getStatus()
{
@@ -9064,44 +9064,10 @@
+ $url, $http->getResponseCode()));
+ }
+ return true;
-+// } elseif ($attribute == 'params') {
-+// $type = $this->getType();
-+// if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
-+// $params = @unserialize($value);
-+// if (isset($params['fbrelevance'])) {
-+// $result = $this->setFbrelevance($params['fbrelevance']);
-+// if (is_a($result, 'PEAR_Error')) {
-+// return $result;
-+// }
-+// unset($params['fbrelevance']);
-+// }
-+// if (isset($params['xfbaccess'])) {
-+// $result = $this->setXfbaccess($params['xfbaccess']);
-+// if (is_a($result, 'PEAR_Error')) {
-+// return $result;
-+// }
-+// unset($params['xfbaccess']);
-+// }
-+
-+// if (empty($params)) {
-+// continue;
-+// }
-+
-+// $value = @serialize($params);
-+// }
-+
-+// $imap = &$this->_shareOb->getImap();
-+// // setAnnotation apparently does not suppoort UTF-8 nor any special characters
-+// $store = base64_encode($value);
-+// $entry = HORDE_ANNOT_SHARE_ATTR . $attribute;
-+// $result = $imap->setAnnotation($entry, array('value.shared' => $store), $this->_folder);
-+// if (is_a($result, 'PEAR_Error')) {
-+// return $result;
-+// }
}
/**
-@@ -1033,8 +1371,10 @@
+@@ -1033,8 +1337,10 @@
{
global $conf;
@@ -9114,7 +9080,7 @@
}
if (!empty($conf['kolab']['imap']['no_acl'])) {
-@@ -1043,7 +1383,7 @@
+@@ -1043,7 +1349,7 @@
return $acl;
}
@@ -9123,7 +9089,7 @@
/*
* Check if the getPerm comes from the owner in this case we
-@@ -1056,8 +1396,8 @@
+@@ -1056,8 +1362,8 @@
if (!is_a($acl, 'PEAR_Error')) {
return $acl;
}
@@ -9134,7 +9100,7 @@
if (is_a($my_rights, 'PEAR_Error')) {
return $my_rights;
}
-@@ -1080,15 +1420,29 @@
+@@ -1080,15 +1386,29 @@
{
global $conf;
@@ -9167,7 +9133,7 @@
}
/**
-@@ -1102,15 +1456,29 @@
+@@ -1102,15 +1422,29 @@
{
global $conf;
@@ -9200,7 +9166,7 @@
}
-@@ -1120,11 +1488,11 @@
+@@ -1120,11 +1454,11 @@
*
* @return array|PEAR_Error The anotations of this folder.
*/
@@ -9214,7 +9180,7 @@
/**
* Get an annotation value of this folder.
-@@ -1138,19 +1506,21 @@
+@@ -1138,19 +1472,21 @@
global $conf;
if (empty($conf['kolab']['imap']['no_annotations'])) {
@@ -9241,7 +9207,7 @@
$this->name, $data->getMessage()),
__FILE__, __LINE__, PEAR_LOG_ERR);
return '';
-@@ -1173,20 +1543,22 @@
+@@ -1173,20 +1509,22 @@
function _setAnnotation($key, $value)
{
if (empty($conf['kolab']['imap']['no_annotations'])) {
@@ -9271,7 +9237,7 @@
$this->name, $data->getMessage()),
__FILE__, __LINE__, PEAR_LOG_ERR);
$data = array();
-@@ -1198,4 +1570,93 @@
+@@ -1198,4 +1536,85 @@
$data['uid'] = 'KOLAB_FOLDER_CONFIGURATION';
return $this->_annotation_data->save($data, $uid);
}
@@ -9285,14 +9251,11 @@
+ */
+ function getFbrelevance()
+ {
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
-+
-+ $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
-+ if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
++ $result = $this->getKolabAttribute('incidences-for')
++ if (is_a($result, 'PEAR_Error') || empty($result)) {
+ return KOLAB_FBRELEVANCE_ADMINS;
+ }
-+ switch ($annotation) {
++ switch ($result) {
+ case 'admins':
+ return KOLAB_FBRELEVANCE_ADMINS;
+ case 'readers':
@@ -9327,9 +9290,8 @@
+ $value = 'admins';
+ }
+
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
-+ return $imap->setAnnotation($entry, array('value.shared' => $value), $this->_folder);
++ return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'incidences-for',
++ $value);
+ }
+
+ /**
@@ -9340,14 +9302,11 @@
+ */
+ function getXfbaccess()
+ {
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
-+
-+ $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
-+ if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
++ $result = $this->getKolabAttribute('pxfb-readable-for')
++ if (is_a($result, 'PEAR_Error') || empty($result)) {
+ return array();
+ }
-+ return explode(' ', $annotation);
++ return explode(' ', $result);
+ }
+
+ /**
@@ -9360,9 +9319,8 @@
+ */
+ function setXfbaccess($access)
+ {
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
-+ return $imap->setAnnotation($entry, array('value.shared' => join(' ', $access)), $this->_folder);
++ return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
++ $access);
+ }
}
diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/IMAP.php
@@ -10733,7 +10691,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Kolab/Storage/List.php Fri Nov 14 11:40: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 $
@@ -11172,9 +11130,29 @@
- $session->overwrite('kolab_session', $this, false);
- }
-}
+diff -r 0a5153c325f0 lib/Horde/Prefs.php
+--- a/lib/Horde/Prefs.php Fri Nov 14 08:35:22 2008 +0100
++++ b/lib/Horde/Prefs.php Fri Nov 14 11:40:24 2008 +0100
+@@ -320,6 +320,16 @@
+ */
+ function getValue($pref, $convert = true)
+ {
++ if ($pref == 'show_sidebar') {
++ return false;
++ }
++ if ($pref == 'initial_application') {
++ return 'kronolith';
++ }
++ if ($pref == 'defaultview') {
++ return 'attendees';
++ }
++
+ static $charset;
+ if (!isset($charset)) {
+ $charset = NLS::getCharset();
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Prefs/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -1,5 +1,6 @@
<?php
@@ -11194,7 +11172,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Prefs/kolab_imap.php Fri Nov 14 11:40:24 2008 +0100
@@ -163,7 +163,7 @@
}
@@ -11215,7 +11193,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/Share/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -525,6 +525,13 @@
$default = array('source' => 'kolab',
'default' => $this->get('default'),
@@ -11232,7 +11210,7 @@
}
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/Horde/iCalendar.php Fri Nov 14 11:40:24 2008 +0100
@@ -151,6 +151,41 @@
'value' => $value,
'values' => $values
@@ -11277,7 +11255,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/SyncML/Backend.php Fri Nov 14 11:40:24 2008 +0100
@@ -567,6 +567,24 @@
}
@@ -11305,7 +11283,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/SyncML/Backend/Horde.php Fri Nov 14 11:40:24 2008 +0100
@@ -204,6 +204,11 @@
__FILE__, __LINE__, PEAR_LOG_DEBUG);
continue;
@@ -11416,7 +11394,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/SyncML/Constants.php Fri Nov 14 11:40:24 2008 +0100
@@ -66,7 +66,7 @@
define('RESPONSE_PARTIAL_CONTENT', 206);
define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -11428,7 +11406,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/SyncML/Device.php Fri Nov 14 11:40:24 2008 +0100
@@ -159,12 +159,81 @@
SYNCML_LOGFILE_DATA,
"\nInput received from client ($contentType):\n$content\n");
@@ -11513,7 +11491,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/SyncML/Sync.php Fri Nov 14 11:40:24 2008 +0100
@@ -283,7 +283,13 @@
}
} elseif ($item->elementType == 'Delete') {
@@ -11572,7 +11550,7 @@
diff -r 0a5153c325f0 lib/VFS/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/VFS/kolab.php Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/VFS/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -0,0 +1,631 @@
+<?php
+
@@ -12207,7 +12185,7 @@
+}
diff -r 0a5153c325f0 lib/core.php
--- a/lib/core.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/core.php Fri Nov 14 08:50:29 2008 +0100
++++ b/lib/core.php Fri Nov 14 11:40: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. */
@@ -12223,13 +12201,13 @@
include_once 'PEAR.php';
diff -r 0a5153c325f0 log/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess Fri Nov 14 08:50:29 2008 +0100
++++ b/log/.htaccess Fri Nov 14 11:40: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 Fri Nov 14 08:50:29 2008 +0100
++++ b/mnemo/config/conf.php Fri Nov 14 11:40:24 2008 +0100
@@ -1,9 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12244,7 +12222,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/nag/config/conf.php Fri Nov 14 11:40:24 2008 +0100
@@ -1,9 +1,7 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12258,7 +12236,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/nag/lib/Driver.php Fri Nov 14 11:40:24 2008 +0100
@@ -319,33 +319,40 @@
$new_task = $this->get($task->id);
@@ -12325,19 +12303,19 @@
diff -r 0a5153c325f0 storage/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess Fri Nov 14 08:50:29 2008 +0100
++++ b/storage/.htaccess Fri Nov 14 11:40: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 Fri Nov 14 08:50:29 2008 +0100
++++ b/tmp/.htaccess Fri Nov 14 11:40: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 Fri Nov 14 08:50:29 2008 +0100
++++ b/turba/config/attributes.php Fri Nov 14 11:40:24 2008 +0100
@@ -356,6 +356,12 @@
);
@@ -12353,7 +12331,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/turba/config/attributes.php.dist Fri Nov 14 11:40:24 2008 +0100
@@ -402,6 +402,12 @@
// );
@@ -12369,7 +12347,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/turba/config/conf.php Fri Nov 14 11:40: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;
@@ -12383,7 +12361,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/turba/config/sources.php Fri Nov 14 11:40:24 2008 +0100
@@ -154,6 +154,8 @@
* Here are some example configurations:
*/
@@ -12648,7 +12626,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 Fri Nov 14 08:50:29 2008 +0100
++++ b/turba/config/sources.php.dist Fri Nov 14 11:40:24 2008 +0100
@@ -825,7 +825,9 @@
'cellPhone' => 'mobile',
'fax' => 'fax',
@@ -12680,7 +12658,7 @@
'homePostalCode', 'homeCountry', 'workStreet',
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/turba/lib/Driver/kolab.php Fri Nov 14 11:40:24 2008 +0100
@@ -751,6 +751,14 @@
if (isset($contact['email'])) {
unset($contact['email']);
@@ -12768,7 +12746,7 @@
$result = $this->_store->save($attributes, $object_id);
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 Fri Nov 14 08:50:29 2008 +0100
++++ b/turba/lib/Object.php Fri Nov 14 11:40:24 2008 +0100
@@ -249,7 +249,10 @@
*/
function addFile($info)
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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- horde-webmail-1.2.0_kolab_openpkg.patch 14 Nov 2008 07:50:57 -0000 1.10
+++ horde-webmail-1.2.0_kolab_openpkg.patch 14 Nov 2008 10:41:20 -0000 1.11
@@ -1,6 +1,6 @@
diff -r 0a5153c325f0 config/conf.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php Fri Nov 14 08:37:52 2008 +0100
++++ b/config/conf.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,118 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -122,7 +122,7 @@
+}
diff -r 0a5153c325f0 config/conf.xml
--- a/config/conf.xml Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/conf.xml Fri Nov 14 08:37:52 2008 +0100
++++ b/config/conf.xml Fri Nov 14 11:34:43 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 0a5153c325f0 config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php Fri Nov 14 08:37:52 2008 +0100
++++ b/config/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,37 @@
+<?php
+/* Add additional admins here */
@@ -201,7 +201,7 @@
+?>
diff -r 0a5153c325f0 config/prefs.php
--- a/config/prefs.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/prefs.php Fri Nov 14 08:37:52 2008 +0100
++++ b/config/prefs.php Fri Nov 14 11:34:43 2008 +0100
@@ -357,7 +357,7 @@
// UI theme
@@ -213,7 +213,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/imp/config/conf.php Fri Nov 14 11:34:43 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 0a5153c325f0 imp/config/servers.php
--- a/imp/config/servers.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/imp/config/servers.php Fri Nov 14 08:37:52 2008 +0100
++++ b/imp/config/servers.php Fri Nov 14 11:34:43 2008 +0100
@@ -226,10 +226,30 @@
/* Example configurations: */
@@ -287,7 +287,7 @@
+}
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 Fri Nov 14 08:37:52 2008 +0100
++++ b/ingo/config/backends.php Fri Nov 14 11:34:43 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 0a5153c325f0 ingo/config/conf.php
--- a/ingo/config/conf.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/ingo/config/conf.php Fri Nov 14 08:37:52 2008 +0100
++++ b/ingo/config/conf.php Fri Nov 14 11:34:43 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 0a5153c325f0 kronolith/attendees.php
--- a/kronolith/attendees.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/attendees.php Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/attendees.php Fri Nov 14 11:34:43 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 0a5153c325f0 kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/edit.php Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/calendars/edit.php Fri Nov 14 11:34:43 2008 +0100
@@ -53,6 +53,10 @@
$vars->set('name', $calendar->get('name'));
@@ -370,7 +370,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/config/conf.php Fri Nov 14 11:34:43 2008 +0100
@@ -1,12 +1,11 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -398,7 +398,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/config/conf.xml Fri Nov 14 11:34:43 2008 +0100
@@ -49,6 +49,12 @@
</configswitch>
</configsection>
@@ -414,7 +414,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/config/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,10 @@
+<?php
+/* Primary mail domain of your Kolab server */
@@ -428,7 +428,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/config/prefs.php.dist Fri Nov 14 11:34:43 2008 +0100
@@ -457,6 +457,14 @@
'shared' => false,
'type' => 'implicit'
@@ -446,7 +446,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/lib/Driver/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -62,6 +62,7 @@
$this->_calendar = $calendar;
$this->_wrapper->reset();
@@ -480,7 +480,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/lib/FBView.php Fri Nov 14 11:34:43 2008 +0100
@@ -87,7 +87,7 @@
$rows = '';
foreach ($this->_requiredMembers as $member) {
@@ -552,7 +552,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/lib/Forms/CreateCalendar.php Fri Nov 14 11:34:43 2008 +0100
@@ -35,6 +35,9 @@
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -573,7 +573,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/lib/Forms/EditCalendar.php Fri Nov 14 11:34:43 2008 +0100
@@ -42,6 +42,9 @@
$this->addHidden('', 'c', 'text', true);
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -612,7 +612,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/lib/FreeBusy.php Fri Nov 14 11:34:43 2008 +0100
@@ -187,6 +187,9 @@
require_once 'HTTP/Request.php';
@@ -625,7 +625,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/lib/Storage/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -29,17 +29,24 @@
{
global $conf;
@@ -661,7 +661,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/lib/api.php Fri Nov 14 11:34:43 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 0a5153c325f0 kronolith/perms.php
--- a/kronolith/perms.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/perms.php Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/perms.php Fri Nov 14 11:34:43 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 0a5153c325f0 kronolith/savedattlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/savedattlist.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
@@ -834,7 +834,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/templates/attendees/attendees.inc Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/templates/javascript/open_savedattlist_win.js Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/templates/perms/perms.inc Fri Nov 14 11:34:43 2008 +0100
@@ -330,6 +330,61 @@
<td> </td>
</tr>
@@ -924,7 +924,7 @@
+ <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+ <select id="fb_names_new" name="fb_names[||new]">
+ <option value=""><?php echo _("Select a user to add:") ?></option>
-+ <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
++ <?php foreach ($userList as $user) { if (!isset($fbperms[$user])) { ?>
+ <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+ <?php } } ?>
+ </select>
@@ -951,7 +951,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/kronolith/templates/savedattlist/savedattlist.inc Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
@@ -1023,7 +1023,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Auth/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -1,6 +1,4 @@
<?php
-
@@ -1308,7 +1308,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Deprecated.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML.php Fri Nov 14 11:34:43 2008 +0100
@@ -117,11 +117,18 @@
var $_version = 1;
@@ -1543,7 +1543,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML/hprefs.php Fri Nov 14 11:34:43 2008 +0100
@@ -46,6 +46,10 @@
/** Specific preferences fields, in kolab format specification order
*/
@@ -1606,7 +1606,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,139 @@
+<?php
+/**
@@ -1749,7 +1749,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/cclient.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,778 @@
+<?php
+/**
@@ -2531,7 +2531,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/pear.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,520 @@
+<?php
+/**
@@ -3055,7 +3055,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/test.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,728 @@
+<?php
+/**
@@ -3787,7 +3787,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/address.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/administrator.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/adminrole.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,157 @@
+<?php
+/**
@@ -5324,7 +5324,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/distlist.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,52 @@
+<?php
+/**
@@ -5380,7 +5380,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/group.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/maintainer.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/server.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Fri Nov 14 11:34:43 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 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/user.php Fri Nov 14 11:34:43 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 $
@@ -6267,7 +6267,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/ldap.php Fri Nov 14 11:34:43 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 $
@@ -6985,7 +6985,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Server/test.php Fri Nov 14 11:34:43 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 $
@@ -7526,7 +7526,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Session.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,328 @@
+<?php
+/**
@@ -7858,7 +7858,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Cache.php Fri Nov 14 11:34:43 2008 +0100
@@ -187,6 +187,31 @@
}
@@ -7893,7 +7893,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Data.php Fri Nov 14 11:34:43 2008 +0100
@@ -46,14 +46,6 @@
* @var string
*/
@@ -8050,7 +8050,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Folder.php Fri Nov 14 11:34:43 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 $
@@ -8868,7 +8868,7 @@
return $result;
}
-@@ -928,26 +1156,136 @@
+@@ -928,26 +1156,102 @@
*/
function getStatus()
{
@@ -8973,44 +8973,10 @@
+ $url, $http->getResponseCode()));
+ }
+ return true;
-+// } elseif ($attribute == 'params') {
-+// $type = $this->getType();
-+// if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
-+// $params = @unserialize($value);
-+// if (isset($params['fbrelevance'])) {
-+// $result = $this->setFbrelevance($params['fbrelevance']);
-+// if (is_a($result, 'PEAR_Error')) {
-+// return $result;
-+// }
-+// unset($params['fbrelevance']);
-+// }
-+// if (isset($params['xfbaccess'])) {
-+// $result = $this->setXfbaccess($params['xfbaccess']);
-+// if (is_a($result, 'PEAR_Error')) {
-+// return $result;
-+// }
-+// unset($params['xfbaccess']);
-+// }
-+
-+// if (empty($params)) {
-+// continue;
-+// }
-+
-+// $value = @serialize($params);
-+// }
-+
-+// $imap = &$this->_shareOb->getImap();
-+// // setAnnotation apparently does not suppoort UTF-8 nor any special characters
-+// $store = base64_encode($value);
-+// $entry = HORDE_ANNOT_SHARE_ATTR . $attribute;
-+// $result = $imap->setAnnotation($entry, array('value.shared' => $store), $this->_folder);
-+// if (is_a($result, 'PEAR_Error')) {
-+// return $result;
-+// }
}
/**
-@@ -1033,8 +1371,10 @@
+@@ -1033,8 +1337,10 @@
{
global $conf;
@@ -9023,7 +8989,7 @@
}
if (!empty($conf['kolab']['imap']['no_acl'])) {
-@@ -1043,7 +1383,7 @@
+@@ -1043,7 +1349,7 @@
return $acl;
}
@@ -9032,7 +8998,7 @@
/*
* Check if the getPerm comes from the owner in this case we
-@@ -1056,8 +1396,8 @@
+@@ -1056,8 +1362,8 @@
if (!is_a($acl, 'PEAR_Error')) {
return $acl;
}
@@ -9043,7 +9009,7 @@
if (is_a($my_rights, 'PEAR_Error')) {
return $my_rights;
}
-@@ -1080,15 +1420,29 @@
+@@ -1080,15 +1386,29 @@
{
global $conf;
@@ -9076,7 +9042,7 @@
}
/**
-@@ -1102,15 +1456,29 @@
+@@ -1102,15 +1422,29 @@
{
global $conf;
@@ -9109,7 +9075,7 @@
}
-@@ -1120,11 +1488,11 @@
+@@ -1120,11 +1454,11 @@
*
* @return array|PEAR_Error The anotations of this folder.
*/
@@ -9123,7 +9089,7 @@
/**
* Get an annotation value of this folder.
-@@ -1138,19 +1506,21 @@
+@@ -1138,19 +1472,21 @@
global $conf;
if (empty($conf['kolab']['imap']['no_annotations'])) {
@@ -9150,7 +9116,7 @@
$this->name, $data->getMessage()),
__FILE__, __LINE__, PEAR_LOG_ERR);
return '';
-@@ -1173,20 +1543,22 @@
+@@ -1173,20 +1509,22 @@
function _setAnnotation($key, $value)
{
if (empty($conf['kolab']['imap']['no_annotations'])) {
@@ -9180,7 +9146,7 @@
$this->name, $data->getMessage()),
__FILE__, __LINE__, PEAR_LOG_ERR);
$data = array();
-@@ -1198,4 +1570,93 @@
+@@ -1198,4 +1536,85 @@
$data['uid'] = 'KOLAB_FOLDER_CONFIGURATION';
return $this->_annotation_data->save($data, $uid);
}
@@ -9194,14 +9160,11 @@
+ */
+ function getFbrelevance()
+ {
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
-+
-+ $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
-+ if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
++ $result = $this->getKolabAttribute('incidences-for')
++ if (is_a($result, 'PEAR_Error') || empty($result)) {
+ return KOLAB_FBRELEVANCE_ADMINS;
+ }
-+ switch ($annotation) {
++ switch ($result) {
+ case 'admins':
+ return KOLAB_FBRELEVANCE_ADMINS;
+ case 'readers':
@@ -9236,9 +9199,8 @@
+ $value = 'admins';
+ }
+
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
-+ return $imap->setAnnotation($entry, array('value.shared' => $value), $this->_folder);
++ return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'incidences-for',
++ $value);
+ }
+
+ /**
@@ -9249,14 +9211,11 @@
+ */
+ function getXfbaccess()
+ {
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
-+
-+ $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
-+ if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
++ $result = $this->getKolabAttribute('pxfb-readable-for')
++ if (is_a($result, 'PEAR_Error') || empty($result)) {
+ return array();
+ }
-+ return explode(' ', $annotation);
++ return explode(' ', $result);
+ }
+
+ /**
@@ -9269,9 +9228,8 @@
+ */
+ function setXfbaccess($access)
+ {
-+ $imap = &$this->_shareOb->getImap();
-+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
-+ return $imap->setAnnotation($entry, array('value.shared' => join(' ', $access)), $this->_folder);
++ return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
++ $access);
+ }
}
diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/IMAP.php
@@ -10642,7 +10600,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Kolab/Storage/List.php Fri Nov 14 11:34:43 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 $
@@ -11083,7 +11041,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Prefs/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -1,5 +1,6 @@
<?php
@@ -11103,7 +11061,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Prefs/kolab_imap.php Fri Nov 14 11:34:43 2008 +0100
@@ -163,7 +163,7 @@
}
@@ -11124,7 +11082,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/Share/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -525,6 +525,13 @@
$default = array('source' => 'kolab',
'default' => $this->get('default'),
@@ -11141,7 +11099,7 @@
}
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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/Horde/iCalendar.php Fri Nov 14 11:34:43 2008 +0100
@@ -151,6 +151,41 @@
'value' => $value,
'values' => $values
@@ -11186,7 +11144,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/SyncML/Backend.php Fri Nov 14 11:34:43 2008 +0100
@@ -567,6 +567,24 @@
}
@@ -11214,7 +11172,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/SyncML/Backend/Horde.php Fri Nov 14 11:34:43 2008 +0100
@@ -204,6 +204,11 @@
__FILE__, __LINE__, PEAR_LOG_DEBUG);
continue;
@@ -11325,7 +11283,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/SyncML/Constants.php Fri Nov 14 11:34:43 2008 +0100
@@ -66,7 +66,7 @@
define('RESPONSE_PARTIAL_CONTENT', 206);
define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -11337,7 +11295,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/SyncML/Device.php Fri Nov 14 11:34:43 2008 +0100
@@ -159,12 +159,81 @@
SYNCML_LOGFILE_DATA,
"\nInput received from client ($contentType):\n$content\n");
@@ -11422,7 +11380,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/SyncML/Sync.php Fri Nov 14 11:34:43 2008 +0100
@@ -283,7 +283,13 @@
}
} elseif ($item->elementType == 'Delete') {
@@ -11481,7 +11439,7 @@
diff -r 0a5153c325f0 lib/VFS/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/VFS/kolab.php Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/VFS/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -0,0 +1,631 @@
+<?php
+
@@ -12116,7 +12074,7 @@
+}
diff -r 0a5153c325f0 lib/core.php
--- a/lib/core.php Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/core.php Fri Nov 14 08:37:52 2008 +0100
++++ b/lib/core.php Fri Nov 14 11:34:43 2008 +0100
@@ -31,6 +31,12 @@
* include_path, you must add an ini_set() call here to add their location to
* the include_path. */
@@ -12132,13 +12090,13 @@
include_once 'PEAR.php';
diff -r 0a5153c325f0 log/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess Fri Nov 14 08:37:52 2008 +0100
++++ b/log/.htaccess Fri Nov 14 11:34:43 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/mnemo/config/conf.php Fri Nov 14 11:34:43 2008 +0100
@@ -1,9 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12153,7 +12111,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/nag/config/conf.php Fri Nov 14 11:34:43 2008 +0100
@@ -1,9 +1,7 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12167,7 +12125,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/nag/lib/Driver.php Fri Nov 14 11:34:43 2008 +0100
@@ -319,33 +319,40 @@
$new_task = $this->get($task->id);
@@ -12234,19 +12192,19 @@
diff -r 0a5153c325f0 storage/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess Fri Nov 14 08:37:52 2008 +0100
++++ b/storage/.htaccess Fri Nov 14 11:34:43 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/tmp/.htaccess Fri Nov 14 11:34:43 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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/config/attributes.php Fri Nov 14 11:34:43 2008 +0100
@@ -356,6 +356,12 @@
);
@@ -12262,7 +12220,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/config/attributes.php.dist Fri Nov 14 11:34:43 2008 +0100
@@ -402,6 +402,12 @@
// );
@@ -12278,7 +12236,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/config/conf.php Fri Nov 14 11:34:43 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;
@@ -12292,7 +12250,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/config/sources.php Fri Nov 14 11:34:43 2008 +0100
@@ -154,6 +154,8 @@
* Here are some example configurations:
*/
@@ -12557,7 +12515,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/config/sources.php.dist Fri Nov 14 11:34:43 2008 +0100
@@ -825,7 +825,9 @@
'cellPhone' => 'mobile',
'fax' => 'fax',
@@ -12589,7 +12547,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/lib/Driver.php Fri Nov 14 11:34:43 2008 +0100
@@ -1466,9 +1466,6 @@
$hash = array();
$attr = $vcard->getAllAttributes();
@@ -12602,7 +12560,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/lib/Driver/kolab.php Fri Nov 14 11:34:43 2008 +0100
@@ -56,6 +56,7 @@
}
@@ -12698,7 +12656,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/lib/Driver/share.php Fri Nov 14 11:34:43 2008 +0100
@@ -145,7 +145,7 @@
function _deleteAll($sourceName = null)
{
@@ -12710,7 +12668,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 Fri Nov 14 08:37:52 2008 +0100
++++ b/turba/lib/Object.php Fri Nov 14 11:34:43 2008 +0100
@@ -249,7 +249,10 @@
*/
function addFile($info)
More information about the commits
mailing list