gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_fbview_openpkg.patch, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Thu Sep 18 21:10:15 CEST 2008
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv23546
Modified Files:
horde-webmail-1.2.0_kolab_fbview_openpkg.patch
Log Message:
Some basic fixes to the fbview configuration.
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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-webmail-1.2.0_kolab_fbview_openpkg.patch 18 Sep 2008 18:56:48 -0000 1.1
+++ horde-webmail-1.2.0_kolab_fbview_openpkg.patch 18 Sep 2008 19:10:13 -0000 1.2
@@ -1,6 +1,196 @@
+diff -r 85d33de56004 config/conf.php
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/config/conf.php Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,115 @@
++<?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 $
++$conf['vhosts'] = false;
++$conf['debug_level'] = E_ALL;
++$conf['max_exec_time'] = 0;
++$conf['compress_pages'] = true;
++$conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
++$conf['umask'] = 077;
++$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
++$conf['use_ssl'] = 2;
++$conf['server']['name'] = $_SERVER['SERVER_NAME'];
++$conf['server']['port'] = $_SERVER['SERVER_PORT'];
++$conf['urls']['pretty'] = false;
++$conf['safe_ips'] = array();
++$conf['session']['name'] = 'Horde';
++$conf['session']['use_only_cookies'] = false;
++$conf['session']['cache_limiter'] = 'nocache';
++$conf['session']['timeout'] = 0;
++$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
++$conf['cookie']['path'] = '/';
++$conf['sql']['database'] = dirname(__FILE__) . '/../storage/horde.db';
++$conf['sql']['mode'] = '0640';
++$conf['sql']['charset'] = 'utf-8';
++$conf['sql']['phptype'] = 'sqlite';
++$conf['auth']['admins'] = array('manager');
++$conf['auth']['checkip'] = true;
++$conf['auth']['checkbrowser'] = true;
++$conf['auth']['alternate_login'] = false;
++$conf['auth']['redirect_on_logout'] = false;
++$conf['auth']['params']['login_block'] = true;
++$conf['auth']['params']['login_block_count'] = 3;
++$conf['auth']['params']['login_block_time'] = 5;
++$conf['auth']['driver'] = 'kolab';
++$conf['signup']['allow'] = false;
++$conf['log']['priority'] = PEAR_LOG_DEBUG;
++$conf['log']['ident'] = 'HORDE';
++$conf['log']['params'] = array();
++$conf['log']['name'] = dirname(__FILE__) . '/../log/horde.log';
++$conf['log']['params']['append'] = true;
++$conf['log']['type'] = 'file';
++$conf['log']['enabled'] = true;
++$conf['log_accesskeys'] = false;
++$conf['prefs']['driver'] = 'kolab';
++$conf['alarms']['params']['driverconfig'] = 'horde';
++$conf['alarms']['params']['ttl'] = 300;
++$conf['alarms']['driver'] = 'sql';
++$conf['datatree']['params']['driverconfig'] = 'horde';
++$conf['datatree']['driver'] = 'sql';
++$conf['group']['driver'] = 'kolab';
++$conf['group']['cache'] = false;
++$conf['perms']['driverconfig'] = 'horde';
++$conf['perms']['driver'] = 'sql';
++$conf['share']['no_sharing'] = false;
++$conf['share']['any_group'] = false;
++$conf['share']['cache'] = true;
++$conf['share']['driver'] = 'kolab';
++$conf['cache']['default_lifetime'] = 1800;
++$conf['cache']['params']['dir'] = Horde::getTempDir();
++$conf['cache']['params']['sub'] = 0;
++$conf['cache']['driver'] = 'file';
++$conf['lock']['driver'] = 'none';
++$conf['token']['driver'] = 'none';
++$conf['mailer']['params']['host'] = 'localhost';
++$conf['mailer']['params']['port'] = 25;
++$conf['mailer']['params']['auth'] = true;
++$conf['mailer']['type'] = 'smtp';
++$conf['mailformat']['brokenrfc2231'] = false;
++$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../storage';
++$conf['vfs']['type'] = 'file';
++$conf['sessionhandler']['type'] = 'none';
++$conf['sessionhandler']['memcache'] = false;
++$conf['image']['convert'] = '/usr/bin/convert';
++$conf['mime']['magic_db'] = '/etc/mime.types';
++$conf['problems']['email'] = 'webmaster at example.com';
++$conf['problems']['maildomain'] = 'example.com';
++$conf['problems']['tickets'] = false;
++$conf['problems']['attachments'] = true;
++$conf['menu']['apps'] = array();
++$conf['menu']['always'] = false;
++$conf['menu']['links']['help'] = 'all';
++$conf['menu']['links']['options'] = 'authenticated';
++$conf['menu']['links']['problem'] = 'all';
++$conf['menu']['links']['login'] = 'all';
++$conf['menu']['links']['logout'] = 'authenticated';
++$conf['hooks']['permsdenied'] = false;
++$conf['hooks']['username'] = false;
++$conf['hooks']['preauthenticate'] = false;
++$conf['hooks']['postauthenticate'] = false;
++$conf['hooks']['authldap'] = false;
++$conf['hooks']['groupldap'] = false;
++$conf['portal']['fixed_blocks'] = array();
++$conf['accounts']['driver'] = 'null';
++$conf['user']['verify_from_addr'] = false;
++$conf['imsp']['enabled'] = false;
++$conf['kolab']['ldap']['server'] = 'localhost';
++$conf['kolab']['ldap']['port'] = 389;
++$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
++$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
++$conf['kolab']['ldap']['phppw'] = 'dummy';
++$conf['kolab']['imap']['server'] = 'localhost';
++$conf['kolab']['imap']['port'] = 143;
++$conf['kolab']['imap']['sieveport'] = 2000;
++$conf['kolab']['imap']['maildomain'] = 'example.com';
++$conf['kolab']['imap']['virtdomains'] = true;
++$conf['kolab']['smtp']['server'] = 'localhost';
++$conf['kolab']['smtp']['port'] = 25;
++$conf['kolab']['misc']['multidomain'] = false;
++$conf['kolab']['cache_folders'] = true;
++$conf['kolab']['enabled'] = true;
++$conf['memcache']['enabled'] = false;
++/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
++if (file_exists(dirname(__FILE__) . '/kolab.php')) {
++ require_once(dirname(__FILE__) . '/kolab.php');
++}
+diff -r 85d33de56004 config/kolab.php
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/config/kolab.php Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,37 @@
++<?php
++/* Add additional admins here */
++$conf['auth']['admins'] = array('manager');
++
++/* Add your servers random secret key here */
++$conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
++
++/* Add your horde vhost hostname here */
++$conf['cookie']['domain'] = 'webmail.example.com';
++
++/* Add the path to the vhost install here (the value of the -d switch when you used webapp-config) */
++$conf['cookie']['path'] = '/';
++
++/* The email address of your sys admin */
++$conf['problems']['email'] = 'hostmaster at example.com';
++
++/* Primary mail domain of your Kolab server */
++$conf['problems']['maildomain'] = 'pardus.de';
++
++/* The hostname of your LDAP server (usually the same as the hostname of the Kolab server) */
++$conf['kolab']['ldap']['server'] = 'localhost';
++
++/* Base DN of your LDAP server */
++$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
++
++/* php_dn from your /kolab/etc/kolab/kolab.conf */
++$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
++
++/* php_pw from your /kolab/etc/kolab/kolab.conf */
++$conf['kolab']['ldap']['phppw'] = 'MY_SECRET_PASSWORD';
++
++/* Hostname of your IMAP server (usually the same as the hostname of the Kolab server) */
++$conf['kolab']['imap']['server'] = 'localhost';
++
++/* Primary mail domain of your Kolab server */
++$conf['kolab']['imap']['maildomain'] = 'example.com';
++?>
+diff -r 85d33de56004 config/prefs.php
+--- a/config/prefs.php Thu Sep 18 20:48:11 2008 +0200
++++ b/config/prefs.php Thu Sep 18 21:09:53 2008 +0200
+@@ -357,7 +357,7 @@
+
+ // UI theme
+ $_prefs['theme'] = array(
+- 'value' => 'bluewhite',
++ 'value' => 'silver',
+ 'locked' => false,
+ 'shared' => true,
+ 'type' => 'select',
+@@ -400,7 +400,7 @@
+ );
+
+ $_prefs['show_sidebar'] = array(
+- 'value' => true,
++ 'value' => false,
+ 'locked' => false,
+ 'shared' => true,
+ 'type' => 'checkbox',
+@@ -488,7 +488,7 @@
+
+ // what application should we go to after login?
+ $_prefs['initial_application'] = array(
+- 'value' => 'horde',
++ 'value' => 'kronolith',
+ 'locked' => false,
+ 'shared' => true,
+ 'type' => 'select',
diff -r 85d33de56004 kronolith/attendees.php
--- a/kronolith/attendees.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/attendees.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/attendees.php Thu Sep 18 21:09:53 2008 +0200
@@ -178,6 +178,16 @@
$attendees = array();
$_SESSION['kronolith']['attendees'] = $attendees;
@@ -36,7 +226,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/create.php
--- a/kronolith/calendars/create.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/create.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/create.php Thu Sep 18 21:09:53 2008 +0200
@@ -39,6 +39,6 @@
$title = $form->getTitle();
@@ -47,7 +237,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/delete.php
--- a/kronolith/calendars/delete.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/delete.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/delete.php Thu Sep 18 21:09:53 2008 +0200
@@ -56,6 +56,6 @@
$title = $form->getTitle();
@@ -58,7 +248,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/edit.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/edit.php Thu Sep 18 21:09:53 2008 +0200
@@ -53,8 +53,12 @@
$vars->set('name', $calendar->get('name'));
@@ -75,7 +265,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/index.php
--- a/kronolith/calendars/index.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/index.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/index.php Thu Sep 18 21:09:53 2008 +0200
@@ -73,6 +73,6 @@
Horde::addScriptFile('tables.js', 'kronolith', true);
$title = _("Manage Calendars");
@@ -86,7 +276,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/remote_edit.php
--- a/kronolith/calendars/remote_edit.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/remote_edit.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/remote_edit.php Thu Sep 18 21:09:53 2008 +0200
@@ -68,6 +68,6 @@
$vars->set('password', $password);
$title = $form->getTitle();
@@ -97,7 +287,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/remote_subscribe.php
--- a/kronolith/calendars/remote_subscribe.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/remote_subscribe.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/remote_subscribe.php Thu Sep 18 21:09:53 2008 +0200
@@ -39,6 +39,6 @@
$title = $form->getTitle();
@@ -108,7 +298,7 @@
require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/remote_unsubscribe.php
--- a/kronolith/calendars/remote_unsubscribe.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/remote_unsubscribe.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/remote_unsubscribe.php Thu Sep 18 21:09:53 2008 +0200
@@ -56,6 +56,6 @@
$vars->set('url', $calendar['url']);
$title = $form->getTitle();
@@ -117,9 +307,60 @@
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
echo $form->renderActive($form->getRenderer(), $vars, 'remote_unsubscribe.php', 'post');
require $registry->get('templates', 'horde') . '/common-footer.inc';
+diff -r 85d33de56004 kronolith/config/conf.php
+--- a/kronolith/config/conf.php Thu Sep 18 20:48:11 2008 +0200
++++ b/kronolith/config/conf.php Thu Sep 18 21:09:53 2008 +0200
+@@ -1,12 +1,11 @@
+ <?php
+ /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+ // $Horde: kronolith/config/conf.xml,v 1.14.10.5 2007/12/20 14:12:23 jan Exp $
+-$conf['calendar']['params']['table'] = 'kronolith_events';
+-$conf['calendar']['params']['driverconfig'] = 'horde';
+-$conf['calendar']['driver'] = 'sql';
+-$conf['storage']['params']['table'] = 'kronolith_storage';
+-$conf['storage']['params']['driverconfig'] = 'horde';
+-$conf['storage']['driver'] = 'sql';
++$conf['calendar']['driver'] = 'kolab';
++$conf['storage']['driver'] = 'kolab';
++$conf['storage']['default_domain'] = '';
++$conf['storage']['freebusy']['protocol'] = 'https';
++$conf['storage']['freebusy']['port'] = 443;
+ $conf['metadata']['keywords'] = false;
+ $conf['autoshare']['shareperms'] = 'none';
+ $conf['holidays']['enable'] = true;
+@@ -14,3 +13,6 @@
+ $conf['menu']['import_export'] = true;
+ $conf['menu']['apps'] = array();
+ /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
++if (file_exists(dirname(__FILE__) . '/kolab.php')) {
++ require_once(dirname(__FILE__) . '/kolab.php');
++}
+diff -r 85d33de56004 kronolith/config/kolab.php
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/kronolith/config/kolab.php Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,10 @@
++<?php
++/* Primary mail domain of your Kolab server */
++$conf['storage']['default_domain'] = 'example.com';
++
++/* Hostname of your IMAP server (usually the same as the hostname of the Kolab server) */
++$conf['reminder']['server_name'] = 'localhost';
++
++/* The email address of your sys admin */
++$conf['reminder']['from_addr'] = 'hostmaster at example.com';
++?>
diff -r 85d33de56004 kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/config/prefs.php.dist Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/config/prefs.php.dist Thu Sep 18 21:09:53 2008 +0200
+@@ -89,7 +89,7 @@
+
+ // default view
+ $_prefs['defaultview'] = array(
+- 'value' => 'month',
++ 'value' => 'attendees',
+ 'locked' => false,
+ 'shared' => false,
+ 'type' => 'enum',
@@ -457,6 +457,14 @@
'shared' => false,
'type' => 'implicit'
@@ -137,7 +378,7 @@
'locked' => false,
diff -r 85d33de56004 kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/FBView.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/FBView.php Thu Sep 18 21:09:53 2008 +0200
@@ -87,7 +87,7 @@
$rows = '';
foreach ($this->_requiredMembers as $member) {
@@ -209,7 +450,7 @@
} else {
diff -r 85d33de56004 kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/Forms/CreateCalendar.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/Forms/CreateCalendar.php Thu Sep 18 21:09:53 2008 +0200
@@ -35,6 +35,9 @@
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -230,7 +471,7 @@
diff -r 85d33de56004 kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/Forms/EditCalendar.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/Forms/EditCalendar.php Thu Sep 18 21:09:53 2008 +0200
@@ -42,6 +42,9 @@
$this->addHidden('', 'c', 'text', true);
$this->addVariable(_("Name"), 'name', 'text', true);
@@ -251,7 +492,7 @@
$result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));
diff -r 85d33de56004 kronolith/lib/Kronolith.php
--- a/kronolith/lib/Kronolith.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/Kronolith.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/Kronolith.php Thu Sep 18 21:09:53 2008 +0200
@@ -2098,6 +2098,33 @@
}
@@ -288,7 +529,7 @@
function _sortEventStartTime($a, $b)
diff -r 85d33de56004 kronolith/perms.php
--- a/kronolith/perms.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/perms.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/perms.php Thu Sep 18 21:09:53 2008 +0200
@@ -14,6 +14,34 @@
@define('KRONOLITH_BASE', dirname(__FILE__));
require_once KRONOLITH_BASE . '/lib/base.php';
@@ -360,7 +601,7 @@
$notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
diff -r 85d33de56004 kronolith/savedattlist.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/savedattlist.php Thu Sep 18 21:09:53 2008 +0200
@@ -0,0 +1,77 @@
+<?php
+/**
@@ -441,7 +682,7 @@
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/templates/attendees/attendees.inc Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/attendees/attendees.inc Thu Sep 18 21:09:53 2008 +0200
@@ -92,6 +92,8 @@
<div>
<input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -453,7 +694,7 @@
diff -r 85d33de56004 kronolith/templates/fbview-menu.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/fbview-menu.inc Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/fbview-menu.inc Thu Sep 18 21:09:53 2008 +0200
@@ -0,0 +1,4 @@
+<div id="menu">
+ <?php echo Kronolith::getFbviewMenu('string') ?>
@@ -461,7 +702,7 @@
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff -r 85d33de56004 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 Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/javascript/open_savedattlist_win.js Thu Sep 18 21:09:53 2008 +0200
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
@@ -501,7 +742,7 @@
+<?php endif; ?>
diff -r 85d33de56004 kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/templates/perms/perms.inc Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/perms/perms.inc Thu Sep 18 21:09:53 2008 +0200
@@ -322,6 +322,61 @@
<td> </td>
</tr>
@@ -566,7 +807,7 @@
</tr>
diff -r 85d33de56004 kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/savedattlist/savedattlist.inc Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/savedattlist/savedattlist.inc Thu Sep 18 21:09:53 2008 +0200
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
@@ -638,7 +879,7 @@
+</form>
diff -r 85d33de56004 lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/lib/Horde/Kolab/Storage/Folder.php Thu Sep 18 20:56:25 2008 +0200
++++ b/lib/Horde/Kolab/Storage/Folder.php Thu Sep 18 21:09:53 2008 +0200
@@ -40,6 +40,13 @@
*/
define('KOLAB_ANNOT_FOLDER_TYPE', KOLAB_ANNOT_ROOT . 'folder-type');
@@ -790,7 +1031,7 @@
}
diff -r 85d33de56004 lib/Horde/Share/kolab.php
--- a/lib/Horde/Share/kolab.php Thu Sep 18 20:48:11 2008 +0200
-+++ b/lib/Horde/Share/kolab.php Thu Sep 18 20:56:25 2008 +0200
++++ b/lib/Horde/Share/kolab.php Thu Sep 18 21:09:53 2008 +0200
@@ -525,6 +525,13 @@
$default = array('source' => 'kolab',
'default' => $this->get('default'),
@@ -805,3 +1046,37 @@
if (is_a($params, 'PEAR_Error') || $params == '') {
$params = $default;
}
+diff -r 85d33de56004 lib/core.php
+--- a/lib/core.php Thu Sep 18 20:48:11 2008 +0200
++++ b/lib/core.php Thu Sep 18 21:09:53 2008 +0200
+@@ -31,6 +31,12 @@
+ * include_path, you must add an ini_set() call here to add their location to
+ * the include_path. */
+ ini_set('include_path', dirname(__FILE__) . PATH_SEPARATOR . dirname(__FILE__) . '/../pear');
++ini_set('log_errors', true);
++ini_set('display_errors', '0');
++ini_set('error_log', dirname(__FILE__) . '/../log/php-errors.log');
++session_save_path(dirname(__FILE__) . '/../tmp/');
++ini_set('upload_tmp_dir', dirname(__FILE__) . '/../tmp/');
++putenv('TMPDIR=' . dirname(__FILE__) . '/../tmp/');
+
+ /* PEAR base class. */
+ include_once 'PEAR.php';
+diff -r 85d33de56004 log/.htaccess
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/log/.htaccess Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,1 @@
++Deny from All
+\ No newline at end of file
+diff -r 85d33de56004 storage/.htaccess
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/storage/.htaccess Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,1 @@
++Deny from All
+\ No newline at end of file
+diff -r 85d33de56004 tmp/.htaccess
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/tmp/.htaccess Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,1 @@
++Deny from All
+\ No newline at end of file
More information about the commits
mailing list