| 1 |
mrjhb3 |
1.1 |
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 |
| 2 |
|
|
--- 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 |
| 3 |
|
|
+++ 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 |
| 4 |
|
|
@@ -1,6 +1,6 @@ |
| 5 |
|
|
//000preamble |
| 6 |
|
|
/** |
| 7 |
|
|
- * $Horde: imp/config/prefs.php.dist,v 1.216.4.37 2009-11-29 05:27:14 chuck Exp $ |
| 8 |
|
|
+ * $Horde: imp/config/prefs.php.dist,v 1.216.4.38 2010/03/19 17:16:34 slusarz Exp $ |
| 9 |
|
|
* |
| 10 |
|
|
* See horde/config/prefs.php for documentation on the structure of this file. |
| 11 |
|
|
*/ |
| 12 |
|
|
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 |
| 13 |
|
|
--- 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 |
| 14 |
|
|
+++ 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 |
| 15 |
|
|
@@ -2,12 +2,12 @@ |
| 16 |
|
|
// sent mail folder |
| 17 |
|
|
$_prefs['sent_mail_folder'] = array( |
| 18 |
|
|
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC |
| 19 |
|
|
- // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the |
| 20 |
|
|
- // default value entry. |
| 21 |
|
|
+ // 3501 [5.1.3]). |
| 22 |
|
|
+ //'value' => String::convertCharset(_("Sent"), null, 'UTF7-IMAP'), |
| 23 |
|
|
+ // For Exchange, uncomment the entry below. |
| 24 |
|
|
// 'value' => 'Sent Items', |
| 25 |
|
|
- // 'value' => _("Sent"), |
| 26 |
|
|
// value below for SME Server that is consistent from day one |
| 27 |
|
|
- 'value' => 'sent-mail', |
| 28 |
|
|
+ 'value' => String::convertCharset(_("sent-mail"), null, 'UTF7-IMAP'), |
| 29 |
|
|
'locked' => false, |
| 30 |
|
|
'shared' => false, |
| 31 |
|
|
'type' => 'implicit'); |
| 32 |
|
|
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 |
| 33 |
|
|
--- 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 |
| 34 |
|
|
+++ 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 |
| 35 |
|
|
@@ -3,7 +3,7 @@ |
| 36 |
|
|
$_prefs['drafts_folder'] = array( |
| 37 |
|
|
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC |
| 38 |
|
|
// 3501 [5.1.3]). |
| 39 |
|
|
- 'value' => _("Drafts"), |
| 40 |
|
|
+ 'value' => String::convertCharset(_("Drafts"), null, 'UTF7-IMAP'), |
| 41 |
|
|
'locked' => false, |
| 42 |
|
|
'shared' => false, |
| 43 |
|
|
'type' => 'implicit'); |
| 44 |
|
|
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 |
| 45 |
|
|
--- 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 |
| 46 |
|
|
+++ 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 |
| 47 |
|
|
@@ -2,13 +2,13 @@ |
| 48 |
|
|
// trash folder |
| 49 |
|
|
$_prefs['trash_folder'] = array( |
| 50 |
|
|
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC |
| 51 |
|
|
- // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the |
| 52 |
|
|
- // default value entry. |
| 53 |
|
|
+ // 3501 [5.1.3]). |
| 54 |
|
|
+ //'value' => String::convertCharset(_("Trash"), null, 'UTF7-IMAP'), |
| 55 |
|
|
+ // For Exchange, uncomment the entry below. |
| 56 |
|
|
// 'value' => 'Deleted Items', |
| 57 |
|
|
- //'value' => _("Trash"), |
| 58 |
|
|
// Value below for SME Server so that it's consistent from the beginning |
| 59 |
|
|
- 'value' => 'trash', |
| 60 |
|
|
+ 'value' => String::convertCharset(_("trash"), null, 'UTF7-IMAP'), |
| 61 |
|
|
'locked' => false, |
| 62 |
|
|
'shared' => false, |
| 63 |
|
|
'type' => 'implicit'); |
| 64 |
|
|
- |
| 65 |
|
|
+ |
| 66 |
|
|
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 |
| 67 |
|
|
--- 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 |
| 68 |
|
|
+++ 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 |
| 69 |
|
|
@@ -3,7 +3,7 @@ |
| 70 |
|
|
$_prefs['spam_folder'] = array( |
| 71 |
|
|
// The mailbox value must be encoded in the UTF7-IMAP charset (see RFC |
| 72 |
|
|
// 3501 [5.1.3]). |
| 73 |
|
|
- 'value' => _("Spam"), |
| 74 |
|
|
+ 'value' => String::convertCharset(_("Spam"), null, 'UTF7-IMAP'), |
| 75 |
|
|
'locked' => false, |
| 76 |
|
|
'shared' => false, |
| 77 |
|
|
'type' => 'implicit'); |
Parent Directory
| 
Revision Log
| 
Revision Graph
