1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header |
2 |
--- e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header 2006-03-15 20:55:05.000000000 -0600 |
3 |
+++ mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header 2006-09-16 07:36:12.000000000 -0500 |
4 |
@@ -1,3 +1,3 @@ |
5 |
// 00header |
6 |
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ |
7 |
-// $Horde: imp/config/conf.xml,v 1.53 2004/12/09 15:33:27 slusarz Exp $ |
8 |
+// $Horde: imp/config/conf.xml,v 1.53.2.13 2006/06/14 18:11:23 chuck Exp $ |
9 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/120MenuSettings mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/120MenuSettings |
10 |
--- e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/120MenuSettings 2006-03-15 20:55:05.000000000 -0600 |
11 |
+++ mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/120MenuSettings 2006-09-16 07:36:23.000000000 -0500 |
12 |
@@ -1,3 +1,2 @@ |
13 |
// 120MenuSettings |
14 |
$conf['menu']['apps'] = array('turba'); |
15 |
- |
16 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/140UserCapabilities mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/140UserCapabilities |
17 |
--- e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/140UserCapabilities 2006-03-15 20:55:05.000000000 -0600 |
18 |
+++ mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/140UserCapabilities 2006-09-16 07:49:42.000000000 -0500 |
19 |
@@ -1,8 +1,8 @@ |
20 |
// 140UserCapabilities |
21 |
+$conf['user']['select_sentmail_folder'] = false; |
22 |
+$conf['user']['allow_resume_all_in_drafts'] = true; |
23 |
$conf['user']['allow_folders'] = true; |
24 |
-$conf['user']['allow_view_source'] = true; |
25 |
$conf['user']['allow_resume_all'] = false; |
26 |
-$conf['user']['allow_resume_all_in_drafts'] = true; |
27 |
+$conf['user']['allow_view_source'] = true; |
28 |
$conf['user']['alternate_login'] = false; |
29 |
$conf['user']['redirect_on_logout'] = false; |
30 |
-$conf['user']['select_sentmail_folder'] = false; |
31 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/160MailServerSettings mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/160MailServerSettings |
32 |
--- e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/160MailServerSettings 2006-03-15 20:55:05.000000000 -0600 |
33 |
+++ mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/160MailServerSettings 2006-09-16 07:54:48.000000000 -0500 |
34 |
@@ -1,8 +1,9 @@ |
35 |
// 160MailServerSettings |
36 |
$conf['server']['server_list'] = 'none'; |
37 |
$conf['server']['change_server'] = false; |
38 |
-$conf['server']['change_port'] = false; |
39 |
+$conf['server']['change_port'] = false; |
40 |
$conf['server']['change_protocol'] = false; |
41 |
-$conf['server']['change_folders'] = false; |
42 |
+$conf['server']['change_folders'] = false; |
43 |
$conf['server']['sort_limit'] = '0'; |
44 |
$conf['server']['cache_folders'] = false; |
45 |
+$conf['server']['cache_msgbody'] = false; |
46 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/240ComposeSettings mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/240ComposeSettings |
47 |
--- e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/240ComposeSettings 2006-03-15 20:55:05.000000000 -0600 |
48 |
+++ mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/240ComposeSettings 2006-09-16 08:03:04.000000000 -0500 |
49 |
@@ -5,7 +5,8 @@ |
50 |
$conf['compose']['allow_receipts'] = true; |
51 |
$conf['compose']['special_characters'] = true; |
52 |
$conf['compose']['link_all_attachments'] = false; |
53 |
+$conf['compose']['link_attachments_notify'] = true; |
54 |
$conf['compose']['link_attachments'] = true; |
55 |
$conf['compose']['add_maildomain_to_unexpandable'] = false; |
56 |
-$conf['compose']['attach_size_limit'] = '0'; |
57 |
+$conf['compose']['attach_size_limit'] = '0'; |
58 |
$conf['compose']['attach_count_limit'] = '0'; |
59 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/280Other mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/280Other |
60 |
--- e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/280Other 2006-03-15 20:55:05.000000000 -0600 |
61 |
+++ mezzanine_patched_e-smith-imp-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/280Other 2006-09-16 08:03:29.000000000 -0500 |
62 |
@@ -1,3 +1,4 @@ |
63 |
// 280Other |
64 |
$conf['maillog']['use_maillog'] = true; |
65 |
$conf['tasklist']['use_tasklist'] = true; |
66 |
+$conf['notepad']['use_notepad'] = true; |