1 |
mrjhb3 |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header |
2 |
|
|
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header 2009-12-28 11:25:18.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header 2009-12-28 11:16:44.000000000 -0600 |
4 |
|
|
@@ -8,7 +8,7 @@ |
5 |
|
|
* |
6 |
|
|
* For more information please see the horde/config/hooks.php.dist file. |
7 |
|
|
* |
8 |
|
|
- * $Horde: imp/config/hooks.php.dist,v 1.3.2.5 2008/06/05 09:04:14 jan Exp $ |
9 |
|
|
+ * $Horde: imp/config/hooks.php.dist,v 1.3.2.13 2009-11-18 13:14:32 jan Exp $ |
10 |
|
|
*/ |
11 |
|
|
|
12 |
|
|
|
13 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header |
14 |
|
|
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header 2009-12-28 11:25:18.000000000 -0600 |
15 |
|
|
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header 2009-12-28 11:18:43.000000000 -0600 |
16 |
|
|
@@ -1,6 +1,6 @@ |
17 |
|
|
//000preamble |
18 |
|
|
/** |
19 |
|
|
- * $Horde: imp/config/prefs.php.dist,v 1.216.4.34 2008/08/28 21:03:15 slusarz Exp $ |
20 |
|
|
+ * $Horde: imp/config/prefs.php.dist,v 1.216.4.37 2009-11-29 05:27:14 chuck Exp $ |
21 |
|
|
* |
22 |
|
|
* See horde/config/prefs.php for documentation on the structure of this file. |
23 |
|
|
*/ |
24 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks |
25 |
|
|
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks 2008-04-19 22:50:45.000000000 -0500 |
26 |
|
|
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks 2009-12-28 11:20:26.000000000 -0600 |
27 |
|
|
@@ -1,8 +1,11 @@ |
28 |
|
|
//075addressbooks |
29 |
|
|
-$prefGroups['addressbooks'] = array( |
30 |
|
|
- 'column' => _("Other Options"), |
31 |
|
|
- 'label' => _("Address Books"), |
32 |
|
|
- 'desc' => _("Select address book sources for adding and searching for addresses."), |
33 |
|
|
- 'members' => array('save_recipients', 'display_contact', 'sourceselect') |
34 |
|
|
-); |
35 |
|
|
+$contacts_app = $GLOBALS['registry']->hasInterface('contacts'); |
36 |
|
|
+if ($contacts_app && $GLOBALS['registry']->hasPermission($contacts_app)) \{ |
37 |
|
|
+ $prefGroups['addressbooks'] = array( |
38 |
|
|
+ 'column' => _("Other Options"), |
39 |
|
|
+ 'label' => _("Address Books"), |
40 |
|
|
+ 'desc' => _("Select address book sources for adding and searching for addresses."), |
41 |
|
|
+ 'members' => array('save_recipients', 'display_contact', 'sourceselect') |
42 |
|
|
+ ); |
43 |
|
|
+\} |
44 |
|
|
|
45 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons |
46 |
|
|
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons 2009-12-28 11:25:18.000000000 -0600 |
47 |
|
|
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons 2009-12-28 11:22:23.000000000 -0600 |
48 |
|
|
@@ -1,7 +1,9 @@ |
49 |
|
|
//300fckeditor_buttons |
50 |
|
|
// The list of buttons to show in FCKeditor |
51 |
|
|
$_prefs['fckeditor_buttons'] = array( |
52 |
|
|
- 'value' => "[['FontFormat','FontName','FontSize'],['Bold','Italic','Underline'],['TextColor','BGColor'],'/',['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],['OrderedList','UnorderedList','Outdent','Indent'],['Link'],['Undo','Redo']]", |
53 |
|
|
+ 'value' => "[['Source','FitWindow','-','Templates'],['Cut','Copy','Paste','PasteText','PasteWord'],['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],'/',['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],['Link','Unlink'],['Image','Flash','Table','Rule','Smiley','SpecialChar'],'/',['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],['TextColor','BGColor'],'/',['Style','FontFormat','FontName','FontSize']]", |
54 |
|
|
+ // Use the following line for a very basic set of buttons: |
55 |
|
|
+ // 'value' => "['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink']", |
56 |
|
|
'locked' => true, |
57 |
|
|
'shared' => false, |
58 |
|
|
'type' => 'textarea', |