diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header	2006-09-10 18:18:26.000000000 -0500
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header	2006-09-09 22:53:22.000000000 -0500
@@ -1,2 +1,2 @@
 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: horde/config/conf.xml,v 1.74.2.14.2.1 2006/06/11 18:41:05 chuck Exp $
+// $Horde: horde/config/conf.xml,v 1.74.2.41 2006/08/04 17:13:25 jan Exp $
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120AdminAuthentication mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120AdminAuthentication
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120AdminAuthentication	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120AdminAuthentication	2006-09-09 22:22:49.000000000 -0500
@@ -0,0 +1,2 @@
+// 120AdminAuthentication
+$conf['auth']['admins'] = array('admin@{$DomainName}');
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120Authentication mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120Authentication
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120Authentication	2006-03-15 17:51:23.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/120Authentication	1969-12-31 18:00:00.000000000 -0600
@@ -1,5 +0,0 @@
-// 120Authentication
-$conf['auth']['admins'] = array();
-$conf['auth']['checkip'] = true;
-$conf['auth']['params']['app'] = 'imp';
-$conf['auth']['driver'] = 'application';
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/125Authentication mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/125Authentication
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/125Authentication	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/125Authentication	2006-09-09 22:24:17.000000000 -0500
@@ -0,0 +1,8 @@
+// 125Authentication
+$conf['auth']['checkip'] = true;
+$conf['auth']['checkbrowser'] = true;
+$conf['auth']['alternate_login'] = false;
+$conf['auth']['redirect_on_logout'] = false;
+$conf['auth']['params']['app'] = 'imp';
+$conf['auth']['driver'] = 'application';
+
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/160PreferenceSystem mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/160PreferenceSystem
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/160PreferenceSystem	2006-03-15 17:51:23.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/160PreferenceSystem	2006-09-09 22:29:36.000000000 -0500
@@ -3,6 +3,7 @@
 $conf['prefs']['params']['driverconfig'] = 'horde';
 $conf['prefs']['driver'] = 'sql';
 $conf['datatree']['params']['table'] = 'horde_datatree';
+$conf['datatree']['params']['table_attributes'] = 'horde_datatree_attributes';
 $conf['datatree']['params']['driverconfig'] = 'horde';
 $conf['datatree']['driver'] = 'sql';
 $conf['group']['driver'] = 'datatree';
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/200CacheSystem mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/200CacheSystem
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/200CacheSystem	2006-03-15 17:51:23.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/200CacheSystem	2006-09-09 22:30:26.000000000 -0500
@@ -1,5 +1,6 @@
 // 200CacheSystem
 $conf['cache']['default_lifetime'] = 1800;
 $conf['cache']['params']['dir'] = Horde::getTempDir();
+$conf['cache']['params']['gc'] = 86400;
 $conf['cache']['driver'] = 'file';
 $conf['token']['driver'] = 'none';
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/240ProblemReporting mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/240ProblemReporting
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/240ProblemReporting	2006-03-15 17:51:24.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/240ProblemReporting	2006-09-09 22:33:33.000000000 -0500
@@ -1,2 +1,4 @@
 // 240ProblemReporting
 $conf['problems']['email'] = 'admin@{ $DomainName }';
+$conf['problems']['maildomain'] = '{ $DomainName }';
+$conf['problems']['tickets'] = false;
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/300MenuSettings mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/300MenuSettings
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/300MenuSettings	2006-03-15 17:51:23.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/300MenuSettings	2006-09-09 22:36:52.000000000 -0500
@@ -1,6 +1,7 @@
 // 300MenuSettings
 $conf['menu']['always'] = false;
 $conf['menu']['links']['help'] = 'all';
+$conf['menu']['links']['help_about'] = true;
 $conf['menu']['links']['options'] = 'authenticated';
 $conf['menu']['links']['problem'] = 'never';
 $conf['menu']['links']['login'] = 'all';
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock	2006-09-09 22:51:37.000000000 -0500
@@ -0,0 +1,4 @@
+// 330PortalBlock
+$conf['portal']['fixed_blocks'] = array();
+$conf['accounts']['driver'] = 'null';
+
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/340Kolab mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/340Kolab
--- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/340Kolab	2006-03-15 17:51:24.000000000 -0600
+++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/340Kolab	2006-09-09 22:39:51.000000000 -0500
@@ -1,3 +1,4 @@
 // 340Kolab
-$conf['kolab']['enabled'] = false;
 $conf['imsp']['enabled'] = false;
+$conf['kolab']['enabled'] = false;
+