gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.3, 1.4
cvs at kolab.org
cvs at kolab.org
Mon Oct 27 21:09:52 CET 2008
- Previous message: gunnar: server/patches/cyrus-imapd/cyrus-imapd-2.3.13 KOLAB_cyrus-cyradm-2.3.13_Annotations.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Annotations2.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Folder-names.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Groups2.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Logging.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_UID.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_timsieved_starttls-sendcaps.patch, NONE, 1.1
- Next message: gunnar: server/kolabd/kolabd Makefile.am,1.46,1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv30754/1.2.0
Modified Files:
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Updated horde configuration and added the fix for horde bug 7400.
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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-webmail-1.2.0_kolab_openpkg.patch 27 Oct 2008 14:15:07 -0000 1.3
+++ horde-webmail-1.2.0_kolab_openpkg.patch 27 Oct 2008 20:09:49 -0000 1.4
@@ -1,10 +1,10 @@
diff -r 622108627ce6 config/conf.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php Mon Oct 27 15:14:20 2008 +0100
-@@ -0,0 +1,115 @@
++++ b/config/conf.php Mon Oct 27 21:06:47 2008 +0100
+@@ -0,0 +1,118 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-+// $Horde: horde/config/conf.xml,v 1.74.2.76 2008/09/07 04:23:44 chuck Exp $
++// $Horde: horde/config/conf.xml,v 1.74.2.78 2008/09/12 10:01:41 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
@@ -15,6 +15,8 @@
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
++$conf['urls']['token_lifetime'] = 30;
++$conf['urls']['hmac_lifetime'] = 30;
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
@@ -106,11 +108,12 @@
+$conf['kolab']['imap']['port'] = 143;
+$conf['kolab']['imap']['sieveport'] = 2000;
+$conf['kolab']['imap']['maildomain'] = 'example.com';
-+$conf['kolab']['imap']['virtdomains'] = true;
++$conf['kolab']['imap']['cache_folders'] = true;
+$conf['kolab']['smtp']['server'] = 'localhost';
+$conf['kolab']['smtp']['port'] = 25;
+$conf['kolab']['misc']['multidomain'] = false;
+$conf['kolab']['cache_folders'] = true;
++$conf['kolab']['freebusy']['server'] = 'https://localhost/freebusy';
+$conf['kolab']['enabled'] = true;
+$conf['memcache']['enabled'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
@@ -119,7 +122,7 @@
+}
diff -r 622108627ce6 config/conf.xml
--- a/config/conf.xml Mon Oct 27 15:13:42 2008 +0100
-+++ b/config/conf.xml Mon Oct 27 15:14:20 2008 +0100
++++ b/config/conf.xml Mon Oct 27 21:06:47 2008 +0100
@@ -1803,8 +1803,8 @@
<configinteger name="sieveport" desc="Sieve port:">2000</configinteger>
<configstring name="maildomain" desc="Default
@@ -157,7 +160,7 @@
</configswitch>
diff -r 622108627ce6 config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/config/kolab.php Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,37 @@
+<?php
+/* Add additional admins here */
@@ -198,7 +201,7 @@
+?>
diff -r 622108627ce6 config/prefs.php
--- a/config/prefs.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/config/prefs.php Mon Oct 27 15:14:20 2008 +0100
++++ b/config/prefs.php Mon Oct 27 21:06:47 2008 +0100
@@ -357,7 +357,7 @@
// UI theme
@@ -210,7 +213,7 @@
'type' => 'select',
diff -r 622108627ce6 imp/config/conf.php
--- a/imp/config/conf.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/imp/config/conf.php Mon Oct 27 15:14:20 2008 +0100
++++ b/imp/config/conf.php Mon Oct 27 21:06:47 2008 +0100
@@ -1,7 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -243,7 +246,7 @@
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 622108627ce6 imp/config/servers.php
--- a/imp/config/servers.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/imp/config/servers.php Mon Oct 27 15:14:20 2008 +0100
++++ b/imp/config/servers.php Mon Oct 27 21:06:47 2008 +0100
@@ -226,10 +226,30 @@
/* Example configurations: */
@@ -284,7 +287,7 @@
+}
diff -r 622108627ce6 ingo/config/backends.php
--- a/ingo/config/backends.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/ingo/config/backends.php Mon Oct 27 15:14:20 2008 +0100
++++ b/ingo/config/backends.php Mon Oct 27 21:06:47 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.
@@ -305,7 +308,7 @@
require_once 'Horde/Kolab.php';
diff -r 622108627ce6 ingo/config/conf.php
--- a/ingo/config/conf.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/ingo/config/conf.php Mon Oct 27 15:14:20 2008 +0100
++++ b/ingo/config/conf.php Mon Oct 27 21:06:47 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 $
@@ -318,7 +321,7 @@
$conf['rules']['userheader'] = true;
diff -r 622108627ce6 kronolith/attendees.php
--- a/kronolith/attendees.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/attendees.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/attendees.php Mon Oct 27 21:06:47 2008 +0100
@@ -178,6 +178,16 @@
$attendees = array();
$_SESSION['kronolith']['attendees'] = $attendees;
@@ -353,7 +356,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 622108627ce6 kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/calendars/edit.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/calendars/edit.php Mon Oct 27 21:06:47 2008 +0100
@@ -53,6 +53,10 @@
$vars->set('name', $calendar->get('name'));
@@ -367,7 +370,7 @@
require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r 622108627ce6 kronolith/config/conf.php
--- a/kronolith/config/conf.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/config/conf.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/config/conf.php Mon Oct 27 21:06:47 2008 +0100
@@ -1,12 +1,11 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -395,7 +398,7 @@
+}
diff -r 622108627ce6 kronolith/config/kolab.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/config/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/config/kolab.php Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,10 @@
+<?php
+/* Primary mail domain of your Kolab server */
@@ -409,7 +412,7 @@
+?>
diff -r 622108627ce6 kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/config/prefs.php.dist Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/config/prefs.php.dist Mon Oct 27 21:06:47 2008 +0100
@@ -457,6 +457,14 @@
'shared' => false,
'type' => 'implicit'
@@ -427,7 +430,7 @@
'locked' => false,
diff -r 622108627ce6 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/lib/Driver/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/lib/Driver/kolab.php Mon Oct 27 21:06:47 2008 +0100
@@ -62,6 +62,7 @@
$this->_calendar = $calendar;
$this->_wrapper->reset();
@@ -461,7 +464,7 @@
*/
diff -r 622108627ce6 kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/lib/FBView.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/lib/FBView.php Mon Oct 27 21:06:47 2008 +0100
@@ -87,7 +87,7 @@
$rows = '';
foreach ($this->_requiredMembers as $member) {
@@ -533,7 +536,7 @@
} else {
diff -r 622108627ce6 kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/lib/Forms/CreateCalendar.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/lib/Forms/CreateCalendar.php Mon Oct 27 21:06:47 2008 +0100
@@ -35,6 +35,9 @@
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -554,7 +557,7 @@
diff -r 622108627ce6 kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/lib/Forms/EditCalendar.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/lib/Forms/EditCalendar.php Mon Oct 27 21:06:47 2008 +0100
@@ -42,6 +42,9 @@
$this->addHidden('', 'c', 'text', true);
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -575,7 +578,7 @@
$result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));
diff -r 622108627ce6 kronolith/lib/Storage/kolab.php
--- a/kronolith/lib/Storage/kolab.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/lib/Storage/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/lib/Storage/kolab.php Mon Oct 27 21:06:47 2008 +0100
@@ -29,17 +29,24 @@
{
global $conf;
@@ -611,7 +614,7 @@
$options['timeout'] = 5;
diff -r 622108627ce6 kronolith/lib/api.php
--- a/kronolith/lib/api.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/lib/api.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/lib/api.php Mon Oct 27 21:06:47 2008 +0100
@@ -694,6 +694,7 @@
function _kronolith_listBy($action, $timestamp, $calendar = null)
{
@@ -631,7 +634,7 @@
$histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar);
diff -r 622108627ce6 kronolith/perms.php
--- a/kronolith/perms.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/perms.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/perms.php Mon Oct 27 21:06:47 2008 +0100
@@ -14,6 +14,34 @@
@define('KRONOLITH_BASE', dirname(__FILE__));
require_once KRONOLITH_BASE . '/lib/base.php';
@@ -703,7 +706,7 @@
$notification->push($result, 'horde.error');
diff -r 622108627ce6 kronolith/savedattlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/savedattlist.php Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
@@ -784,7 +787,7 @@
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r 622108627ce6 kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/templates/attendees/attendees.inc Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/templates/attendees/attendees.inc Mon Oct 27 21:06:47 2008 +0100
@@ -92,6 +92,8 @@
<div>
<input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -796,7 +799,7 @@
diff -r 622108627ce6 kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/javascript/open_savedattlist_win.js Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/templates/javascript/open_savedattlist_win.js Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
@@ -836,7 +839,7 @@
+<?php endif; ?>
diff -r 622108627ce6 kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc Mon Oct 27 15:13:42 2008 +0100
-+++ b/kronolith/templates/perms/perms.inc Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/templates/perms/perms.inc Mon Oct 27 21:06:47 2008 +0100
@@ -330,6 +330,61 @@
<td> </td>
</tr>
@@ -901,7 +904,7 @@
</tr>
diff -r 622108627ce6 kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/savedattlist/savedattlist.inc Mon Oct 27 15:14:20 2008 +0100
++++ b/kronolith/templates/savedattlist/savedattlist.inc Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
@@ -973,7 +976,7 @@
+</form>
diff -r 622108627ce6 lib/Horde/Auth/kolab.php
--- a/lib/Horde/Auth/kolab.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Auth/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Auth/kolab.php Mon Oct 27 21:06:47 2008 +0100
@@ -1,6 +1,4 @@
<?php
-
@@ -1250,7 +1253,7 @@
}
diff -r 622108627ce6 lib/Horde/Kolab.php
--- a/lib/Horde/Kolab.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab.php Mon Oct 27 21:06:47 2008 +0100
@@ -711,7 +711,7 @@
* Returns an array of application-specific constants, that are used in
* a generic manner throughout the library.
@@ -1343,7 +1346,7 @@
}
diff -r 622108627ce6 lib/Horde/Kolab/Deprecated.php
--- a/lib/Horde/Kolab/Deprecated.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Deprecated.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Deprecated.php Mon Oct 27 21:06:47 2008 +0100
@@ -180,7 +180,7 @@
/** We need the DOM library for xml handling (PHP4/5). */
require_once 'Horde/DOM.php';
@@ -1375,7 +1378,7 @@
if (is_a($result, 'PEAR_Error')) {
diff -r 622108627ce6 lib/Horde/Kolab/Format/XML.php
--- a/lib/Horde/Kolab/Format/XML.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML.php Mon Oct 27 21:06:47 2008 +0100
@@ -968,6 +968,8 @@
*/
function _loadMultipleCategories(&$object)
@@ -1405,7 +1408,7 @@
$primary_category = '';
diff -r 622108627ce6 lib/Horde/Kolab/Format/XML/hprefs.php
--- a/lib/Horde/Kolab/Format/XML/hprefs.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML/hprefs.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML/hprefs.php Mon Oct 27 21:06:47 2008 +0100
@@ -46,6 +46,10 @@
/** Specific preferences fields, in kolab format specification order
*/
@@ -1468,7 +1471,7 @@
}
diff -r 622108627ce6 lib/Horde/Kolab/IMAP.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/IMAP.php Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,139 @@
+<?php
+/**
@@ -1611,7 +1614,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/IMAP/cclient.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/cclient.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/cclient.php Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,778 @@
+<?php
+/**
@@ -2393,7 +2396,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/IMAP/pear.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/pear.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/pear.php Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,520 @@
+<?php
+/**
@@ -2917,7 +2920,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/IMAP/test.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/test.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/test.php Mon Oct 27 21:06:47 2008 +0100
@@ -0,0 +1,728 @@
+<?php
+/**
@@ -3649,7 +3652,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Server.php
--- a/lib/Horde/Kolab/Server.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server.php Mon Oct 27 21:06:47 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 $
@@ -4329,7 +4332,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object.php
--- a/lib/Horde/Kolab/Server/Object.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object.php Mon Oct 27 21:06:48 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 $
@@ -4882,7 +4885,7 @@
};
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/address.php
--- a/lib/Horde/Kolab/Server/Object/address.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/address.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/address.php Mon Oct 27 21:06:48 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 $
@@ -4966,7 +4969,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/administrator.php
--- a/lib/Horde/Kolab/Server/Object/administrator.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/administrator.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/administrator.php Mon Oct 27 21:06:48 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 $
@@ -5025,7 +5028,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/adminrole.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Server/Object/adminrole.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/adminrole.php Mon Oct 27 21:06:48 2008 +0100
@@ -0,0 +1,157 @@
+<?php
+/**
@@ -5186,7 +5189,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/distlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Server/Object/distlist.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/distlist.php Mon Oct 27 21:06:48 2008 +0100
@@ -0,0 +1,52 @@
+<?php
+/**
@@ -5242,7 +5245,7 @@
+};
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/domainmaintainer.php
--- a/lib/Horde/Kolab/Server/Object/domainmaintainer.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php Mon Oct 27 21:06:48 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 $
@@ -5377,7 +5380,7 @@
}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/group.php
--- a/lib/Horde/Kolab/Server/Object/group.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/group.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/group.php Mon Oct 27 21:06:48 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 $
@@ -5614,7 +5617,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/maintainer.php
--- a/lib/Horde/Kolab/Server/Object/maintainer.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/maintainer.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/maintainer.php Mon Oct 27 21:06:48 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 $
@@ -5674,7 +5677,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/server.php
--- a/lib/Horde/Kolab/Server/Object/server.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/server.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/server.php Mon Oct 27 21:06:48 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 $
@@ -5713,7 +5716,7 @@
\ No newline at end of file
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/sharedfolder.php
--- a/lib/Horde/Kolab/Server/Object/sharedfolder.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php Mon Oct 27 21:06:48 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 $
@@ -5818,7 +5821,7 @@
}
diff -r 622108627ce6 lib/Horde/Kolab/Server/Object/user.php
--- a/lib/Horde/Kolab/Server/Object/user.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/user.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/user.php Mon Oct 27 21:06:48 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 $
@@ -6102,7 +6105,7 @@
};
diff -r 622108627ce6 lib/Horde/Kolab/Server/ldap.php
--- a/lib/Horde/Kolab/Server/ldap.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/ldap.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/ldap.php Mon Oct 27 21:06:48 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 $
@@ -6814,7 +6817,7 @@
}
diff -r 622108627ce6 lib/Horde/Kolab/Server/test.php
--- a/lib/Horde/Kolab/Server/test.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Server/test.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Server/test.php Mon Oct 27 21:06:48 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 $
@@ -7355,7 +7358,7 @@
}
diff -r 622108627ce6 lib/Horde/Kolab/Session.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Session.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Session.php Mon Oct 27 21:06:48 2008 +0100
@@ -0,0 +1,336 @@
+<?php
+/**
@@ -7695,7 +7698,7 @@
+}
diff -r 622108627ce6 lib/Horde/Kolab/Storage/Data.php
--- a/lib/Horde/Kolab/Storage/Data.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Data.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Data.php Mon Oct 27 21:06:48 2008 +0100
@@ -219,7 +219,7 @@
return true;
}
@@ -7722,7 +7725,7 @@
diff -r 622108627ce6 lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Folder.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Folder.php Mon Oct 27 21:06:48 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 $
@@ -9850,7 +9853,7 @@
-}
diff -r 622108627ce6 lib/Horde/Kolab/Storage/List.php
--- a/lib/Horde/Kolab/Storage/List.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/List.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Kolab/Storage/List.php Mon Oct 27 21:06:48 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 $
@@ -10291,7 +10294,7 @@
-}
diff -r 622108627ce6 lib/Horde/Prefs/kolab.php
--- a/lib/Horde/Prefs/kolab.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Prefs/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Prefs/kolab.php Mon Oct 27 21:06:48 2008 +0100
@@ -1,5 +1,6 @@
<?php
@@ -10311,7 +10314,7 @@
}
diff -r 622108627ce6 lib/Horde/Prefs/kolab_imap.php
--- a/lib/Horde/Prefs/kolab_imap.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Prefs/kolab_imap.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Prefs/kolab_imap.php Mon Oct 27 21:06:48 2008 +0100
@@ -163,7 +163,7 @@
}
@@ -10332,7 +10335,7 @@
$result = $this->_connection->_storage->save($object, $old_uid);
diff -r 622108627ce6 lib/Horde/Share/kolab.php
--- a/lib/Horde/Share/kolab.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/Share/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/Share/kolab.php Mon Oct 27 21:06:48 2008 +0100
@@ -525,6 +525,13 @@
$default = array('source' => 'kolab',
'default' => $this->get('default'),
@@ -10349,7 +10352,7 @@
}
diff -r 622108627ce6 lib/Horde/iCalendar.php
--- a/lib/Horde/iCalendar.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/Horde/iCalendar.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/Horde/iCalendar.php Mon Oct 27 21:06:48 2008 +0100
@@ -151,6 +151,41 @@
'value' => $value,
'values' => $values
@@ -10394,7 +10397,7 @@
diff -r 622108627ce6 lib/SyncML/Backend.php
--- a/lib/SyncML/Backend.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/SyncML/Backend.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/SyncML/Backend.php Mon Oct 27 21:06:48 2008 +0100
@@ -567,6 +567,24 @@
}
@@ -10422,7 +10425,7 @@
* For some types of authentications (notably auth:basic) the username
diff -r 622108627ce6 lib/SyncML/Backend/Horde.php
--- a/lib/SyncML/Backend/Horde.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/SyncML/Backend/Horde.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/SyncML/Backend/Horde.php Mon Oct 27 21:06:48 2008 +0100
@@ -204,6 +204,11 @@
__FILE__, __LINE__, PEAR_LOG_DEBUG);
continue;
@@ -10533,7 +10536,7 @@
diff -r 622108627ce6 lib/SyncML/Constants.php
--- a/lib/SyncML/Constants.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/SyncML/Constants.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/SyncML/Constants.php Mon Oct 27 21:06:48 2008 +0100
@@ -66,7 +66,7 @@
define('RESPONSE_PARTIAL_CONTENT', 206);
define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -10545,7 +10548,7 @@
define('RESPONSE_AUTHENTICATION_ACCEPTED', 212);
diff -r 622108627ce6 lib/SyncML/Device.php
--- a/lib/SyncML/Device.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/SyncML/Device.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/SyncML/Device.php Mon Oct 27 21:06:48 2008 +0100
@@ -159,12 +159,81 @@
SYNCML_LOGFILE_DATA,
"\nInput received from client ($contentType):\n$content\n");
@@ -10630,7 +10633,7 @@
* Converts the content from the backend to a format suitable for the
diff -r 622108627ce6 lib/SyncML/Sync.php
--- a/lib/SyncML/Sync.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/SyncML/Sync.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/SyncML/Sync.php Mon Oct 27 21:06:48 2008 +0100
@@ -283,7 +283,13 @@
}
} elseif ($item->elementType == 'Delete') {
@@ -10689,7 +10692,7 @@
diff -r 622108627ce6 lib/core.php
--- a/lib/core.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/lib/core.php Mon Oct 27 15:14:20 2008 +0100
++++ b/lib/core.php Mon Oct 27 21:06:48 2008 +0100
@@ -31,6 +31,12 @@
* include_path, you must add an ini_set() call here to add their location to
* the include_path. */
@@ -10705,13 +10708,13 @@
include_once 'PEAR.php';
diff -r 622108627ce6 log/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess Mon Oct 27 15:14:20 2008 +0100
++++ b/log/.htaccess Mon Oct 27 21:06:48 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 622108627ce6 mnemo/config/conf.php
--- a/mnemo/config/conf.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/mnemo/config/conf.php Mon Oct 27 15:14:20 2008 +0100
++++ b/mnemo/config/conf.php Mon Oct 27 21:06:48 2008 +0100
@@ -1,9 +1,8 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -10726,7 +10729,7 @@
$conf['menu']['apps'] = array();
diff -r 622108627ce6 nag/config/conf.php
--- a/nag/config/conf.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/nag/config/conf.php Mon Oct 27 15:14:20 2008 +0100
++++ b/nag/config/conf.php Mon Oct 27 21:06:48 2008 +0100
@@ -1,9 +1,7 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -10738,21 +10741,88 @@
$conf['menu']['print'] = true;
$conf['menu']['import_export'] = true;
$conf['menu']['apps'] = array();
+diff -r 622108627ce6 nag/lib/Driver.php
+--- a/nag/lib/Driver.php Mon Oct 27 15:13:42 2008 +0100
++++ b/nag/lib/Driver.php Mon Oct 27 21:06:48 2008 +0100
+@@ -319,33 +319,40 @@
+
+ $new_task = $this->get($task->id);
+ $log_tasklist = $this->_tasklist;
+- if ($task->tasklist != $tasklist) {
++ if (!is_null($tasklist) && $task->tasklist != $tasklist) {
+ /* Moving the task to another tasklist. */
+ $share = $GLOBALS['nag_shares']->getShare($task->tasklist);
+- if (!is_a($share, 'PEAR_Error') &&
+- $share->hasPermission(Auth::getAuth(), PERMS_DELETE)) {
+- $share = $GLOBALS['nag_shares']->getShare($tasklist);
+- if (!is_a($share, 'PEAR_Error') &&
+- $share->hasPermission(Auth::getAuth(), PERMS_EDIT)) {
+- $moved = $this->_move($task->id, $tasklist);
+- if (is_a($moved, 'PEAR_Error')) {
+- return $moved;
+- }
+- $new_storage = &Nag_Driver::singleton($tasklist);
+- $new_task = $new_storage->get($task->id);
++ if (is_a($share, 'PEAR_Error')) {
++ return $share;
++ }
+
+- /* Log the moving of this item in the history log. */
+- if (!empty($task->uid)) {
+- $history = &Horde_History::singleton();
+- $history->log('nag:' . $task->tasklist . ':' . $task->uid, array('action' => 'delete'), true);
+- $history->log('nag:' . $tasklist . ':' . $task->uid, array('action' => 'add'), true);
+- $log_tasklist = $tasklist;
+- }
+- } else {
+- $GLOBALS['notification']->push(sprintf(_("Access denied moving the task to %s."), $share->get('name')), 'horde.error');
+- }
+- } else {
++ if (!$share->hasPermission(Auth::getAuth(), PERMS_DELETE)) {
+ $GLOBALS['notification']->push(sprintf(_("Access denied removing task from %s."), $share->get('name')), 'horde.error');
++ return false;
++ }
++
++ $share = $GLOBALS['nag_shares']->getShare($tasklist);
++ if (is_a($share, 'PEAR_Error')) {
++ return $share;
++ }
++
++ if (!$share->hasPermission(Auth::getAuth(), PERMS_EDIT)) {
++ $GLOBALS['notification']->push(sprintf(_("Access denied moving the task to %s."), $share->get('name')), 'horde.error');
++ }
++
++ $moved = $this->_move($task->id, $tasklist);
++ if (is_a($moved, 'PEAR_Error')) {
++ return $moved;
++ }
++ $new_storage = &Nag_Driver::singleton($tasklist);
++ $new_task = $new_storage->get($task->id);
++
++ /* Log the moving of this item in the history log. */
++ if (!empty($task->uid)) {
++ $history = &Horde_History::singleton();
++ $history->log('nag:' . $task->tasklist . ':' . $task->uid, array('action' => 'delete'), true);
++ $history->log('nag:' . $tasklist . ':' . $task->uid, array('action' => 'add'), true);
++ $log_tasklist = $tasklist;
+ }
+ }
+
diff -r 622108627ce6 storage/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess Mon Oct 27 15:14:20 2008 +0100
++++ b/storage/.htaccess Mon Oct 27 21:06:48 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 622108627ce6 tmp/.htaccess
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/tmp/.htaccess Mon Oct 27 15:14:20 2008 +0100
++++ b/tmp/.htaccess Mon Oct 27 21:06:48 2008 +0100
@@ -0,0 +1,1 @@
+Deny from All
\ No newline at end of file
diff -r 622108627ce6 turba/config/conf.php
--- a/turba/config/conf.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/turba/config/conf.php Mon Oct 27 15:14:20 2008 +0100
++++ b/turba/config/conf.php Mon Oct 27 21:06:48 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;
@@ -10766,7 +10836,7 @@
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 622108627ce6 turba/config/sources.php
--- a/turba/config/sources.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/turba/config/sources.php Mon Oct 27 15:14:20 2008 +0100
++++ b/turba/config/sources.php Mon Oct 27 21:06:48 2008 +0100
@@ -154,6 +154,8 @@
* Here are some example configurations:
*/
@@ -11027,7 +11097,7 @@
* read-only. The address book content is provided by the
diff -r 622108627ce6 turba/lib/Driver.php
--- a/turba/lib/Driver.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/turba/lib/Driver.php Mon Oct 27 15:14:20 2008 +0100
++++ b/turba/lib/Driver.php Mon Oct 27 21:06:48 2008 +0100
@@ -1466,9 +1466,6 @@
$hash = array();
$attr = $vcard->getAllAttributes();
@@ -11040,7 +11110,7 @@
case 'FN':
diff -r 622108627ce6 turba/lib/Driver/kolab.php
--- a/turba/lib/Driver/kolab.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/turba/lib/Driver/kolab.php Mon Oct 27 15:14:20 2008 +0100
++++ b/turba/lib/Driver/kolab.php Mon Oct 27 21:06:48 2008 +0100
@@ -56,6 +56,7 @@
}
@@ -11051,7 +11121,7 @@
/**
diff -r 622108627ce6 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php Mon Oct 27 15:13:42 2008 +0100
-+++ b/turba/lib/Driver/share.php Mon Oct 27 15:14:20 2008 +0100
++++ b/turba/lib/Driver/share.php Mon Oct 27 21:06:48 2008 +0100
@@ -145,7 +145,7 @@
function _deleteAll($sourceName = null)
{
- Previous message: gunnar: server/patches/cyrus-imapd/cyrus-imapd-2.3.13 KOLAB_cyrus-cyradm-2.3.13_Annotations.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Annotations2.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Folder-names.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Groups2.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_Logging.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_UID.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.13_timsieved_starttls-sendcaps.patch, NONE, 1.1
- Next message: gunnar: server/kolabd/kolabd Makefile.am,1.46,1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list