/[smeserver]/rpms/e-smith-turba/sme8/e-smith-turba-1.7-13.turba214_prefs.php.patch
ViewVC logotype

Contents of /rpms/e-smith-turba/sme8/e-smith-turba-1.7-13.turba214_prefs.php.patch

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


Revision 1.2 - (show annotations) (download)
Thu Jun 26 05:10:05 2008 UTC (16 years, 5 months ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
* Fri Jun 20 2008 John H. Bennett III <bennettj@johnbennettservices.com> 2.2-2
- Upgrade patch for Turba 2.2.1

1 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header
2 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header 2007-03-24 20:08:50.000000000 -0500
3 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header 2007-03-24 19:41:20.000000000 -0500
4 @@ -1,6 +1,6 @@
5 //00header
6 /**
7 - * $Horde: turba/config/prefs.php.dist,v 1.28.10.2 2005/10/24 15:39:12 jan Exp $
8 + * $Horde: turba/config/prefs.php.dist,v 1.28.10.3 2006/12/13 16:32:21 chuck Exp $
9 *
10 * See horde/config/prefs.php for documentation on the structure of this file.
11 */
12 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/100displayoptions mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/100displayoptions
13 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/100displayoptions 2007-03-24 20:08:50.000000000 -0500
14 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/100displayoptions 2007-03-24 19:46:54.000000000 -0500
15 @@ -3,5 +3,5 @@
16 'column' => _("Display Options"),
17 'label' => _("Address Books"),
18 'desc' => _("Choose which address books to use."),
19 - 'members' => array('default_dir', 'addressbookselect')
20 + 'members' => array('default_dir', 'addressbookselect'),
21 );
22 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/110columnoptions mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/110columnoptions
23 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/110columnoptions 2007-03-24 20:08:50.000000000 -0500
24 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/110columnoptions 2007-03-24 19:47:30.000000000 -0500
25 @@ -3,5 +3,5 @@
26 'column' => _("Display Options"),
27 'label' => _("Column Options"),
28 'desc' => _("Select which fields to display in the address lists."),
29 - 'members' => array('columnselect')
30 + 'members' => array('columnselect'),
31 );
32 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/120display mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/120display
33 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/120display 2007-03-24 20:08:50.000000000 -0500
34 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/120display 2007-03-24 19:48:38.000000000 -0500
35 @@ -3,5 +3,5 @@
36 'column' => _("Display Options"),
37 'label' => _("Display"),
38 'desc' => _("Select view to display by default, sort options, and paging options."),
39 - 'members' => array('initial_page', 'sortby', 'sortdir', 'maxpage', 'perpage', 'adv_results_placement')
40 + 'members' => array('initial_page', 'sortby', 'sortdir', 'maxpage', 'perpage'),
41 );
42 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/130format mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/130format
43 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/130format 2007-03-24 20:08:50.000000000 -0500
44 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/130format 2007-03-24 19:49:50.000000000 -0500
45 @@ -3,5 +3,5 @@
46 'column' => _("Display Options"),
47 'label' => _("Name Format"),
48 'desc' => _("Select which format to display names."),
49 - 'members' => array('name_format')
50 + 'members' => array('name_format'),
51 );
52 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/140application mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/140application
53 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/140application 2007-03-24 20:08:50.000000000 -0500
54 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/140application 1969-12-31 18:00:00.000000000 -0600
55 @@ -1,7 +0,0 @@
56 -//140application
57 -$prefGroups['application'] = array(
58 - 'column' => _("Other Options"),
59 - 'label' => _("Delete Confirmation"),
60 - 'desc' => _("Delete button behaviour"),
61 - 'members' => array('delete_opt')
62 -);
63 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/150imsp mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/150imsp
64 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/150imsp 2007-03-24 20:08:50.000000000 -0500
65 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/150imsp 2007-03-24 19:50:41.000000000 -0500
66 @@ -5,6 +5,6 @@
67 'column' => _("Other Options"),
68 'label' => _("IMSP Address Book Administration"),
69 'desc' => _("Add and Delete IMSP address books"),
70 - 'members' => array('imsp_opt')
71 + 'members' => array('imsp_opt'),
72 );
73 \}
74 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect
75 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect 2007-03-24 20:08:50.000000000 -0500
76 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect 2007-03-24 19:51:11.000000000 -0500
77 @@ -2,5 +2,5 @@
78 // address book selection widget
79 $_prefs['addressbookselect'] = array(
80 'locked' => false,
81 - 'type' => 'special'
82 + 'type' => 'special',
83 );
84 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks
85 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks 2007-03-24 20:08:50.000000000 -0500
86 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks 2007-03-24 19:51:25.000000000 -0500
87 @@ -4,5 +4,5 @@
88 'value' => "",
89 'locked' => false,
90 'shared' => false,
91 - 'type' => 'implicit'
92 + 'type' => 'implicit',
93 );
94 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/180columnselect mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/180columnselect
95 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/180columnselect 2007-03-24 20:08:50.000000000 -0500
96 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/180columnselect 2007-03-24 19:51:33.000000000 -0500
97 @@ -2,5 +2,5 @@
98 // columns selection widget
99 $_prefs['columnselect'] = array(
100 'locked' => false,
101 - 'type' => 'special'
102 + 'type' => 'special',
103 );
104 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/190columns mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/190columns
105 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/190columns 2007-03-24 20:08:50.000000000 -0500
106 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/190columns 2007-03-24 19:51:42.000000000 -0500
107 @@ -4,5 +4,5 @@
108 'value' => "netcenter\temail\nbigfoot\temail\nverisign\temail\nlocalsql\temail",
109 'locked' => false,
110 'shared' => false,
111 - 'type' => 'implicit'
112 + 'type' => 'implicit',
113 );
114 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/200sortby mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/200sortby
115 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/200sortby 2007-03-24 20:08:50.000000000 -0500
116 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/200sortby 2007-03-24 19:52:02.000000000 -0500
117 @@ -5,5 +5,5 @@
118 'value' => 0,
119 'locked' => false,
120 'shared' => false,
121 - 'type' => 'implicit'
122 + 'type' => 'implicit',
123 );
124 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/210sortdir mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/210sortdir
125 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/210sortdir 2007-03-24 20:08:50.000000000 -0500
126 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/210sortdir 2007-03-24 19:52:45.000000000 -0500
127 @@ -7,5 +7,5 @@
128 'type' => 'enum',
129 'enum' => array(0 => _("Ascending"),
130 1 => _("Descending")),
131 - 'desc' => _("Default sorting direction:")
132 + 'desc' => _("Default sorting direction:"),
133 );
134 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/220maxpage mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/220maxpage
135 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/220maxpage 2007-03-24 20:08:50.000000000 -0500
136 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/220maxpage 2007-03-24 19:53:01.000000000 -0500
137 @@ -5,5 +5,5 @@
138 'locked' => false,
139 'shared' => false,
140 'type' => 'number',
141 - 'desc' => _("Maximum number of pages")
142 + 'desc' => _("Maximum number of pages"),
143 );
144 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/230perpage mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/230perpage
145 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/230perpage 2007-03-24 20:08:50.000000000 -0500
146 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/230perpage 2007-03-24 19:53:13.000000000 -0500
147 @@ -4,5 +4,5 @@
148 'locked' => false,
149 'shared' => false,
150 'type' => 'number',
151 - 'desc' => _("Number of items per page")
152 + 'desc' => _("Number of items per page"),
153 );
154 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/240initialpage mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/240initialpage
155 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/240initialpage 2007-03-24 20:08:50.000000000 -0500
156 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/240initialpage 2007-03-24 19:53:23.000000000 -0500
157 @@ -7,5 +7,5 @@
158 'type' => 'enum',
159 'desc' => _("View to display by default:"),
160 'enum' => array('browse.php' => _("Address Book Listing"),
161 - 'search.php' => _("Search"))
162 + 'search.php' => _("Search")),
163 );
164 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/250nameformat mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/250nameformat
165 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/250nameformat 2007-03-24 20:08:50.000000000 -0500
166 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/250nameformat 2007-03-24 19:53:36.000000000 -0500
167 @@ -8,5 +8,5 @@
168 'desc' => _("Select the format used to display names:"),
169 'enum' => array('last_first' => _("\"Lastname, Firstname\" (ie. Doe, John)"),
170 'first_last' => _("\"Firstname Lastname\" (ie. John Doe)"),
171 - 'none' => _("no formatting"))
172 + 'none' => _("no formatting")),
173 );
174 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/260defaultdir mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/260defaultdir
175 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/260defaultdir 2007-03-24 20:08:50.000000000 -0500
176 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/260defaultdir 2007-03-24 19:53:50.000000000 -0500
177 @@ -6,5 +6,5 @@
178 'locked' => false,
179 'shared' => true,
180 'type' => 'select',
181 - 'desc' => _("This will be the default address book when adding or importing contacts.")
182 + 'desc' => _("This will be the default address book when adding or importing contacts."),
183 );
184 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/270advresultsplacement mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/270advresultsplacement
185 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/270advresultsplacement 2007-03-24 20:08:50.000000000 -0500
186 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/270advresultsplacement 1969-12-31 18:00:00.000000000 -0600
187 @@ -1,12 +0,0 @@
188 -//270advresultsplacement
189 -// Advanced search results placement. Are results positioned above or below
190 -// the search form?
191 -$_prefs['adv_results_placement'] = array(
192 - 'value' => 'below',
193 - 'locked' => false,
194 - 'shared' => false,
195 - 'type' => 'enum',
196 - 'desc' => _("Specify where you want advanced search results to appear."),
197 - 'enum' => array('below' => _("Below search form"),
198 - 'above' => _("Above search form"))
199 -);
200 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/280prefbooks mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/280prefbooks
201 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/280prefbooks 2007-03-24 20:08:50.000000000 -0500
202 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/280prefbooks 2007-03-24 20:03:36.000000000 -0500
203 @@ -1,8 +1,10 @@
204 //280prefbooks
205 +// Advanced search results placement. Are results positioned above or below
206 +// the search form?
207 // preference for holding any preferences-based addressbooks.
208 $_prefs['prefbooks'] = array(
209 'value' => '',
210 'locked' => false,
211 'shared' => false,
212 - 'type' => 'implicit'
213 + 'type' => 'implicit',
214 );
215 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/290deleteopt mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/290deleteopt
216 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/290deleteopt 2007-03-24 20:08:50.000000000 -0500
217 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/290deleteopt 1969-12-31 18:00:00.000000000 -0600
218 @@ -1,9 +0,0 @@
219 -//290deleteopt
220 -// preference for delete confirmation dialog.
221 -$_prefs['delete_opt'] = array(
222 - 'value' => '1',
223 - 'locked' => false,
224 - 'shared' => false,
225 - 'type' => 'checkbox',
226 - 'desc' => _("Do you want to confirm deleting entries?")
227 -);
228 diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/300imspopt mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/300imspopt
229 --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/300imspopt 2007-03-24 20:08:50.000000000 -0500
230 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/300imspopt 2007-03-24 19:58:30.000000000 -0500
231 @@ -3,6 +3,6 @@
232 !isset($GLOBALS['conf']['imsp']['enabled'])) \{
233 $_prefs['imsp_opt'] = array(
234 'locked' => false,
235 - 'type' => 'special'
236 + 'type' => 'special',
237 );
238 \}

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed