-
Notifications
You must be signed in to change notification settings - Fork 0
/
e-smith-imp-4.3.7.patch
77 lines (77 loc) · 5.08 KB
/
e-smith-imp-4.3.7.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header
--- e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header 2010-04-27 22:16:24.000000000 -0500
+++ mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header 2010-04-27 22:06:16.000000000 -0500
@@ -1,6 +1,6 @@
//000preamble
/**
- * $Horde: imp/config/prefs.php.dist,v 1.216.4.37 2009-11-29 05:27:14 chuck Exp $
+ * $Horde: imp/config/prefs.php.dist,v 1.216.4.38 2010/03/19 17:16:34 slusarz Exp $
*
* See horde/config/prefs.php for documentation on the structure of this file.
*/
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder
--- e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder 2010-04-27 22:16:24.000000000 -0500
+++ mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder 2010-04-27 22:10:50.000000000 -0500
@@ -2,12 +2,12 @@
// sent mail folder
$_prefs['sent_mail_folder'] = array(
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
- // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the
- // default value entry.
+ // 3501 [5.1.3]).
+ //'value' => String::convertCharset(_("Sent"), null, 'UTF7-IMAP'),
+ // For Exchange, uncomment the entry below.
// 'value' => 'Sent Items',
- // 'value' => _("Sent"),
// value below for SME Server that is consistent from day one
- 'value' => 'sent-mail',
+ 'value' => String::convertCharset(_("sent-mail"), null, 'UTF7-IMAP'),
'locked' => false,
'shared' => false,
'type' => 'implicit');
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder
--- e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder 2010-04-27 22:16:24.000000000 -0500
+++ mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder 2010-04-27 22:11:24.000000000 -0500
@@ -3,7 +3,7 @@
$_prefs['drafts_folder'] = array(
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
// 3501 [5.1.3]).
- 'value' => _("Drafts"),
+ 'value' => String::convertCharset(_("Drafts"), null, 'UTF7-IMAP'),
'locked' => false,
'shared' => false,
'type' => 'implicit');
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder
--- e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder 2010-04-27 22:16:24.000000000 -0500
+++ mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder 2010-04-27 22:13:57.000000000 -0500
@@ -2,13 +2,13 @@
// trash folder
$_prefs['trash_folder'] = array(
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
- // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the
- // default value entry.
+ // 3501 [5.1.3]).
+ //'value' => String::convertCharset(_("Trash"), null, 'UTF7-IMAP'),
+ // For Exchange, uncomment the entry below.
// 'value' => 'Deleted Items',
- //'value' => _("Trash"),
// Value below for SME Server so that it's consistent from the beginning
- 'value' => 'trash',
+ 'value' => String::convertCharset(_("trash"), null, 'UTF7-IMAP'),
'locked' => false,
'shared' => false,
'type' => 'implicit');
-
+
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder
--- e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder 2010-04-27 22:16:24.000000000 -0500
+++ mezzanine_patched_e-smith-imp-5.2.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder 2010-04-27 22:14:34.000000000 -0500
@@ -3,7 +3,7 @@
$_prefs['spam_folder'] = array(
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
// 3501 [5.1.3]).
- 'value' => _("Spam"),
+ 'value' => String::convertCharset(_("Spam"), null, 'UTF7-IMAP'),
'locked' => false,
'shared' => false,
'type' => 'implicit');