gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.20, 1.21
cvs at kolab.org
cvs at kolab.org
Thu Jan 8 21:22:49 CET 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv17309/patches/horde-webmail/1.2.0
Modified Files:
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
kolab/issue2738 (horde should allow a setting to suppress groupware folders)
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.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- horde-webmail-1.2.0_kolab_openpkg.patch 8 Jan 2009 09:56:45 -0000 1.20
+++ horde-webmail-1.2.0_kolab_openpkg.patch 8 Jan 2009 20:22:47 -0000 1.21
@@ -1,6 +1,6 @@
diff -r 9da66837e009 config/conf.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php Thu Jan 08 10:39:26 2009 +0100
++++ b/config/conf.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,119 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -123,7 +123,7 @@
+}
diff -r 9da66837e009 config/conf.xml
--- a/config/conf.xml Tue Dec 30 11:36:13 2008 +0100
-+++ b/config/conf.xml Thu Jan 08 10:39:26 2009 +0100
++++ b/config/conf.xml Thu Jan 08 21:20:43 2009 +0100
@@ -1803,8 +1803,8 @@
<configinteger name="sieveport" desc="Sieve port:">2000</configinteger>
<configstring name="maildomain" desc="Default
@@ -161,7 +161,7 @@
</configswitch>
diff -r 9da66837e009 config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php Thu Jan 08 10:39:26 2009 +0100
++++ b/config/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,37 @@
+<?php
+/* Add additional admins here */
@@ -202,7 +202,7 @@
+?>
diff -r 9da66837e009 config/prefs.php
--- a/config/prefs.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/config/prefs.php Thu Jan 08 10:39:26 2009 +0100
++++ b/config/prefs.php Thu Jan 08 21:20:43 2009 +0100
@@ -357,7 +357,7 @@
// UI theme
@@ -214,7 +214,7 @@
'type' => 'select',
diff -r 9da66837e009 config/registry.php
--- a/config/registry.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/config/registry.php Thu Jan 08 10:39:26 2009 +0100
++++ b/config/registry.php Thu Jan 08 21:20:43 2009 +0100
@@ -64,7 +64,7 @@
'fileroot' => dirname(__FILE__) . '/../dimp',
'webroot' => $this->applications['horde']['webroot'] . '/dimp',
@@ -226,7 +226,7 @@
diff -r 9da66837e009 dimp/config/servers.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/dimp/config/servers.php Thu Jan 08 10:39:26 2009 +0100
++++ b/dimp/config/servers.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,255 @@
+<?php
+/**
@@ -485,7 +485,7 @@
+}
diff -r 9da66837e009 imp/config/conf.php
--- a/imp/config/conf.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/imp/config/conf.php Thu Jan 08 10:39:26 2009 +0100
++++ b/imp/config/conf.php Thu Jan 08 21:20:43 2009 +0100
@@ -1,7 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -496,7 +496,7 @@
$conf['utils']['gnupg_keyserver'] = array('pgp.mit.edu');
$conf['utils']['gnupg_timeout'] = 10;
$conf['menu']['apps'] = array();
-@@ -52,16 +53,12 @@
+@@ -52,16 +53,13 @@
$conf['hooks']['signature'] = false;
$conf['hooks']['trailer'] = false;
$conf['hooks']['fetchmail_filter'] = false;
@@ -506,6 +506,7 @@
+$conf['hooks']['mbox_icon'] = true;
$conf['hooks']['spam_bounce'] = false;
$conf['hooks']['msglist_format'] = false;
++$conf['hooks']['display_folder'] = true;
$conf['maillog']['use_maillog'] = true;
-$conf['sentmail']['params']['threshold'] = 60;
-$conf['sentmail']['params']['limit_period'] = 24;
@@ -516,9 +517,75 @@
$conf['tasklist']['use_tasklist'] = true;
$conf['notepad']['use_notepad'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+diff -r 9da66837e009 imp/config/conf.xml
+--- a/imp/config/conf.xml Tue Dec 30 11:36:13 2008 +0100
++++ b/imp/config/conf.xml Thu Jan 08 21:20:43 2009 +0100
+@@ -445,6 +445,10 @@
+ a custom function to provide additional information/custom formatting of
+ messages in the mailbox message list? If so, make sure you define
+ _imp_hook_msglist_format() in hooks.php.">false</configboolean>
++ <configboolean name="display_folder" required="false" desc="Should we use a
++ custom function to dynamically determine if we show a specified folder?
++ If so, make sure you define _imp_hook_display_folder() in
++ hooks.php.">false</configboolean>
+ </configsection>
+ </configtab>
+
+diff -r 9da66837e009 imp/config/hooks.php
+--- a/imp/config/hooks.php Tue Dec 30 11:36:13 2008 +0100
++++ b/imp/config/hooks.php Thu Jan 08 21:20:43 2009 +0100
+@@ -493,6 +493,13 @@
+ return $icons;
+ }
+ }
++ if (!function_exists('_imp_hook_display_folder')) {
++ function _imp_hook_display_folder($mailbox)
++ {
++ $type = Kolab::getMailboxType($mailbox);
++ return empty($type) || $type == 'mail';
++ }
++ }
+ }
+
+ // Sample function for returning the quota. Uses the PECL ssh2
+diff -r 9da66837e009 imp/config/hooks.php.dist
+--- a/imp/config/hooks.php.dist Tue Dec 30 11:36:13 2008 +0100
++++ b/imp/config/hooks.php.dist Thu Jan 08 21:20:43 2009 +0100
+@@ -426,7 +426,7 @@
+ case 'contact':
+ return $GLOBALS['registry']->get('webroot', 'turba');
+
+- case 'prefs':
++ case 'h-prefs':
+ return $GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=horde';
+
+ default:
+@@ -480,7 +480,7 @@
+ );
+ break;
+
+- case 'prefs':
++ case 'h-prefs':
+ $icons[$name] = array(
+ 'icon' => 'prefs.png',
+ 'icondir' => $GLOBALS['registry']->getImageDir('horde'),
+@@ -491,6 +491,13 @@
+ }
+
+ return $icons;
++ }
++ }
++ if (!function_exists('_imp_hook_display_folder')) {
++ function _imp_hook_display_folder($mailbox)
++ {
++ $type = Kolab::getMailboxType($mailbox);
++ return empty($type) || $type == 'mail';
+ }
+ }
+ }
diff -r 9da66837e009 imp/config/servers.php
--- a/imp/config/servers.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/imp/config/servers.php Thu Jan 08 10:39:26 2009 +0100
++++ b/imp/config/servers.php Thu Jan 08 21:20:43 2009 +0100
@@ -226,10 +226,30 @@
/* Example configurations: */
@@ -557,9 +624,80 @@
+ ),
+ );
+}
+diff -r 9da66837e009 imp/lib/IMAP/Tree.php
+--- a/imp/lib/IMAP/Tree.php Tue Dec 30 11:36:13 2008 +0100
++++ b/imp/lib/IMAP/Tree.php Thu Jan 08 21:20:43 2009 +0100
+@@ -32,6 +32,7 @@
+ define('IMPTREE_ELT_NEED_SORT', 64);
+ define('IMPTREE_ELT_VFOLDER', 128);
+ define('IMPTREE_ELT_NONIMAP', 256);
++define('IMPTREE_ELT_INVISIBLE', 512);
+
+ /* The isOpen() expanded mode constants. */
+ define('IMPTREE_OPEN_NONE', 0);
+@@ -394,6 +395,13 @@
+
+ /* Convert 'INBOX' to localized name. */
+ $elt['l'] = ($elt['v'] == 'INBOX') ? _("Inbox") : String::convertCharset($tmp[$elt['c']], 'UTF7-IMAP');
++
++ if (!empty($GLOBALS['conf']['hooks']['display_folder'])) {
++ if (!Horde::callHook('_imp_hook_display_folder', array($elt['v']),
++ 'imp')) {
++ $this->_setInvisible($elt, true);
++ }
++ }
+
+ if ($_SESSION['imp']['base_protocol'] != 'pop3') {
+ if ($elt['c'] != 0) {
+@@ -1274,6 +1282,31 @@
+ }
+
+ /**
++ * Set the invisible attribute for an element.
++ *
++ * @access private
++ *
++ * @param array &$elt A tree element.
++ * @param boolean $bool The setting.
++ */
++ function _setInvisible(&$elt, $bool)
++ {
++ $this->_setAttribute($elt, IMPTREE_ELT_INVISIBLE, $bool);
++ }
++
++ /**
++ * Is the element invisible?
++ *
++ * @param array $elt A tree element.
++ *
++ * @return integer True if the element is invisible.
++ */
++ function isInvisible($elt)
++ {
++ return $elt['a'] & IMPTREE_ELT_INVISIBLE;
++ }
++
++ /**
+ * Flag the element as needing its children to be sorted.
+ *
+ * @access private
+@@ -1441,9 +1474,10 @@
+ */
+ function _activeElt($elt)
+ {
+- return ($this->_showunsub ||
+- ($this->isSubscribed($elt) && !$this->isContainer($elt)) ||
+- $this->hasChildren($elt));
++ return (!$this->isInvisible($elt) &&
++ ($this->_showunsub ||
++ ($this->isSubscribed($elt) && !$this->isContainer($elt)) ||
++ $this->hasChildren($elt)));
+ }
+
+ /**
diff -r 9da66837e009 imp/lib/MIME/Viewer/itip.php
--- a/imp/lib/MIME/Viewer/itip.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/imp/lib/MIME/Viewer/itip.php Thu Jan 08 10:39:26 2009 +0100
++++ b/imp/lib/MIME/Viewer/itip.php Thu Jan 08 21:20:43 2009 +0100
@@ -86,6 +86,29 @@
// Get the iCalendar file components.
@@ -612,7 +750,7 @@
} else {
diff -r 9da66837e009 ingo/config/backends.php
--- a/ingo/config/backends.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/ingo/config/backends.php Thu Jan 08 10:39:26 2009 +0100
++++ b/ingo/config/backends.php Thu Jan 08 21:20:43 2009 +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.
@@ -633,7 +771,7 @@
require_once 'Horde/Kolab.php';
diff -r 9da66837e009 ingo/config/conf.php
--- a/ingo/config/conf.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/ingo/config/conf.php Thu Jan 08 10:39:26 2009 +0100
++++ b/ingo/config/conf.php Thu Jan 08 21:20:43 2009 +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 $
@@ -646,7 +784,7 @@
$conf['rules']['userheader'] = true;
diff -r 9da66837e009 kronolith/attendees.php
--- a/kronolith/attendees.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/attendees.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/attendees.php Thu Jan 08 21:20:43 2009 +0100
@@ -178,6 +178,16 @@
$attendees = array();
$_SESSION['kronolith']['attendees'] = $attendees;
@@ -681,7 +819,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 9da66837e009 kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/calendars/edit.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/calendars/edit.php Thu Jan 08 21:20:43 2009 +0100
@@ -53,6 +53,10 @@
$vars->set('name', $calendar->get('name'));
@@ -695,7 +833,7 @@
require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r 9da66837e009 kronolith/config/conf.php
--- a/kronolith/config/conf.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/config/conf.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/config/conf.php Thu Jan 08 21:20:43 2009 +0100
@@ -1,16 +1,19 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -724,7 +862,7 @@
+}
diff -r 9da66837e009 kronolith/config/conf.xml
--- a/kronolith/config/conf.xml Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/config/conf.xml Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/config/conf.xml Thu Jan 08 21:20:43 2009 +0100
@@ -49,6 +49,12 @@
</configswitch>
</configsection>
@@ -740,7 +878,7 @@
<configboolean name="keywords" desc="Should keywords be loaded from
diff -r 9da66837e009 kronolith/config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/config/kolab.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/config/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,10 @@
+<?php
+/* Primary mail domain of your Kolab server */
@@ -754,7 +892,7 @@
+?>
diff -r 9da66837e009 kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/config/prefs.php.dist Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/config/prefs.php.dist Thu Jan 08 21:20:43 2009 +0100
@@ -457,6 +457,14 @@
'shared' => false,
'type' => 'implicit'
@@ -772,7 +910,7 @@
'locked' => false,
diff -r 9da66837e009 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/lib/Driver/kolab.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/lib/Driver/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -62,6 +62,7 @@
$this->_calendar = $calendar;
$this->_wrapper->reset();
@@ -806,7 +944,7 @@
*/
diff -r 9da66837e009 kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/lib/FBView.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/lib/FBView.php Thu Jan 08 21:20:43 2009 +0100
@@ -87,7 +87,7 @@
$rows = '';
foreach ($this->_requiredMembers as $member) {
@@ -878,7 +1016,7 @@
} else {
diff -r 9da66837e009 kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/lib/Forms/CreateCalendar.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/lib/Forms/CreateCalendar.php Thu Jan 08 21:20:43 2009 +0100
@@ -35,6 +35,9 @@
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -899,7 +1037,7 @@
diff -r 9da66837e009 kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/lib/Forms/EditCalendar.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/lib/Forms/EditCalendar.php Thu Jan 08 21:20:43 2009 +0100
@@ -42,6 +42,9 @@
$this->addHidden('', 'c', 'text', true);
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -938,7 +1076,7 @@
}
diff -r 9da66837e009 kronolith/lib/FreeBusy.php
--- a/kronolith/lib/FreeBusy.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/lib/FreeBusy.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/lib/FreeBusy.php Thu Jan 08 21:20:43 2009 +0100
@@ -187,6 +187,9 @@
require_once 'HTTP/Request.php';
@@ -951,7 +1089,7 @@
}
diff -r 9da66837e009 kronolith/lib/Storage/kolab.php
--- a/kronolith/lib/Storage/kolab.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/lib/Storage/kolab.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/lib/Storage/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -29,17 +29,24 @@
{
global $conf;
@@ -987,7 +1125,7 @@
$options['timeout'] = 5;
diff -r 9da66837e009 kronolith/lib/api.php
--- a/kronolith/lib/api.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/lib/api.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/lib/api.php Thu Jan 08 21:20:43 2009 +0100
@@ -694,6 +694,7 @@
function _kronolith_listBy($action, $timestamp, $calendar = null)
{
@@ -1007,7 +1145,7 @@
$histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar);
diff -r 9da66837e009 kronolith/perms.php
--- a/kronolith/perms.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/perms.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/perms.php Thu Jan 08 21:20:43 2009 +0100
@@ -14,6 +14,34 @@
@define('KRONOLITH_BASE', dirname(__FILE__));
require_once KRONOLITH_BASE . '/lib/base.php';
@@ -1079,7 +1217,7 @@
$notification->push($result, 'horde.error');
diff -r 9da66837e009 kronolith/savedattlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/savedattlist.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
@@ -1160,7 +1298,7 @@
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r 9da66837e009 kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/templates/attendees/attendees.inc Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/templates/attendees/attendees.inc Thu Jan 08 21:20:43 2009 +0100
@@ -92,6 +92,8 @@
<div>
<input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -1172,13 +1310,13 @@
diff -r 9da66837e009 kronolith/templates/fbview/busyblock.html
--- a/kronolith/templates/fbview/busyblock.html Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/templates/fbview/busyblock.html Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/templates/fbview/busyblock.html Thu Jan 08 21:20:43 2009 +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 9da66837e009 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 Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/templates/javascript/open_savedattlist_win.js Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
@@ -1218,7 +1356,7 @@
+<?php endif; ?>
diff -r 9da66837e009 kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc Tue Dec 30 11:36:13 2008 +0100
-+++ b/kronolith/templates/perms/perms.inc Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/templates/perms/perms.inc Thu Jan 08 21:20:43 2009 +0100
@@ -330,6 +330,61 @@
<td> </td>
</tr>
@@ -1283,7 +1421,7 @@
</tr>
diff -r 9da66837e009 kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/savedattlist/savedattlist.inc Thu Jan 08 10:39:26 2009 +0100
++++ b/kronolith/templates/savedattlist/savedattlist.inc Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
@@ -1355,7 +1493,7 @@
+</form>
diff -r 9da66837e009 lib/Horde/Auth/kolab.php
--- a/lib/Horde/Auth/kolab.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Auth/kolab.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Auth/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -1,6 +1,4 @@
<?php
-
@@ -1640,7 +1778,7 @@
}
diff -r 9da66837e009 lib/Horde/Kolab.php
--- a/lib/Horde/Kolab.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -711,7 +711,7 @@
* Returns an array of application-specific constants, that are used in
* a generic manner throughout the library.
@@ -1733,7 +1871,7 @@
}
diff -r 9da66837e009 lib/Horde/Kolab/Deprecated.php
--- a/lib/Horde/Kolab/Deprecated.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Deprecated.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Deprecated.php Thu Jan 08 21:20:43 2009 +0100
@@ -180,7 +180,7 @@
/** We need the DOM library for xml handling (PHP4/5). */
require_once 'Horde/DOM.php';
@@ -1765,7 +1903,7 @@
if (is_a($result, 'PEAR_Error')) {
diff -r 9da66837e009 lib/Horde/Kolab/Format/XML.php
--- a/lib/Horde/Kolab/Format/XML.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Format/XML.php Thu Jan 08 21:20:43 2009 +0100
@@ -117,11 +117,18 @@
var $_version = 1;
@@ -1875,7 +2013,7 @@
$primary_category = '';
diff -r 9da66837e009 lib/Horde/Kolab/Format/XML/hprefs.php
--- a/lib/Horde/Kolab/Format/XML/hprefs.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML/hprefs.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Format/XML/hprefs.php Thu Jan 08 21:20:43 2009 +0100
@@ -46,6 +46,10 @@
/** Specific preferences fields, in kolab format specification order
*/
@@ -1938,7 +2076,7 @@
}
diff -r 9da66837e009 lib/Horde/Kolab/IMAP.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/IMAP.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,139 @@
+<?php
+/**
@@ -2081,7 +2219,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/IMAP/cclient.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/cclient.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/IMAP/cclient.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,778 @@
+<?php
+/**
@@ -2863,7 +3001,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/IMAP/pear.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/pear.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/IMAP/pear.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,520 @@
+<?php
+/**
@@ -3387,7 +3525,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/IMAP/test.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/test.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/IMAP/test.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,728 @@
+<?php
+/**
@@ -4119,7 +4257,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/Server.php
--- a/lib/Horde/Kolab/Server.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server.php Thu Jan 08 21:20:43 2009 +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 $
@@ -4832,7 +4970,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object.php
--- a/lib/Horde/Kolab/Server/Object.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object.php Thu Jan 08 21:20:43 2009 +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 $
@@ -5385,7 +5523,7 @@
};
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/address.php
--- a/lib/Horde/Kolab/Server/Object/address.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/address.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/address.php Thu Jan 08 21:20:43 2009 +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 $
@@ -5469,7 +5607,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/administrator.php
--- a/lib/Horde/Kolab/Server/Object/administrator.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/administrator.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/administrator.php Thu Jan 08 21:20:43 2009 +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 $
@@ -5528,7 +5666,7 @@
+}
diff -r 9da66837e009 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 Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/adminrole.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,157 @@
+<?php
+/**
@@ -5689,7 +5827,7 @@
+}
diff -r 9da66837e009 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 Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/distlist.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,52 @@
+<?php
+/**
@@ -5745,7 +5883,7 @@
+};
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/domainmaintainer.php
--- a/lib/Horde/Kolab/Server/Object/domainmaintainer.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Thu Jan 08 21:20:43 2009 +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 $
@@ -5880,7 +6018,7 @@
}
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/group.php
--- a/lib/Horde/Kolab/Server/Object/group.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/group.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/group.php Thu Jan 08 21:20:43 2009 +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 $
@@ -6117,7 +6255,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/maintainer.php
--- a/lib/Horde/Kolab/Server/Object/maintainer.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/maintainer.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/maintainer.php Thu Jan 08 21:20:43 2009 +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 $
@@ -6177,7 +6315,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/server.php
--- a/lib/Horde/Kolab/Server/Object/server.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/server.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/server.php Thu Jan 08 21:20:43 2009 +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 $
@@ -6216,7 +6354,7 @@
\ No newline at end of file
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/sharedfolder.php
--- a/lib/Horde/Kolab/Server/Object/sharedfolder.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Thu Jan 08 21:20:43 2009 +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 $
@@ -6321,7 +6459,7 @@
}
diff -r 9da66837e009 lib/Horde/Kolab/Server/Object/user.php
--- a/lib/Horde/Kolab/Server/Object/user.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/user.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/Object/user.php Thu Jan 08 21:20:43 2009 +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 $
@@ -6632,7 +6770,7 @@
};
diff -r 9da66837e009 lib/Horde/Kolab/Server/ldap.php
--- a/lib/Horde/Kolab/Server/ldap.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/ldap.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/ldap.php Thu Jan 08 21:20:43 2009 +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 $
@@ -7368,7 +7506,7 @@
}
diff -r 9da66837e009 lib/Horde/Kolab/Server/test.php
--- a/lib/Horde/Kolab/Server/test.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Server/test.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Server/test.php Thu Jan 08 21:20:43 2009 +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 $
@@ -7909,7 +8047,7 @@
}
diff -r 9da66837e009 lib/Horde/Kolab/Session.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Session.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Session.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,358 @@
+<?php
+/**
@@ -8271,7 +8409,7 @@
+}
diff -r 9da66837e009 lib/Horde/Kolab/Storage/Cache.php
--- a/lib/Horde/Kolab/Storage/Cache.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Cache.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Storage/Cache.php Thu Jan 08 21:20:43 2009 +0100
@@ -187,6 +187,31 @@
}
@@ -8306,7 +8444,7 @@
function reset()
diff -r 9da66837e009 lib/Horde/Kolab/Storage/Data.php
--- a/lib/Horde/Kolab/Storage/Data.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Data.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Storage/Data.php Thu Jan 08 21:20:43 2009 +0100
@@ -46,14 +46,6 @@
* @var string
*/
@@ -8463,7 +8601,7 @@
* @return array The object ids.
diff -r 9da66837e009 lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Folder.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Storage/Folder.php Thu Jan 08 21:20:43 2009 +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 $
@@ -11049,7 +11187,7 @@
-}
diff -r 9da66837e009 lib/Horde/Kolab/Storage/List.php
--- a/lib/Horde/Kolab/Storage/List.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/List.php Thu Jan 08 10:39:26 2009 +0100
++++ b/lib/Horde/Kolab/Storage/List.php Thu Jan 08 21:20:43 2009 +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 $
@@ -11490,7 +11628,7 @@
-}
diff -r 9da66837e009 lib/Horde/Prefs/kolab.php
--- a/lib/Horde/Prefs/kolab.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Prefs/kolab.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/Horde/Prefs/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -1,5 +1,6 @@
<?php
@@ -11510,7 +11648,7 @@
}
diff -r 9da66837e009 lib/Horde/Prefs/kolab_imap.php
--- a/lib/Horde/Prefs/kolab_imap.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Prefs/kolab_imap.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/Horde/Prefs/kolab_imap.php Thu Jan 08 21:20:43 2009 +0100
@@ -163,7 +163,7 @@
}
@@ -11531,7 +11669,7 @@
$result = $this->_connection->_storage->save($object, $old_uid);
diff -r 9da66837e009 lib/Horde/Share/kolab.php
--- a/lib/Horde/Share/kolab.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Share/kolab.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/Horde/Share/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -525,6 +525,13 @@
$default = array('source' => 'kolab',
'default' => $this->get('default'),
@@ -11559,7 +11697,7 @@
$this->_data[$attribute] = $value;
diff -r 9da66837e009 lib/Horde/Text/Filter/xss.php
--- a/lib/Horde/Text/Filter/xss.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/Text/Filter/xss.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/Horde/Text/Filter/xss.php Thu Jan 08 21:20:43 2009 +0100
@@ -193,7 +193,7 @@
/* Comment out style/link tags. */
if ($this->_params['strip_styles']) {
@@ -11571,7 +11709,7 @@
$patterns['|(?:-->\s*)*</style>|i'] = '-->';
diff -r 9da66837e009 lib/Horde/iCalendar.php
--- a/lib/Horde/iCalendar.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/Horde/iCalendar.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/Horde/iCalendar.php Thu Jan 08 21:20:43 2009 +0100
@@ -151,6 +151,41 @@
'value' => $value,
'values' => $values
@@ -11662,7 +11800,7 @@
}
diff -r 9da66837e009 lib/SyncML/Backend.php
--- a/lib/SyncML/Backend.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/SyncML/Backend.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/SyncML/Backend.php Thu Jan 08 21:20:43 2009 +0100
@@ -567,6 +567,24 @@
}
@@ -11690,7 +11828,7 @@
* For some types of authentications (notably auth:basic) the username
diff -r 9da66837e009 lib/SyncML/Backend/Horde.php
--- a/lib/SyncML/Backend/Horde.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/SyncML/Backend/Horde.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/SyncML/Backend/Horde.php Thu Jan 08 21:20:43 2009 +0100
@@ -204,6 +204,11 @@
__FILE__, __LINE__, PEAR_LOG_DEBUG);
continue;
@@ -11801,7 +11939,7 @@
diff -r 9da66837e009 lib/SyncML/Constants.php
--- a/lib/SyncML/Constants.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/SyncML/Constants.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/SyncML/Constants.php Thu Jan 08 21:20:43 2009 +0100
@@ -66,7 +66,7 @@
define('RESPONSE_PARTIAL_CONTENT', 206);
define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -11813,7 +11951,7 @@
define('RESPONSE_AUTHENTICATION_ACCEPTED', 212);
diff -r 9da66837e009 lib/SyncML/Device.php
--- a/lib/SyncML/Device.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/SyncML/Device.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/SyncML/Device.php Thu Jan 08 21:20:43 2009 +0100
@@ -159,12 +159,81 @@
SYNCML_LOGFILE_DATA,
"\nInput received from client ($contentType):\n$content\n");
@@ -11898,7 +12036,7 @@
* Converts the content from the backend to a format suitable for the
diff -r 9da66837e009 lib/SyncML/Sync.php
--- a/lib/SyncML/Sync.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/SyncML/Sync.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/SyncML/Sync.php Thu Jan 08 21:20:43 2009 +0100
@@ -283,7 +283,13 @@
}
} elseif ($item->elementType == 'Delete') {
@@ -11957,7 +12095,7 @@
diff -r 9da66837e009 lib/VFS/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/VFS/kolab.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/VFS/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,631 @@
+<?php
+
@@ -12592,7 +12730,7 @@
+}
diff -r 9da66837e009 lib/core.php
--- a/lib/core.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/lib/core.php Thu Jan 08 10:39:27 2009 +0100
++++ b/lib/core.php Thu Jan 08 21:20:43 2009 +0100
@@ -31,6 +31,12 @@
* include_path, you must add an ini_set() call here to add their location to
* the include_path. */
@@ -12608,13 +12746,13 @@
include_once 'PEAR.php';
diff -r 9da66837e009 log/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess Thu Jan 08 10:39:27 2009 +0100
++++ b/log/.htaccess Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 9da66837e009 mnemo/config/conf.php
--- a/mnemo/config/conf.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/mnemo/config/conf.php Thu Jan 08 10:39:27 2009 +0100
++++ b/mnemo/config/conf.php Thu Jan 08 21:20:43 2009 +0100
@@ -1,9 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12629,7 +12767,7 @@
$conf['menu']['apps'] = array();
diff -r 9da66837e009 nag/config/conf.php
--- a/nag/config/conf.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/nag/config/conf.php Thu Jan 08 10:39:27 2009 +0100
++++ b/nag/config/conf.php Thu Jan 08 21:20:43 2009 +0100
@@ -1,9 +1,7 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12643,7 +12781,7 @@
$conf['menu']['apps'] = array();
diff -r 9da66837e009 nag/lib/Driver.php
--- a/nag/lib/Driver.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/nag/lib/Driver.php Thu Jan 08 10:39:27 2009 +0100
++++ b/nag/lib/Driver.php Thu Jan 08 21:20:43 2009 +0100
@@ -319,33 +319,40 @@
$new_task = $this->get($task->id);
@@ -12710,7 +12848,7 @@
diff -r 9da66837e009 pear/DB/sqlite.php
--- a/pear/DB/sqlite.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/pear/DB/sqlite.php Thu Jan 08 10:39:27 2009 +0100
++++ b/pear/DB/sqlite.php Thu Jan 08 21:20:43 2009 +0100
@@ -742,7 +742,7 @@
// PHP 5.2+ prepends the function name to $php_errormsg, so we need
@@ -12722,19 +12860,19 @@
$error_regexps = array(
diff -r 9da66837e009 storage/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess Thu Jan 08 10:39:27 2009 +0100
++++ b/storage/.htaccess Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 9da66837e009 tmp/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/tmp/.htaccess Thu Jan 08 10:39:27 2009 +0100
++++ b/tmp/.htaccess Thu Jan 08 21:20:43 2009 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 9da66837e009 turba/config/attributes.php
--- a/turba/config/attributes.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/config/attributes.php Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/config/attributes.php Thu Jan 08 21:20:43 2009 +0100
@@ -356,6 +356,12 @@
);
@@ -12750,7 +12888,7 @@
'type' => 'text',
diff -r 9da66837e009 turba/config/attributes.php.dist
--- a/turba/config/attributes.php.dist Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/config/attributes.php.dist Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/config/attributes.php.dist Thu Jan 08 21:20:43 2009 +0100
@@ -402,6 +402,12 @@
// );
@@ -12766,7 +12904,7 @@
'type' => 'text',
diff -r 9da66837e009 turba/config/conf.php
--- a/turba/config/conf.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/config/conf.php Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/config/conf.php Thu Jan 08 21:20:43 2009 +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;
@@ -12780,7 +12918,7 @@
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 9da66837e009 turba/config/sources.php
--- a/turba/config/sources.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/config/sources.php Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/config/sources.php Thu Jan 08 21:20:43 2009 +0100
@@ -154,6 +154,8 @@
* Here are some example configurations:
*/
@@ -13045,7 +13183,7 @@
* read-only. The address book content is provided by the
diff -r 9da66837e009 turba/config/sources.php.dist
--- a/turba/config/sources.php.dist Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/config/sources.php.dist Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/config/sources.php.dist Thu Jan 08 21:20:43 2009 +0100
@@ -825,7 +825,9 @@
'cellPhone' => 'mobile',
'fax' => 'fax',
@@ -13077,7 +13215,7 @@
'homePostalCode', 'homeCountry', 'workStreet',
diff -r 9da66837e009 turba/lib/Driver.php
--- a/turba/lib/Driver.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/lib/Driver.php Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/lib/Driver.php Thu Jan 08 21:20:43 2009 +0100
@@ -1466,9 +1466,6 @@
$hash = array();
$attr = $vcard->getAllAttributes();
@@ -13090,7 +13228,7 @@
case 'FN':
diff -r 9da66837e009 turba/lib/Driver/kolab.php
--- a/turba/lib/Driver/kolab.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/lib/Driver/kolab.php Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/lib/Driver/kolab.php Thu Jan 08 21:20:43 2009 +0100
@@ -56,6 +56,7 @@
}
@@ -13186,7 +13324,7 @@
$result = $this->_store->save($attributes, $object_id);
diff -r 9da66837e009 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/lib/Driver/share.php Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/lib/Driver/share.php Thu Jan 08 21:20:43 2009 +0100
@@ -145,7 +145,7 @@
function _deleteAll($sourceName = null)
{
@@ -13198,7 +13336,7 @@
}
diff -r 9da66837e009 turba/lib/Object.php
--- a/turba/lib/Object.php Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/lib/Object.php Thu Jan 08 10:39:27 2009 +0100
++++ b/turba/lib/Object.php Thu Jan 08 21:20:43 2009 +0100
@@ -249,7 +249,10 @@
*/
function addFile($info)
More information about the commits
mailing list