/[smeserver]/rpms/e-smith-imp/sme7/e-smith-imp_imp-4.3.patch
ViewVC logotype

Annotation of /rpms/e-smith-imp/sme7/e-smith-imp_imp-4.3.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Sat Dec 6 21:30:32 2008 UTC (15 years, 11 months ago) by mrjhb3
Branch: MAIN
CVS Tags: e-smith-imp-5_0_0-7_el4_sme, e-smith-imp-5_0_0-4_el4_sme, e-smith-imp-5_0_0-5_el4_sme, e-smith-imp-5_0_0-6_el4_sme, e-smith-imp-5_0_0-3_el4_sme, HEAD 
Please see changelog
1 mrjhb3 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header
2     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header 2008-05-25 04:07:03.000000000 -0500
3     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/conf.php/00header 2008-10-04 11:39:03.000000000 -0500
4     @@ -1,4 +1,4 @@
5     // 00header
6     /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
7     -// $Horde: imp/config/conf.xml,v 1.53.2.33 2008/05/06 17:54:04 slusarz Exp $
8     +// $Horde: imp/config/conf.xml,v 1.53.2.39 2008/09/03 18:56:45 slusarz Exp $
9    
10     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header
11     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header 2008-04-21 23:00:10.000000000 -0500
12     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header 2008-10-04 11:30:46.000000000 -0500
13     @@ -8,7 +8,7 @@
14     *
15     * For more information please see the horde/config/hooks.php.dist file.
16     *
17     - * $Horde: imp/config/hooks.php.dist,v 1.3.2.4 2008/03/10 17:13:06 slusarz Exp $
18     + * $Horde: imp/config/hooks.php.dist,v 1.3.2.5 2008/06/05 09:04:14 jan Exp $
19     */
20    
21    
22     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header
23     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header 2008-06-07 20:51:02.000000000 -0500
24     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header 2008-10-01 21:55:47.000000000 -0500
25     @@ -1,6 +1,6 @@
26     //000preamble
27     /**
28     - * $Horde: imp/config/prefs.php.dist,v 1.216.4.28 2008/05/12 12:21:22 jan Exp $
29     + * $Horde: imp/config/prefs.php.dist,v 1.216.4.34 2008/08/28 21:03:15 slusarz Exp $
30     *
31     * See horde/config/prefs.php for documentation on the structure of this file.
32     */
33     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/020logintasks mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/020logintasks
34     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/020logintasks 2008-06-07 20:21:21.000000000 -0500
35     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/020logintasks 2008-10-01 22:06:40.000000000 -0500
36     @@ -15,4 +15,7 @@
37     'purge_trash_keep', 'purge_spam', 'purge_spam_interval',
38     'purge_spam_keep'));
39     \}
40     +$prefGroups['logintasks']['members'] = array_merge(
41     + $prefGroups['logintasks']['members'],
42     + array('delete_attachments_monthly', 'delete_attachments_monthly_keep'));
43    
44     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/025compose mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/025compose
45     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/025compose 2008-04-19 22:42:26.000000000 -0500
46     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/025compose 2008-10-01 22:09:39.000000000 -0500
47     @@ -3,14 +3,11 @@
48     'column' => _("Message Options"),
49     'label' => _("Message Composition"),
50     'desc' => _("Customize how you send mail."),
51     - 'members' => array('mail_domain', 'compose_popup', 'compose_html',
52     - 'jseditor', 'fckeditor_buttons', 'xinha_hide_buttons',
53     - 'compose_cursor', 'compose_cc', 'compose_bcc',
54     - 'stationery_link', 'compose_spellcheck',
55     - 'compose_confirm', 'reply_quote',
56     - 'reply_format', 'forward_default', 'forward_bodytext',
57     - 'reply_headers', 'attrib_text', 'folderselect',
58     - 'close_draft', 'unseen_drafts', 'set_priority',
59     - 'sending_charset', 'encryptselect', 'save_attachments')
60     + 'members' => array('stationery_link', 'mailto_handler', 'compose_cc',
61     + 'compose_bcc', 'compose_spellcheck', 'compose_confirm',
62     + 'set_priority', 'compose_popup', 'compose_html',
63     + 'jseditor', 'fckeditor_buttons', 'xinha_hide_buttons',
64     + 'mail_domain', 'compose_cursor', 'sending_charset',
65     + 'encryptselect', 'save_attachments')
66     );
67    
68     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/032reply_forward mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/032reply_forward
69     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/032reply_forward 1969-12-31 18:00:00.000000000 -0600
70     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/032reply_forward 2008-10-01 22:12:41.000000000 -0500
71     @@ -0,0 +1,9 @@
72     +//032reply_forward
73     +$prefGroups['reply_forward'] = array(
74     + 'column' => _("Message Options"),
75     + 'label' => _("Message Replies/Forwards"),
76     + 'desc' => _("Customize how you reply to or forward mail."),
77     + 'members' => array('reply_quote', 'reply_format', 'forward_default',
78     + 'forward_bodytext', 'reply_headers', 'attrib_text')
79     +);
80     +
81     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/033drafts mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/033drafts
82     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/033drafts 1969-12-31 18:00:00.000000000 -0600
83     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/033drafts 2008-10-01 22:12:48.000000000 -0500
84     @@ -0,0 +1,8 @@
85     +//033drafts
86     +$prefGroups['drafts'] = array(
87     + 'column' => _("Message Options"),
88     + 'label' => _("Message Drafts"),
89     + 'desc' => _("Customize how to deal with message drafts."),
90     + 'members' => array('folderselect', 'close_draft', 'unseen_drafts')
91     +);
92     +
93     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder
94     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder 2008-04-21 22:52:40.000000000 -0500
95     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/135sent_mail_folder 2008-10-01 22:20:10.000000000 -0500
96     @@ -1,11 +1,14 @@
97     //135sent_mail_folder
98     // sent mail folder
99     $_prefs['sent_mail_folder'] = array(
100     + // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
101     + // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the
102     + // default value entry.
103     + // 'value' => 'Sent Items',
104     + // 'value' => _("Sent"),
105     + // value below for SME Server that is consistent from day one
106     'value' => 'sent-mail',
107     -// 'value' => _("Sent"),
108     -// For Exchange server uncomment the line below and delete the line above
109     -// 'value' => 'Sent Items',
110     - 'locked' => false,
111     - 'shared' => false,
112     + 'locked' => false,
113     + 'shared' => false,
114     'type' => 'implicit');
115    
116     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder
117     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder 2008-04-19 23:00:32.000000000 -0500
118     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/155drafts_folder 2008-10-01 22:24:03.000000000 -0500
119     @@ -1,7 +1,8 @@
120     //155drafts_folder
121     // drafts folder
122     $_prefs['drafts_folder'] = array(
123     -// 'value' => 'drafts',
124     + // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
125     + // 3501 [5.1.3]).
126     'value' => _("Drafts"),
127     'locked' => false,
128     'shared' => false,
129     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder
130     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder 2008-04-21 22:51:23.000000000 -0500
131     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/165trash_folder 2008-10-01 22:26:02.000000000 -0500
132     @@ -1,11 +1,14 @@
133     //165trash_folder
134     // trash folder
135     $_prefs['trash_folder'] = array(
136     -// for Exchange, uncomment the entry below and remove the default value entry
137     -// 'value' => 'Deleted Items',
138     -// 'value' => _("Trash"),
139     + // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
140     + // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the
141     + // default value entry.
142     + // 'value' => 'Deleted Items',
143     + //'value' => _("Trash"),
144     + // Value below for SME Server so that it's consistent from the beginning
145     'value' => 'trash',
146     'locked' => false,
147     'shared' => false,
148     'type' => 'implicit');
149     -
150     +
151     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder
152     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder 2008-04-20 10:55:57.000000000 -0500
153     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/175spam_folder 2008-10-01 22:27:01.000000000 -0500
154     @@ -1,8 +1,10 @@
155     //175spam_folder
156     // spam folder
157     $_prefs['spam_folder'] = array(
158     + // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
159     + // 3501 [5.1.3]).
160     'value' => _("Spam"),
161     - 'locked' => false,
162     - 'shared' => false,
163     + 'locked' => false,
164     + 'shared' => false,
165     'type' => 'implicit');
166    
167     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250mail_domain mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250mail_domain
168     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250mail_domain 2008-04-20 11:10:04.000000000 -0500
169     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250mail_domain 1969-12-31 18:00:00.000000000 -0600
170     @@ -1,11 +0,0 @@
171     -//250mail_domain
172     -// Message Composition preferences
173     -
174     -// default outgoing mail domain and address completion
175     -$_prefs['mail_domain'] = array(
176     - 'value' => '',
177     - 'locked' => false,
178     - 'shared' => false,
179     - 'type' => 'text',
180     - 'desc' => _("When sending mail or expanding addresses, what domain should we append to unqualified addresses (email addresses without \"@\")?"));
181     -
182     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250stationary_link mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250stationary_link
183     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250stationary_link 1969-12-31 18:00:00.000000000 -0600
184     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/250stationary_link 2008-10-02 22:41:55.000000000 -0500
185     @@ -0,0 +1,9 @@
186     +//250stationary_link
187     +// Message Composition preferences
188     +
189     +// Link to the stationery preferences.
190     +$_prefs['stationery_link'] = array(
191     + 'type' => 'link',
192     + 'url' => 'stationery.php',
193     + 'desc' => _("To the stationery and form responses."));
194     +
195     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255compose_popup mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255compose_popup
196     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255compose_popup 2008-04-20 11:10:34.000000000 -0500
197     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255compose_popup 1969-12-31 18:00:00.000000000 -0600
198     @@ -1,10 +0,0 @@
199     -//255compose_popup
200     -// compose in a separate window?
201     -$_prefs['compose_popup'] = array(
202     - 'value' => 1,
203     - 'locked' => false,
204     - 'shared' => false,
205     - 'type' => 'checkbox',
206     - 'desc' => _("Compose messages in a separate window?")
207     -);
208     -
209     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255stationary mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255stationary
210     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255stationary 1969-12-31 18:00:00.000000000 -0600
211     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/255stationary 2008-10-02 22:42:40.000000000 -0500
212     @@ -0,0 +1,7 @@
213     +//255stationary
214     +$_prefs['stationery'] = array(
215     + 'value' => 'a:0:\{\}',
216     + 'locked' => false,
217     + 'shared' => false,
218     + 'type' => 'implicit');
219     +
220     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/257mailto_handler mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/257mailto_handler
221     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/257mailto_handler 1969-12-31 18:00:00.000000000 -0600
222     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/257mailto_handler 2008-10-02 22:44:07.000000000 -0500
223     @@ -0,0 +1,12 @@
224     +//257mailto_handler
225     +// Link to add a Firefox 3 mailto: handler
226     +$_prefs['mailto_handler'] = array(
227     + 'type' => 'link',
228     + 'xurl' => 'javascript:if(typeof navigator.registerProtocolHandler==\'undefined\')alert(\''
229     + . addslashes(_("Your browser does not support this feature."))
230     + . '\');else navigator.registerProtocolHandler(\'mailto\',\''
231     + . Util::addParameter(Horde::applicationUrl('compose.php', true),
232     + array('actionID' => 'mailto_link', 'to' => ''), false)
233     + . '%s\',\'' . $GLOBALS['registry']->get('name') . '\');',
234     + 'desc' => sprintf(_("Click here to open all mailto: links in %s."), $GLOBALS['registry']->get('name')));
235     +
236     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/260compose_cc mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/260compose_cc
237     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/260compose_cc 1969-12-31 18:00:00.000000000 -0600
238     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/260compose_cc 2008-10-02 22:45:39.000000000 -0500
239     @@ -0,0 +1,10 @@
240     +//260compose_cc
241     +// Show Cc: field?
242     +$_prefs['compose_cc'] = array(
243     + 'value' => 1,
244     + 'locked' => false,
245     + 'shared' => false,
246     + 'type' => 'checkbox',
247     + 'desc' => _("Show the Cc: header field when composing mail?")
248     +);
249     +
250     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_bcc mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_bcc
251     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_bcc 1969-12-31 18:00:00.000000000 -0600
252     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_bcc 2008-10-02 22:46:54.000000000 -0500
253     @@ -0,0 +1,10 @@
254     +//265compose_bcc
255     +// Show Bcc: field?
256     +$_prefs['compose_bcc'] = array(
257     + 'value' => 1,
258     + 'locked' => false,
259     + 'shared' => false,
260     + 'type' => 'checkbox',
261     + 'desc' => _("Show the Bcc: header field when composing mail?")
262     +);
263     +
264     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_html mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_html
265     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_html 2008-04-20 11:11:01.000000000 -0500
266     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/265compose_html 1969-12-31 18:00:00.000000000 -0600
267     @@ -1,11 +0,0 @@
268     -//265compose_html
269     -// If browser supports the HTML editor, should we compose in HTML mode by
270     -// default?
271     -$_prefs['compose_html'] = array(
272     - 'value' => 0,
273     - 'locked' => false,
274     - 'shared' => false,
275     - 'type' => 'checkbox',
276     - 'desc' => _("Compose messages with an HTML GUI by default (if browser supports the feature)?")
277     -);
278     -
279     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/266jseditor mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/266jseditor
280     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/266jseditor 2008-04-20 11:13:12.000000000 -0500
281     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/266jseditor 1969-12-31 18:00:00.000000000 -0600
282     @@ -1,13 +0,0 @@
283     -//266jseditor
284     -// The default JS HTML editor.
285     -$_prefs['jseditor'] = array(
286     - 'value' => 'xinha',
287     - 'locked' => false,
288     - 'shared' => false,
289     - 'type' => 'enum',
290     - // To use 'fckeditor', you must have Horde 3.2 or greater installed.
291     - 'enum' => array('fckeditor' => _("FCKeditor"),
292     - 'xinha' => _("Xinha")),
293     - 'desc' => _("The javascript editor to use on the compose page.")
294     -);
295     -
296     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/267fckeditor_buttons mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/267fckeditor_buttons
297     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/267fckeditor_buttons 2008-04-20 11:15:03.000000000 -0500
298     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/267fckeditor_buttons 1969-12-31 18:00:00.000000000 -0600
299     @@ -1,10 +0,0 @@
300     -//267fckeditor_buttons
301     -// The list of buttons to show in FCKeditor
302     -$_prefs['fckeditor_buttons'] = array(
303     - 'value' => "[['FontFormat','FontName','FontSize'],['Bold','Italic','Underline'],['TextColor','BGColor'],'/',['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],['OrderedList','UnorderedList','Outdent','Indent'],['Link'],['Undo','Redo']]",
304     - 'locked' => true,
305     - 'shared' => false,
306     - 'type' => 'textarea',
307     - 'desc' => _("The buttons to show when using FCKeditor.")
308     -);
309     -
310     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/268xinha_hide_buttons mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/268xinha_hide_buttons
311     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/268xinha_hide_buttons 2008-04-20 11:22:21.000000000 -0500
312     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/268xinha_hide_buttons 1969-12-31 18:00:00.000000000 -0600
313     @@ -1,55 +0,0 @@
314     -//268xinha_hide_buttons
315     -// Hidden Xinha buttons.
316     -$_prefs['xinha_hide_buttons'] = array(
317     - 'value' => 'a:25:\{i:0;s:11:"popupeditor";i:1;s:13:"strikethrough";i:2;s:13:"textindicator";i:3;s:9:"subscript";i:4;s:11:"superscript";i:5;s:20:"inserthorizontalrule";i:6;s:11:"insertimage";i:7;s:11:"inserttable";i:8;s:9:"selectall";i:9;s:5:"print";i:10;s:3:"cut";i:11;s:4:"copy";i:12;s:5:"paste";i:13;s:9:"overwrite";i:14;s:6:"saveas";i:15;s:8:"killword";i:16;s:10:"clearfonts";i:17;s:12:"removeformat";i:18;s:13:"toggleborders";i:19;s:10:"splitblock";i:20;s:11:"lefttoright";i:21;s:11:"righttoleft";i:22;s:8:"htmlmode";i:23;s:8:"showhelp";i:24;s:5:"about";\}',
318     - 'locked' => false,
319     - 'shared' => false,
320     - 'type' => 'multienum',
321     - 'enum' => array(
322     - 'popupeditor' => _("Maximize/Minimize Editor"),
323     - 'formatblock' => _("Text Format"),
324     - 'fontname' => _("Text Font"),
325     - 'fontsize' => _("Text Size"),
326     - 'bold' => _("Bold"),
327     - 'italic' => _("Italic"),
328     - 'underline' => _("Underline"),
329     - 'strikethrough' => _("Strikethrough"),
330     - 'forecolor' => _("Font Color"),
331     - 'hilitecolor' => _("Background Color"),
332     - 'textindicator' => _("Current style"),
333     - 'subscript' => _("Subscript"),
334     - 'superscript' => _("Superscript"),
335     - 'justifyleft' => _("Justify Left"),
336     - 'justifycenter' => _("Justify Center"),
337     - 'justifyright' => _("Justify Right"),
338     - 'justifyfull' => _("Justify Full"),
339     - 'insertorderedlist' => _("Ordered List"),
340     - 'insertunorderedlist' => _("Bulleted List"),
341     - 'outdent' => _("Decrease Indent"),
342     - 'indent' => _("Increase Indent"),
343     - 'inserthorizontalrule' => _("Horizontal Rule"),
344     - 'createlink' => _("Insert Web Link"),
345     - 'insertimage' => _("Insert/Modify Image"),
346     - 'inserttable' => _("Insert Table"),
347     - 'undo' => _("Undoes your last action"),
348     - 'redo' => _("Redoes your last action"),
349     - 'selectall' => _("Select all"),
350     - 'print' => _("Print document"),
351     - 'cut' => _("Cut selection"),
352     - 'copy' => _("Copy selection"),
353     - 'paste' => _("Paste from clipboard"),
354     - 'overwrite' => _("Insert/Overwrite"),
355     - 'saveas' => _("Save as"),
356     - 'killword' => _("Clear MSOffice tags"),
357     - 'clearfonts' => _("Clear Inline Font Specifications"),
358     - 'removeformat' => _("Remove formatting"),
359     - 'toggleborders' => _("Toggle Borders"),
360     - 'splitblock' => _("Split Block"),
361     - 'lefttoright' => _("Direction left to right"),
362     - 'righttoleft' => _("Direction right to left"),
363     - 'htmlmode' => _("Toggle HTML Source"),
364     - 'showhelp' => _("Help using editor"),
365     - 'about' => _("About this editor")),
366     - 'desc' => _("The buttons NOT to show when using Xinha.")
367     -);
368     -
369     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/269compose_cursor mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/269compose_cursor
370     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/269compose_cursor 2008-04-20 11:23:28.000000000 -0500
371     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/269compose_cursor 1969-12-31 18:00:00.000000000 -0600
372     @@ -1,13 +0,0 @@
373     -//269compose_cursor
374     -// Where should the cursor be located in the compose text area by default?
375     -$_prefs['compose_cursor'] = array(
376     - 'value' => 'top',
377     - 'locked' => false,
378     - 'shared' => false,
379     - 'type' => 'enum',
380     - 'enum' => array('top' => _("Top"),
381     - 'bottom' => _("Bottom"),
382     - 'sig' => _("Before Signature")),
383     - 'desc' => _("Where should the cursor be located in the compose text area by default?")
384     -);
385     -
386     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_cc mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_cc
387     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_cc 2008-04-20 11:24:11.000000000 -0500
388     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_cc 1969-12-31 18:00:00.000000000 -0600
389     @@ -1,10 +0,0 @@
390     -//270compose_cc
391     -// Show Cc: field?
392     -$_prefs['compose_cc'] = array(
393     - 'value' => 1,
394     - 'locked' => false,
395     - 'shared' => false,
396     - 'type' => 'checkbox',
397     - 'desc' => _("Show the Cc: header field when composing mail?")
398     -);
399     -
400     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_spellcheck mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_spellcheck
401     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_spellcheck 1969-12-31 18:00:00.000000000 -0600
402     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/270compose_spellcheck 2008-10-02 22:47:42.000000000 -0500
403     @@ -0,0 +1,8 @@
404     +//270compose_spellcheck
405     +// Check spelling before sending the message?
406     +$_prefs['compose_spellcheck'] = array(
407     + 'value' => 0,
408     + 'locked' => false,
409     + 'shared' => false,
410     + 'type' => 'checkbox',
411     + 'desc' => _("Check spelling before sending a message?"));
412     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/271compoes_bcc mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/271compoes_bcc
413     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/271compoes_bcc 2008-04-20 11:25:55.000000000 -0500
414     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/271compoes_bcc 1969-12-31 18:00:00.000000000 -0600
415     @@ -1,10 +0,0 @@
416     -//271compose_bcc
417     -// Show Bcc: field?
418     -$_prefs['compose_bcc'] = array(
419     - 'value' => 1,
420     - 'locked' => false,
421     - 'shared' => false,
422     - 'type' => 'checkbox',
423     - 'desc' => _("Show the Bcc: header field when composing mail?")
424     -);
425     -
426     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/273stationary_link mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/273stationary_link
427     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/273stationary_link 2008-04-20 11:26:34.000000000 -0500
428     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/273stationary_link 1969-12-31 18:00:00.000000000 -0600
429     @@ -1,7 +0,0 @@
430     -//273stationary_link
431     -// Link to the stationery preferences.
432     -$_prefs['stationery_link'] = array(
433     - 'type' => 'link',
434     - 'url' => 'stationery.php',
435     - 'desc' => _("Create stationery and form responses."));
436     -
437     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/274stationary mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/274stationary
438     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/274stationary 2008-04-20 11:26:59.000000000 -0500
439     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/274stationary 1969-12-31 18:00:00.000000000 -0600
440     @@ -1,7 +0,0 @@
441     -//274stationary
442     -$_prefs['stationery'] = array(
443     - 'value' => 'a:0:\{\}',
444     - 'locked' => false,
445     - 'shared' => false,
446     - 'type' => 'implicit');
447     -
448     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_confirm mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_confirm
449     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_confirm 1969-12-31 18:00:00.000000000 -0600
450     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_confirm 2008-10-02 22:48:28.000000000 -0500
451     @@ -0,0 +1,9 @@
452     +//275compose_confirm
453     +// confirm successful sending of messages?
454     +$_prefs['compose_confirm'] = array(
455     + 'value' => 0,
456     + 'locked' => false,
457     + 'shared' => false,
458     + 'type' => 'checkbox',
459     + 'desc' => _("Display confirmation after sending a message?"));
460     +
461     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_spellcheck mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_spellcheck
462     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_spellcheck 2008-04-20 11:27:18.000000000 -0500
463     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/275compose_spellcheck 1969-12-31 18:00:00.000000000 -0600
464     @@ -1,8 +0,0 @@
465     -//275compose_spellcheck
466     -// Check spelling before sending the message?
467     -$_prefs['compose_spellcheck'] = array(
468     - 'value' => 0,
469     - 'locked' => false,
470     - 'shared' => false,
471     - 'type' => 'checkbox',
472     - 'desc' => _("Check spelling before sending a message?"));
473     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280compose_confirm mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280compose_confirm
474     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280compose_confirm 2008-04-20 11:29:26.000000000 -0500
475     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280compose_confirm 1969-12-31 18:00:00.000000000 -0600
476     @@ -1,9 +0,0 @@
477     -//280compose_confirm
478     -// confirm successful sending of messages?
479     -$_prefs['compose_confirm'] = array(
480     - 'value' => 0,
481     - 'locked' => false,
482     - 'shared' => false,
483     - 'type' => 'checkbox',
484     - 'desc' => _("Display confirmation after sending a message?"));
485     -
486     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280set_priority mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280set_priority
487     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280set_priority 1969-12-31 18:00:00.000000000 -0600
488     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/280set_priority 2008-10-02 22:51:51.000000000 -0500
489     @@ -0,0 +1,9 @@
490     +//280set_priority
491     +// allow the user to add a "X-Priority" header when composing messages?
492     +$_prefs['set_priority'] = array(
493     + 'value' => 0,
494     + 'locked' => false,
495     + 'shared' => false,
496     + 'type' => 'checkbox',
497     + 'desc' => _("Set the X-Priority header when composing messages?"));
498     +
499     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285compose_popup mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285compose_popup
500     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285compose_popup 1969-12-31 18:00:00.000000000 -0600
501     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285compose_popup 2008-10-02 22:53:01.000000000 -0500
502     @@ -0,0 +1,10 @@
503     +//285compose_popup
504     +// compose in a separate window?
505     +$_prefs['compose_popup'] = array(
506     + 'value' => 1,
507     + 'locked' => false,
508     + 'shared' => false,
509     + 'type' => 'checkbox',
510     + 'desc' => _("Compose messages in a separate window?")
511     +);
512     +
513     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285reply_quote mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285reply_quote
514     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285reply_quote 2008-04-20 11:30:44.000000000 -0500
515     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/285reply_quote 1969-12-31 18:00:00.000000000 -0600
516     @@ -1,9 +0,0 @@
517     -//285reply_quote
518     -// Should the original message be included?
519     -$_prefs['reply_quote'] = array(
520     - 'value' => 1,
521     - 'locked' => false,
522     - 'shared' => false,
523     - 'type' => 'checkbox',
524     - 'desc' => _("Include original message in a reply?"));
525     -
526     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/286reply_format mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/286reply_format
527     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/286reply_format 2008-04-20 11:32:46.000000000 -0500
528     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/286reply_format 1969-12-31 18:00:00.000000000 -0600
529     @@ -1,10 +0,0 @@
530     -//286reply_format
531     -// When replying/forwarding to a message, should we use the same format as the
532     -// original message?
533     -$_prefs['reply_format'] = array(
534     - 'value' => 0,
535     - 'locked' => false,
536     - 'shared' => false,
537     - 'type' => 'checkbox',
538     - 'desc' => _("When replying/forwarding to a message, should we use the same format as the original message?"));
539     -
540     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/287forwad_default mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/287forwad_default
541     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/287forwad_default 2008-05-25 19:10:17.000000000 -0500
542     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/287forwad_default 1969-12-31 18:00:00.000000000 -0600
543     @@ -1,13 +0,0 @@
544     -//287forward_default
545     -// What should the default forward method be?
546     -$_prefs['forward_default'] = array(
547     - 'value' => 'forward_all',
548     - 'locked' => false,
549     - 'shared' => false,
550     - 'type' => 'enum',
551     - 'enum' => array('forward_all' => _("Entire Message"),
552     - 'forward_body' => _("Body Text Only"),
553     - 'forward_attachments' => _("Body Text with Attachments")),
554     - 'desc' => _("Default forwarding method:"),
555     - 'help' => 'message-forward');
556     -
557     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/288forward_bodytext mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/288forward_bodytext
558     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/288forward_bodytext 2008-04-20 11:33:57.000000000 -0500
559     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/288forward_bodytext 1969-12-31 18:00:00.000000000 -0600
560     @@ -1,9 +0,0 @@
561     -//288forward_bodytext
562     -// Should the original message be included?
563     -$_prefs['forward_bodytext'] = array(
564     - 'value' => 1,
565     - 'locked' => false,
566     - 'shared' => false,
567     - 'type' => 'checkbox',
568     - 'desc' => _("Include body text in forward message by default?"));
569     -
570     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290compose_html mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290compose_html
571     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290compose_html 1969-12-31 18:00:00.000000000 -0600
572     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290compose_html 2008-10-02 22:53:59.000000000 -0500
573     @@ -0,0 +1,11 @@
574     +//290compose_html
575     +// If browser supports the HTML editor, should we compose in HTML mode by
576     +// default?
577     +$_prefs['compose_html'] = array(
578     + 'value' => 0,
579     + 'locked' => false,
580     + 'shared' => false,
581     + 'type' => 'checkbox',
582     + 'desc' => _("Compose messages with an HTML GUI by default (if browser supports the feature)?")
583     +);
584     +
585     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290reply_headers mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290reply_headers
586     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290reply_headers 2008-04-20 15:30:57.000000000 -0500
587     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/290reply_headers 1969-12-31 18:00:00.000000000 -0600
588     @@ -1,10 +0,0 @@
589     -//290reply_headers
590     -// Reply to header summary - leave a brief summary of the header inside
591     -// the message.
592     -$_prefs['reply_headers'] = array(
593     - 'desc' => _("Include a brief summary of the header in a reply?"),
594     - 'value' => 0,
595     - 'locked' => false,
596     - 'shared' => false,
597     - 'type' => 'checkbox');
598     -
599     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295attrib_text mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295attrib_text
600     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295attrib_text 2008-04-20 11:34:47.000000000 -0500
601     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295attrib_text 1969-12-31 18:00:00.000000000 -0600
602     @@ -1,10 +0,0 @@
603     -//295attrib_text
604     -// How should we attribute quoted lines in a reply
605     -$_prefs['attrib_text'] = array(
606     - 'value' => _("Quoting %f:"),
607     - 'locked' => false,
608     - 'shared' => false,
609     - 'type' => 'text',
610     - 'desc' => _("How to attribute quoted lines in a reply"),
611     - 'help' => 'prefs-attrib_text');
612     -
613     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295jseditor mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295jseditor
614     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295jseditor 1969-12-31 18:00:00.000000000 -0600
615     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/295jseditor 2008-10-02 22:55:44.000000000 -0500
616     @@ -0,0 +1,13 @@
617     +//295jseditor
618     +// The default JS HTML editor.
619     +$_prefs['jseditor'] = array(
620     + 'value' => 'xinha',
621     + 'locked' => false,
622     + 'shared' => false,
623     + 'type' => 'enum',
624     + // To use 'fckeditor', you must have Horde 3.2 or greater installed.
625     + 'enum' => array('fckeditor' => _("FCKeditor"),
626     + 'xinha' => _("Xinha")),
627     + 'desc' => _("The javascript editor to use on the compose page.")
628     +);
629     +
630     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300close_draft mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300close_draft
631     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300close_draft 2008-04-20 11:35:00.000000000 -0500
632     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300close_draft 1969-12-31 18:00:00.000000000 -0600
633     @@ -1,9 +0,0 @@
634     -//300close_draft
635     -// closing window after saving a draft?
636     -$_prefs['close_draft'] = array(
637     - 'value' => 1,
638     - 'locked' => false,
639     - 'shared' => false,
640     - 'type' => 'checkbox',
641     - 'desc' => _("Should the compose window be closed after saving a draft?"));
642     -
643     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons
644     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons 1969-12-31 18:00:00.000000000 -0600
645     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons 2008-10-02 22:56:45.000000000 -0500
646     @@ -0,0 +1,10 @@
647     +//300fckeditor_buttons
648     +// The list of buttons to show in FCKeditor
649     +$_prefs['fckeditor_buttons'] = array(
650     + 'value' => "[['FontFormat','FontName','FontSize'],['Bold','Italic','Underline'],['TextColor','BGColor'],'/',['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],['OrderedList','UnorderedList','Outdent','Indent'],['Link'],['Undo','Redo']]",
651     + 'locked' => true,
652     + 'shared' => false,
653     + 'type' => 'textarea',
654     + 'desc' => _("The buttons to show when using FCKeditor.")
655     +);
656     +
657     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305unseen_drafts mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305unseen_drafts
658     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305unseen_drafts 2008-04-20 11:35:15.000000000 -0500
659     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305unseen_drafts 1969-12-31 18:00:00.000000000 -0600
660     @@ -1,9 +0,0 @@
661     -//305unseen_drafts
662     -// save drafts as seen or unseen
663     -$_prefs['unseen_drafts'] = array(
664     - 'value' => 0,
665     - 'locked' => false,
666     - 'shared' => false,
667     - 'type' => 'checkbox',
668     - 'desc' => _("Save drafts as unseen?"));
669     -
670     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305xinha_hide_buttons mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305xinha_hide_buttons
671     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305xinha_hide_buttons 1969-12-31 18:00:00.000000000 -0600
672     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/305xinha_hide_buttons 2008-10-02 22:57:53.000000000 -0500
673     @@ -0,0 +1,55 @@
674     +//205xinha_hide_buttons
675     +// Hidden Xinha buttons.
676     +$_prefs['xinha_hide_buttons'] = array(
677     + 'value' => 'a:25:\{i:0;s:11:"popupeditor";i:1;s:13:"strikethrough";i:2;s:13:"textindicator";i:3;s:9:"subscript";i:4;s:11:"superscript";i:5;s:20:"inserthorizontalrule";i:6;s:11:"insertimage";i:7;s:11:"inserttable";i:8;s:9:"selectall";i:9;s:5:"print";i:10;s:3:"cut";i:11;s:4:"copy";i:12;s:5:"paste";i:13;s:9:"overwrite";i:14;s:6:"saveas";i:15;s:8:"killword";i:16;s:10:"clearfonts";i:17;s:12:"removeformat";i:18;s:13:"toggleborders";i:19;s:10:"splitblock";i:20;s:11:"lefttoright";i:21;s:11:"righttoleft";i:22;s:8:"htmlmode";i:23;s:8:"showhelp";i:24;s:5:"about";\}',
678     + 'locked' => false,
679     + 'shared' => false,
680     + 'type' => 'multienum',
681     + 'enum' => array(
682     + 'popupeditor' => _("Maximize/Minimize Editor"),
683     + 'formatblock' => _("Text Format"),
684     + 'fontname' => _("Text Font"),
685     + 'fontsize' => _("Text Size"),
686     + 'bold' => _("Bold"),
687     + 'italic' => _("Italic"),
688     + 'underline' => _("Underline"),
689     + 'strikethrough' => _("Strikethrough"),
690     + 'forecolor' => _("Font Color"),
691     + 'hilitecolor' => _("Background Color"),
692     + 'textindicator' => _("Current style"),
693     + 'subscript' => _("Subscript"),
694     + 'superscript' => _("Superscript"),
695     + 'justifyleft' => _("Justify Left"),
696     + 'justifycenter' => _("Justify Center"),
697     + 'justifyright' => _("Justify Right"),
698     + 'justifyfull' => _("Justify Full"),
699     + 'insertorderedlist' => _("Ordered List"),
700     + 'insertunorderedlist' => _("Bulleted List"),
701     + 'outdent' => _("Decrease Indent"),
702     + 'indent' => _("Increase Indent"),
703     + 'inserthorizontalrule' => _("Horizontal Rule"),
704     + 'createlink' => _("Insert Web Link"),
705     + 'insertimage' => _("Insert/Modify Image"),
706     + 'inserttable' => _("Insert Table"),
707     + 'undo' => _("Undoes your last action"),
708     + 'redo' => _("Redoes your last action"),
709     + 'selectall' => _("Select all"),
710     + 'print' => _("Print document"),
711     + 'cut' => _("Cut selection"),
712     + 'copy' => _("Copy selection"),
713     + 'paste' => _("Paste from clipboard"),
714     + 'overwrite' => _("Insert/Overwrite"),
715     + 'saveas' => _("Save as"),
716     + 'killword' => _("Clear MSOffice tags"),
717     + 'clearfonts' => _("Clear Inline Font Specifications"),
718     + 'removeformat' => _("Remove formatting"),
719     + 'toggleborders' => _("Toggle Borders"),
720     + 'splitblock' => _("Split Block"),
721     + 'lefttoright' => _("Direction left to right"),
722     + 'righttoleft' => _("Direction right to left"),
723     + 'htmlmode' => _("Toggle HTML Source"),
724     + 'showhelp' => _("Help using editor"),
725     + 'about' => _("About this editor")),
726     + 'desc' => _("The buttons NOT to show when using Xinha.")
727     +);
728     +
729     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/307auto_save_drafts mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/307auto_save_drafts
730     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/307auto_save_drafts 2008-04-20 11:36:03.000000000 -0500
731     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/307auto_save_drafts 1969-12-31 18:00:00.000000000 -0600
732     @@ -1,12 +0,0 @@
733     -//307auto_save_drafts
734     -// auto-save drafts? value is in minutes, 0 == don't save.
735     -$_prefs['auto_save_drafts'] = array(
736     - 'value' => 0,
737     - 'locked' => false,
738     - 'shared' => false,
739     - 'type' => 'enum',
740     - 'enum' => array(0 => _("No"),
741     - 5 => _("Every 5 minutes")),
742     - 'desc' => _("Save drafts automatically while composing?"),
743     -);
744     -
745     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310mail_domain mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310mail_domain
746     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310mail_domain 1969-12-31 18:00:00.000000000 -0600
747     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310mail_domain 2008-10-02 22:59:55.000000000 -0500
748     @@ -0,0 +1,9 @@
749     +//310mail_domain
750     +// default outgoing mail domain and address completion
751     +$_prefs['mail_domain'] = array(
752     + 'value' => '',
753     + 'locked' => false,
754     + 'shared' => false,
755     + 'type' => 'text',
756     + 'desc' => _("When sending mail or expanding addresses, what domain should we append to unqualified addresses (email addresses without \"@\")?"));
757     +
758     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310set_priority mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310set_priority
759     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310set_priority 2008-04-20 14:29:00.000000000 -0500
760     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/310set_priority 1969-12-31 18:00:00.000000000 -0600
761     @@ -1,9 +0,0 @@
762     -//310set_priority
763     -// allow the user to add a "X-Priority" header when composing messages?
764     -$_prefs['set_priority'] = array(
765     - 'value' => 0,
766     - 'locked' => false,
767     - 'shared' => false,
768     - 'type' => 'checkbox',
769     - 'desc' => _("Set the X-Priority header when composing messages?"));
770     -
771     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/312compose_cursor mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/312compose_cursor
772     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/312compose_cursor 1969-12-31 18:00:00.000000000 -0600
773     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/312compose_cursor 2008-10-02 23:00:47.000000000 -0500
774     @@ -0,0 +1,13 @@
775     +//312compose_cursor
776     +// Where should the cursor be located in the compose text area by default?
777     +$_prefs['compose_cursor'] = array(
778     + 'value' => 'top',
779     + 'locked' => false,
780     + 'shared' => false,
781     + 'type' => 'enum',
782     + 'enum' => array('top' => _("Top"),
783     + 'bottom' => _("Bottom"),
784     + 'sig' => _("Before Signature")),
785     + 'desc' => _("Where should the cursor be located in the compose text area by default?")
786     +);
787     +
788     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/340reply_quote mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/340reply_quote
789     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/340reply_quote 1969-12-31 18:00:00.000000000 -0600
790     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/340reply_quote 2008-10-02 23:04:38.000000000 -0500
791     @@ -0,0 +1,11 @@
792     +//340reply_quote
793     +// Message Replies/Forwards preferences
794     +
795     +// Should the original message be included?
796     +$_prefs['reply_quote'] = array(
797     + 'value' => 1,
798     + 'locked' => false,
799     + 'shared' => false,
800     + 'type' => 'checkbox',
801     + 'desc' => _("Include original message in a reply?"));
802     +
803     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/345reply_format mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/345reply_format
804     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/345reply_format 1969-12-31 18:00:00.000000000 -0600
805     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/345reply_format 2008-10-02 23:05:12.000000000 -0500
806     @@ -0,0 +1,10 @@
807     +//345reply_format
808     +// When replying/forwarding to a message, should we use the same format as the
809     +// original message?
810     +$_prefs['reply_format'] = array(
811     + 'value' => 0,
812     + 'locked' => false,
813     + 'shared' => false,
814     + 'type' => 'checkbox',
815     + 'desc' => _("When replying/forwarding to a message, should we use the same format as the original message?"));
816     +
817     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350filtering mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350filtering
818     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350filtering 2008-04-20 15:30:53.000000000 -0500
819     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350filtering 1969-12-31 18:00:00.000000000 -0600
820     @@ -1,11 +0,0 @@
821     -//350filtering
822     -// Message Viewing preferences
823     -
824     -// filter message content?
825     -$_prefs['filtering'] = array(
826     - 'value' => 0,
827     - 'locked' => false,
828     - 'shared' => false,
829     - 'type' => 'checkbox',
830     - 'desc' => _("Filter message content for profanity?"));
831     -
832     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350forward_default mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350forward_default
833     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350forward_default 1969-12-31 18:00:00.000000000 -0600
834     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/350forward_default 2008-10-02 23:11:20.000000000 -0500
835     @@ -0,0 +1,13 @@
836     +//350forward_default
837     +// What should the default forward method be?
838     +$_prefs['forward_default'] = array(
839     + 'value' => 'forward_all',
840     + 'locked' => false,
841     + 'shared' => false,
842     + 'type' => 'enum',
843     + 'enum' => array('forward_all' => _("Entire Message"),
844     + 'forward_body' => _("Body Text Only"),
845     + 'forward_attachments' => _("Body Text with Attachments")),
846     + 'desc' => _("Default forwarding method:"),
847     + 'help' => 'message-forward');
848     +
849     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355forward_bodytext mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355forward_bodytext
850     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355forward_bodytext 1969-12-31 18:00:00.000000000 -0600
851     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355forward_bodytext 2008-10-02 23:12:20.000000000 -0500
852     @@ -0,0 +1,9 @@
853     +//355forward_bodytext
854     +// Should the original message be included?
855     +$_prefs['forward_bodytext'] = array(
856     + 'value' => 1,
857     + 'locked' => false,
858     + 'shared' => false,
859     + 'type' => 'checkbox',
860     + 'desc' => _("Include body text in forward message by default?"));
861     +
862     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355strip_attachments mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355strip_attachments
863     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355strip_attachments 2008-04-20 14:32:36.000000000 -0500
864     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/355strip_attachments 1969-12-31 18:00:00.000000000 -0600
865     @@ -1,9 +0,0 @@
866     -//355strip_attachments
867     -// Should we display an icon to strip attachments?
868     -$_prefs['strip_attachments'] = array(
869     - 'value' => 0,
870     - 'locked' => false,
871     - 'shared' => false,
872     - 'type' => 'checkbox',
873     - 'desc' => _("Show an icon to allow stripping of attachments from messages?"));
874     -
875     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360delete_spam_after_report mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360delete_spam_after_report
876     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360delete_spam_after_report 2008-06-07 20:41:34.000000000 -0500
877     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360delete_spam_after_report 1969-12-31 18:00:00.000000000 -0600
878     @@ -1,17 +0,0 @@
879     -//360delete_spam_after_report
880     -// What should we do with spam messages after reporting them?
881     -$_prefs['delete_spam_after_report'] = array(
882     - 'value' => 0,
883     - 'locked' => false,
884     - 'shared' => false,
885     - 'type' => 'enum',
886     - 'enum' => array(0 => _("Nothing"),
887     - 1 => _("Delete spam messages")),
888     - 'desc' => _("What should we do with spam messages after they have been reported as spam or innocent?"),
889     - 'help' => 'prefs-delete_spam_after_report'
890     -);
891     -if (!$is_pop3) \{
892     - $_prefs['delete_spam_after_report']['enum'][2] =
893     - _("Move spam messages to spam folder and innocent messages to INBOX");
894     -\}
895     -
896     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360reply_headers mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360reply_headers
897     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360reply_headers 1969-12-31 18:00:00.000000000 -0600
898     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/360reply_headers 2008-10-03 22:45:28.000000000 -0500
899     @@ -0,0 +1,10 @@
900     +//360reply_headers
901     +// Reply to header summary - leave a brief summary of the header inside
902     +// the message.
903     +$_prefs['reply_headers'] = array(
904     + 'desc' => _("Include a brief summary of the header in a reply?"),
905     + 'value' => 0,
906     + 'locked' => false,
907     + 'shared' => false,
908     + 'type' => 'checkbox');
909     +
910     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/362attrib_text mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/362attrib_text
911     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/362attrib_text 1969-12-31 18:00:00.000000000 -0600
912     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/362attrib_text 2008-10-03 22:46:25.000000000 -0500
913     @@ -0,0 +1,12 @@
914     +//362attrib_text
915     +// How should we attribute quoted lines in a reply
916     +$_prefs['attrib_text'] = array(
917     + 'value' => _("Quoting %f:"),
918     + 'locked' => false,
919     + 'shared' => false,
920     + 'type' => 'text',
921     + 'desc' => _("How to attribute quoted lines in a reply"),
922     + 'help' => 'prefs-attrib_text');
923     +
924     +// End Message Replies/Forwards preferences
925     +
926     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365close_draft mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365close_draft
927     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365close_draft 1969-12-31 18:00:00.000000000 -0600
928     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365close_draft 2008-10-03 22:47:32.000000000 -0500
929     @@ -0,0 +1,11 @@
930     +//365close_draft
931     +// Message Drafts preferences
932     +
933     +// closing window after saving a draft?
934     +$_prefs['close_draft'] = array(
935     + 'value' => 1,
936     + 'locked' => false,
937     + 'shared' => false,
938     + 'type' => 'checkbox',
939     + 'desc' => _("Should the compose window be closed after saving a draft?"));
940     +
941     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365html_image_replacement mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365html_image_replacement
942     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365html_image_replacement 2008-04-20 14:33:53.000000000 -0500
943     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/365html_image_replacement 1969-12-31 18:00:00.000000000 -0600
944     @@ -1,11 +0,0 @@
945     -//365html_image_replacement
946     -// Replace image tags in HTML messages with blank images?
947     -$_prefs['html_image_replacement'] = array(
948     - 'value' => 1,
949     - 'locked' => false,
950     - 'shared' => false,
951     - 'type' => 'checkbox',
952     - 'desc' => _("Block images in HTML messages unless they are specifically requested?"),
953     - 'help' => 'prefs-html_image_replacement'
954     -);
955     -
956     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/367unseen_drafts mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/367unseen_drafts
957     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/367unseen_drafts 1969-12-31 18:00:00.000000000 -0600
958     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/367unseen_drafts 2008-10-03 22:48:49.000000000 -0500
959     @@ -0,0 +1,9 @@
960     +//367unseen_drafts
961     +// save drafts as seen or unseen
962     +$_prefs['unseen_drafts'] = array(
963     + 'value' => 0,
964     + 'locked' => false,
965     + 'shared' => false,
966     + 'type' => 'checkbox',
967     + 'desc' => _("Save drafts as unseen?"));
968     +
969     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370auto_save_drafts mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370auto_save_drafts
970     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370auto_save_drafts 1969-12-31 18:00:00.000000000 -0600
971     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370auto_save_drafts 2008-10-03 22:51:07.000000000 -0500
972     @@ -0,0 +1,15 @@
973     +//370auto_save_drafts
974     +// auto-save drafts? value is in minutes, 0 == don't save.
975     +// Only works w/DIMP - does not show in prefs screen by default
976     +$_prefs['auto_save_drafts'] = array(
977     + 'value' => 0,
978     + 'locked' => false,
979     + 'shared' => false,
980     + 'type' => 'enum',
981     + 'enum' => array(0 => _("No"),
982     + 5 => _("Every 5 minutes")),
983     + 'desc' => _("Save drafts automatically while composing?"),
984     +);
985     +
986     +// End Message Drafts preferences
987     +
988     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370html_image_addrbook mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370html_image_addrbook
989     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370html_image_addrbook 2008-04-20 14:35:41.000000000 -0500
990     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/370html_image_addrbook 1969-12-31 18:00:00.000000000 -0600
991     @@ -1,12 +0,0 @@
992     -//370html_image_addrbook
993     -// By default, automatically show images in HTML messages if the sender is in
994     -// the user's addressbook?
995     -$_prefs['html_image_addrbook'] = array(
996     - 'value' => 1,
997     - 'locked' => false,
998     - 'shared' => false,
999     - 'type' => 'checkbox',
1000     - 'desc' => _("Automatically show images in HTML messages when the sender is in my address book?"),
1001     - 'help' => 'prefs-html_image_addrbook'
1002     -);
1003     -
1004     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/372filtering mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/372filtering
1005     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/372filtering 1969-12-31 18:00:00.000000000 -0600
1006     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/372filtering 2008-10-03 22:51:47.000000000 -0500
1007     @@ -0,0 +1,11 @@
1008     +//372filtering
1009     +// Message Viewing preferences
1010     +
1011     +// filter message content?
1012     +$_prefs['filtering'] = array(
1013     + 'value' => 0,
1014     + 'locked' => false,
1015     + 'shared' => false,
1016     + 'type' => 'checkbox',
1017     + 'desc' => _("Filter message content for profanity?"));
1018     +
1019     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375highlight_text mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375highlight_text
1020     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375highlight_text 2008-04-20 14:35:55.000000000 -0500
1021     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375highlight_text 1969-12-31 18:00:00.000000000 -0600
1022     @@ -1,9 +0,0 @@
1023     -//375highlight_text
1024     -// should we try to mark different conversations with different colors?
1025     -$_prefs['highlight_text'] = array(
1026     - 'value' => 1,
1027     - 'locked' => false,
1028     - 'shared' => false,
1029     - 'type' => 'checkbox',
1030     - 'desc' => _("Mark different levels of quoting with different colors?"));
1031     -
1032     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375strip_attachments mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375strip_attachments
1033     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375strip_attachments 1969-12-31 18:00:00.000000000 -0600
1034     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/375strip_attachments 2008-10-03 22:52:29.000000000 -0500
1035     @@ -0,0 +1,9 @@
1036     +//375strip_attachments
1037     +// Should we display an icon to strip attachments?
1038     +$_prefs['strip_attachments'] = array(
1039     + 'value' => 0,
1040     + 'locked' => false,
1041     + 'shared' => false,
1042     + 'type' => 'checkbox',
1043     + 'desc' => _("Show an icon to allow stripping of attachments from messages?"));
1044     +
1045     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/377delete_spam_after_report mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/377delete_spam_after_report
1046     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/377delete_spam_after_report 1969-12-31 18:00:00.000000000 -0600
1047     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/377delete_spam_after_report 2008-10-03 22:53:03.000000000 -0500
1048     @@ -0,0 +1,17 @@
1049     +//377delete_spam_after_report
1050     +// What should we do with spam messages after reporting them?
1051     +$_prefs['delete_spam_after_report'] = array(
1052     + 'value' => 0,
1053     + 'locked' => false,
1054     + 'shared' => false,
1055     + 'type' => 'enum',
1056     + 'enum' => array(0 => _("Nothing"),
1057     + 1 => _("Delete spam messages")),
1058     + 'desc' => _("What should we do with spam messages after they have been reported as spam or innocent?"),
1059     + 'help' => 'prefs-delete_spam_after_report'
1060     +);
1061     +if (!$is_pop3) \{
1062     + $_prefs['delete_spam_after_report']['enum'][2] =
1063     + _("Move spam messages to spam folder and innocent messages to INBOX");
1064     +\}
1065     +
1066     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380highlight_simple_markup mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380highlight_simple_markup
1067     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380highlight_simple_markup 2008-04-20 14:36:09.000000000 -0500
1068     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380highlight_simple_markup 1969-12-31 18:00:00.000000000 -0600
1069     @@ -1,9 +0,0 @@
1070     -//380highlight_simple_markup
1071     -// should we try to mark simple markup with html tags?
1072     -$_prefs['highlight_simple_markup'] = array(
1073     - 'value' => 1,
1074     - 'locked' => false,
1075     - 'shared' => false,
1076     - 'type' => 'checkbox',
1077     - 'desc' => _("Mark simple markup?"));
1078     -
1079     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380html_image_replacement mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380html_image_replacement
1080     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380html_image_replacement 1969-12-31 18:00:00.000000000 -0600
1081     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/380html_image_replacement 2008-10-03 22:53:58.000000000 -0500
1082     @@ -0,0 +1,11 @@
1083     +//380html_image_replacement
1084     +// Replace image tags in HTML messages with blank images?
1085     +$_prefs['html_image_replacement'] = array(
1086     + 'value' => 1,
1087     + 'locked' => false,
1088     + 'shared' => false,
1089     + 'type' => 'checkbox',
1090     + 'desc' => _("Block images in HTML messages unless they are specifically requested?"),
1091     + 'help' => 'prefs-html_image_replacement'
1092     +);
1093     +
1094     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/382html_image_addrbook mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/382html_image_addrbook
1095     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/382html_image_addrbook 1969-12-31 18:00:00.000000000 -0600
1096     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/382html_image_addrbook 2008-10-03 22:54:32.000000000 -0500
1097     @@ -0,0 +1,12 @@
1098     +//382html_image_addrbook
1099     +// By default, automatically show images in HTML messages if the sender is in
1100     +// the user's addressbook?
1101     +$_prefs['html_image_addrbook'] = array(
1102     + 'value' => 1,
1103     + 'locked' => false,
1104     + 'shared' => false,
1105     + 'type' => 'checkbox',
1106     + 'desc' => _("Automatically show images in HTML messages when the sender is in my address book?"),
1107     + 'help' => 'prefs-html_image_addrbook'
1108     +);
1109     +
1110     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385highlight_text mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385highlight_text
1111     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385highlight_text 1969-12-31 18:00:00.000000000 -0600
1112     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385highlight_text 2008-10-03 22:56:17.000000000 -0500
1113     @@ -0,0 +1,9 @@
1114     +//385highlight_text
1115     +// should we try to mark different conversations with different colors?
1116     +$_prefs['highlight_text'] = array(
1117     + 'value' => 1,
1118     + 'locked' => false,
1119     + 'shared' => false,
1120     + 'type' => 'checkbox',
1121     + 'desc' => _("Mark different levels of quoting with different colors?"));
1122     +
1123     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385show_quoteblocks mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385show_quoteblocks
1124     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385show_quoteblocks 2008-04-20 14:36:43.000000000 -0500
1125     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/385show_quoteblocks 1969-12-31 18:00:00.000000000 -0600
1126     @@ -1,12 +0,0 @@
1127     -//385show_quoteblocks
1128     -// should we show large blocks of quoted text or hide them?
1129     -$_prefs['show_quoteblocks'] = array(
1130     - 'value' => 'thread',
1131     - 'locked' => false,
1132     - 'shared' => false,
1133     - 'type' => 'enum',
1134     - 'enum' => array('shown' => _("Shown"),
1135     - 'thread' => _("Hidden in Thread View"),
1136     - 'hidden' => _("Hidden")),
1137     - 'desc' => _("Should large blocks of quoted text be shown or hidden by default? It can be toggled easily whichever you choose."));
1138     -
1139     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/387highlight_simple_markup mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/387highlight_simple_markup
1140     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/387highlight_simple_markup 1969-12-31 18:00:00.000000000 -0600
1141     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/387highlight_simple_markup 2008-10-03 22:56:47.000000000 -0500
1142     @@ -0,0 +1,9 @@
1143     +//387highlight_simple_markup
1144     +// should we try to mark simple markup with html tags?
1145     +$_prefs['highlight_simple_markup'] = array(
1146     + 'value' => 1,
1147     + 'locked' => false,
1148     + 'shared' => false,
1149     + 'type' => 'checkbox',
1150     + 'desc' => _("Mark simple markup?"));
1151     +
1152     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390dim_signature mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390dim_signature
1153     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390dim_signature 2008-04-20 14:37:07.000000000 -0500
1154     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390dim_signature 1969-12-31 18:00:00.000000000 -0600
1155     @@ -1,9 +0,0 @@
1156     -//390dim_signature
1157     -// should we dim signatures?
1158     -$_prefs['dim_signature'] = array(
1159     - 'value' => 1,
1160     - 'locked' => false,
1161     - 'shared' => false,
1162     - 'type' => 'checkbox',
1163     - 'desc' => _("Dim signatures?"));
1164     -
1165     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390show_quoteblocks mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390show_quoteblocks
1166     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390show_quoteblocks 1969-12-31 18:00:00.000000000 -0600
1167     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/390show_quoteblocks 2008-10-03 23:01:05.000000000 -0500
1168     @@ -0,0 +1,14 @@
1169     +//390show_quoteblocks
1170     +// should we show large blocks of quoted text or hide them?
1171     +$_prefs['show_quoteblocks'] = array(
1172     + 'value' => 'thread',
1173     + 'locked' => false,
1174     + 'shared' => false,
1175     + 'type' => 'enum',
1176     + 'enum' => array('shown' => _("Shown"),
1177     + 'thread' => _("Hidden in Thread View"),
1178     + 'list' => _("Hidden in List Messages"),
1179     + 'listthread' => _("Hidden in Thread View and List Messages"),
1180     + 'hidden' => _("Hidden")),
1181     + 'desc' => _("Should large blocks of quoted text be shown or hidden by default? It can be toggled easily whichever you choose."));
1182     +
1183     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/392dim_signature mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/392dim_signature
1184     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/392dim_signature 1969-12-31 18:00:00.000000000 -0600
1185     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/392dim_signature 2008-10-03 23:01:38.000000000 -0500
1186     @@ -0,0 +1,9 @@
1187     +//392dim_signature
1188     +// should we dim signatures?
1189     +$_prefs['dim_signature'] = array(
1190     + 'value' => 1,
1191     + 'locked' => false,
1192     + 'shared' => false,
1193     + 'type' => 'checkbox',
1194     + 'desc' => _("Dim signatures?"));
1195     +
1196     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/415use_vtrash mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/415use_vtrash
1197     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/415use_vtrash 2008-04-20 14:42:39.000000000 -0500
1198     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/415use_vtrash 2008-10-03 23:04:20.000000000 -0500
1199     @@ -4,6 +4,5 @@
1200     'value' => 0,
1201     'locked' => false,
1202     'shared' => false,
1203     - 'type' => 'checkbox',
1204     - 'desc' => _("Use Virtual Trash Folder?"));
1205     + 'type' => 'implicit');
1206    
1207     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/560save_recipients mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/560save_recipients
1208     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/560save_recipients 2008-04-20 15:16:37.000000000 -0500
1209     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/560save_recipients 2008-10-04 11:25:07.000000000 -0500
1210     @@ -1,4 +1,6 @@
1211     //560save_recipients
1212     +// Address book preferences
1213     +
1214     // Should recipients of outgoing messages be added automatically to
1215     // the address book?
1216     $_prefs['save_recipients'] = array(
1217     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/602pgp_verify mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/602pgp_verify
1218     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/602pgp_verify 2008-04-20 15:21:13.000000000 -0500
1219     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/602pgp_verify 2008-10-04 11:27:54.000000000 -0500
1220     @@ -1,5 +1,5 @@
1221     //602pgp_verify
1222     - $_prefs['pgp_verify'] = array(
1223     +$_prefs['pgp_verify'] = array(
1224     'value' => 1,
1225     'locked' => false,
1226     'shared' => false,
1227     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/00Header mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/00Header
1228     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/00Header 2008-04-19 19:23:00.000000000 -0500
1229     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/00Header 2008-10-01 19:32:35.000000000 -0500
1230     @@ -1,5 +1,5 @@
1231     //00Header
1232     /**
1233     - * $Horde: imp/config/servers.php.dist,v 1.50.2.20 2008/02/29 21:25:28 chuck Exp $
1234     + * $Horde: imp/config/servers.php.dist,v 1.50.2.23 2008/07/03 13:06:15 jan Exp $
1235     */
1236    
1237     diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers
1238     --- e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers 2008-04-19 20:17:59.000000000 -0500
1239     +++ mezzanine_patched_e-smith-imp-4.2/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers 2008-10-01 21:10:14.000000000 -0500
1240     @@ -11,8 +11,18 @@
1241     $OUT .= " 'name' => 'IMAP Server',\n";
1242     $OUT .= " 'server' => 'localhost',\n";
1243     $OUT .= " 'hordeauth' => false,\n";
1244     - $OUT .= " 'protocol' => 'imap/notls',\n";
1245     - $OUT .= " 'port' => '143',\n";
1246     +
1247     + if ($imaps{access} eq 'public')
1248     + {
1249     + $OUT .= " 'protocol' => 'imap/ssl/novalidate-cert',\n";
1250     + $OUT .= " 'port' => '$imaps{TCPPort}',\n";
1251     + }
1252     + else
1253     + {
1254     + $OUT .= " 'protocol' => 'imap/notls',\n";
1255     + $OUT .= " 'port' => '$imap{TCPPort}',\n";
1256     +
1257     + }
1258     $OUT .= " 'maildomain' => '$domain',\n";
1259     $OUT .= " 'smtphost' => 'localhost',\n";
1260     $OUT .= " 'smtpport' => '$smtpd{TCPPort}',\n";
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed