1 |
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 |
2 |
--- 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 |
3 |
+++ 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 |
4 |
@@ -1,2 +1,2 @@ |
5 |
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ |
6 |
-// $Horde: horde/config/conf.xml,v 1.74.2.14.2.1 2006/06/11 18:41:05 chuck Exp $ |
7 |
+// $Horde: horde/config/conf.xml,v 1.74.2.41 2006/08/04 17:13:25 jan Exp $ |
8 |
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 |
9 |
--- 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 |
10 |
+++ 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 |
11 |
@@ -0,0 +1,2 @@ |
12 |
+// 120AdminAuthentication |
13 |
+$conf['auth']['admins'] = array('admin@{$DomainName}'); |
14 |
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 |
15 |
--- 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 |
16 |
+++ 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 |
17 |
@@ -1,5 +0,0 @@ |
18 |
-// 120Authentication |
19 |
-$conf['auth']['admins'] = array(); |
20 |
-$conf['auth']['checkip'] = true; |
21 |
-$conf['auth']['params']['app'] = 'imp'; |
22 |
-$conf['auth']['driver'] = 'application'; |
23 |
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 |
24 |
--- 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 |
25 |
+++ 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 |
26 |
@@ -0,0 +1,8 @@ |
27 |
+// 125Authentication |
28 |
+$conf['auth']['checkip'] = true; |
29 |
+$conf['auth']['checkbrowser'] = true; |
30 |
+$conf['auth']['alternate_login'] = false; |
31 |
+$conf['auth']['redirect_on_logout'] = false; |
32 |
+$conf['auth']['params']['app'] = 'imp'; |
33 |
+$conf['auth']['driver'] = 'application'; |
34 |
+ |
35 |
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 |
36 |
--- 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 |
37 |
+++ 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 |
38 |
@@ -3,6 +3,7 @@ |
39 |
$conf['prefs']['params']['driverconfig'] = 'horde'; |
40 |
$conf['prefs']['driver'] = 'sql'; |
41 |
$conf['datatree']['params']['table'] = 'horde_datatree'; |
42 |
+$conf['datatree']['params']['table_attributes'] = 'horde_datatree_attributes'; |
43 |
$conf['datatree']['params']['driverconfig'] = 'horde'; |
44 |
$conf['datatree']['driver'] = 'sql'; |
45 |
$conf['group']['driver'] = 'datatree'; |
46 |
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 |
47 |
--- 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 |
48 |
+++ 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 |
49 |
@@ -1,5 +1,6 @@ |
50 |
// 200CacheSystem |
51 |
$conf['cache']['default_lifetime'] = 1800; |
52 |
$conf['cache']['params']['dir'] = Horde::getTempDir(); |
53 |
+$conf['cache']['params']['gc'] = 86400; |
54 |
$conf['cache']['driver'] = 'file'; |
55 |
$conf['token']['driver'] = 'none'; |
56 |
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 |
57 |
--- 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 |
58 |
+++ 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 |
59 |
@@ -1,2 +1,4 @@ |
60 |
// 240ProblemReporting |
61 |
$conf['problems']['email'] = 'admin@{ $DomainName }'; |
62 |
+$conf['problems']['maildomain'] = '{ $DomainName }'; |
63 |
+$conf['problems']['tickets'] = false; |
64 |
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 |
65 |
--- 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 |
66 |
+++ 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 |
67 |
@@ -1,6 +1,7 @@ |
68 |
// 300MenuSettings |
69 |
$conf['menu']['always'] = false; |
70 |
$conf['menu']['links']['help'] = 'all'; |
71 |
+$conf['menu']['links']['help_about'] = true; |
72 |
$conf['menu']['links']['options'] = 'authenticated'; |
73 |
$conf['menu']['links']['problem'] = 'never'; |
74 |
$conf['menu']['links']['login'] = 'all'; |
75 |
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 |
76 |
--- 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 |
77 |
+++ 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 |
78 |
@@ -0,0 +1,4 @@ |
79 |
+// 330PortalBlock |
80 |
+$conf['portal']['fixed_blocks'] = array(); |
81 |
+$conf['accounts']['driver'] = 'null'; |
82 |
+ |
83 |
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 |
84 |
--- 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 |
85 |
+++ 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 |
86 |
@@ -1,3 +1,4 @@ |
87 |
// 340Kolab |
88 |
-$conf['kolab']['enabled'] = false; |
89 |
$conf['imsp']['enabled'] = false; |
90 |
+$conf['kolab']['enabled'] = false; |
91 |
+ |