1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/00header m |
2 |
ezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/00header |
3 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/00header 2008-05-24 22:30:09.00000000 |
4 |
0 -0500 |
5 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/00header 2008-10-04 1 |
6 |
5:01:12.000000000 -0500 |
7 |
@@ -1,3 +1,3 @@ |
8 |
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ |
9 |
-// $Horde: turba/config/conf.xml,v 1.6.2.5 2008/05/06 21:26:59 bklang Exp $ |
10 |
+// $Horde: turba/config/conf.xml,v 1.6.2.6 2008/06/25 15:52:54 jan Exp $ |
11 |
|
12 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/events/actions/turba_upgrade mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/events/actions/turba_upgrade |
13 |
--- e-smith-turba-2.2/root/etc/e-smith/events/actions/turba_upgrade 2008-06-12 22:00:21.000000000 -0500 |
14 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/events/actions/turba_upgrade 2008-09-30 22:47:38.000000000 -0500 |
15 |
@@ -417,6 +417,36 @@ |
16 |
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
17 |
} |
18 |
|
19 |
+ unless (defined $turba_shares->{share_owner}) |
20 |
+{ |
21 |
+ my $statement = |
22 |
+ "ALTER TABLE turba_shares CHANGE share_owner share_onwer ". |
23 |
+ "VARCHAR(255)"; |
24 |
+ $statement = $db_turbahandle->prepare($statement) or |
25 |
+ die "prepare: $$statement: $DBI::errstr"; |
26 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
27 |
+} |
28 |
+ |
29 |
+ unless (defined $turba_shares_users->{user_uid}) |
30 |
+{ |
31 |
+ my $statement = |
32 |
+ "ALTER TABLE turba_shares_users CHANGE user_uid user_uid ". |
33 |
+ "VARCHAR(255)"; |
34 |
+ $statement = $db_turbahandle->prepare($statement) or |
35 |
+ die "prepare: $$statement: $DBI::errstr"; |
36 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
37 |
+} |
38 |
+ |
39 |
+ unless (defined $turba_shares_groups->{group_uid}) |
40 |
+{ |
41 |
+ my $statement = |
42 |
+ "ALTER TABLE turba_shares_groups CHANGE group_uid group_uid ". |
43 |
+ "VARCHAR(255)"; |
44 |
+ $statement = $db_turbahandle->prepare($statement) or |
45 |
+ die "prepare: $$statement: $DBI::errstr"; |
46 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
47 |
+} |
48 |
+ |
49 |
# Create an index for owner_id if needed |
50 |
unless ($turba_objects->{owner_id}->{Key}) |
51 |
{ |
52 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header |
53 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header 2008-09-30 22:48:39.000000000 -0500 |
54 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/00header 2008-09-29 23:15:17.000000000 -0500 |
55 |
@@ -1,6 +1,6 @@ |
56 |
//00header |
57 |
/** |
58 |
- * $Horde: turba/config/prefs.php.dist,v 1.28.10.9 2008/06/13 14:44:04 jan Exp $ |
59 |
+ * $Horde: turba/config/prefs.php.dist,v 1.28.10.10 2008/07/10 22:52:41 jan Exp $ |
60 |
* |
61 |
* See horde/config/prefs.php for documentation on the structure of this file. |
62 |
*/ |
63 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect |
64 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect 2008-05-24 22:33:59.000000000 -0500 |
65 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/160addressbookselect 2008-09-29 23:17:09.000000000 -0500 |
66 |
@@ -1,5 +1,5 @@ |
67 |
//160addressbookselect |
68 |
-// address Book selection widget |
69 |
+// Address Book selection widget |
70 |
$_prefs['addressbookselect'] = array( |
71 |
'locked' => false, |
72 |
'type' => 'special', |
73 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks |
74 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks 2008-06-25 21:42:03.000000000 -0500 |
75 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks 2008-10-11 11:48:23.000000000 -0500 |
76 |
@@ -6,7 +6,7 @@ |
77 |
// double quotes are REQUIRED). If 'value' is empty (''), all address |
78 |
// books that the user has permissions to will be listed. |
79 |
$_prefs['addressbooks'] = array( |
80 |
- 'value' => 'localsql', |
81 |
+ 'value' => '', |
82 |
'locked' => false, |
83 |
'shared' => false, |
84 |
'type' => 'implicit', |
85 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/265prefbooks mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/265prefbooks |
86 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/265prefbooks 1969-12-31 18:00:00.000000000 -0600 |
87 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/265prefbooks 2008-09-29 23:20:52.000000000 -0500 |
88 |
@@ -0,0 +1,9 @@ |
89 |
+//265prefbooks |
90 |
+// preference for holding any preferences-based addressbooks. |
91 |
+$_prefs['prefbooks'] = array( |
92 |
+ 'value' => '', |
93 |
+ 'locked' => false, |
94 |
+ 'shared' => false, |
95 |
+ 'type' => 'implicit', |
96 |
+); |
97 |
+ |
98 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/275owncontact mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/275owncontact |
99 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/275owncontact 1969-12-31 18:00:00.000000000 -0600 |
100 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/275owncontact 2008-09-29 23:21:36.000000000 -0500 |
101 |
@@ -0,0 +1,10 @@ |
102 |
+//275owncontact |
103 |
+// Personal contact. |
104 |
+$_prefs['own_contact'] = array( |
105 |
+ // The format is 'source_name;contact_id'. |
106 |
+ 'value' => '', |
107 |
+ 'locked' => false, |
108 |
+ 'shared' => false, |
109 |
+ 'type' => 'implicit' |
110 |
+); |
111 |
+ |
112 |
--- e-smith-turba-3.0.0/root/home/httpd/html/horde/smeserver/turba.sql.orig 2008-06-19 05:59:32.000000000 +0200 |
113 |
+++ e-smith-turba-3.0.0/root/home/httpd/html/horde/smeserver/turba.sql 2009-01-04 18:51:02.000000000 +0100 |
114 |
@@ -1,4 +1,4 @@ |
115 |
--- $Horde: turba/scripts/sql/turba.sql,v 1.1.2.5 2008/04/29 19:33:23 chuck Exp $ |
116 |
+-- $Horde: turba/scripts/sql/turba.sql,v 1.1.2.7 2008/09/23 15:18:25 jan Exp $ |
117 |
|
118 |
CREATE TABLE IF NOT EXISTS turba_objects ( |
119 |
object_id VARCHAR(32) NOT NULL, |
120 |
@@ -65,7 +65,7 @@ |
121 |
|
122 |
CREATE TABLE IF NOT EXISTS turba_shares_groups ( |
123 |
share_id INT NOT NULL, |
124 |
- group_uid INT NOT NULL, |
125 |
+ group_uid VARCHAR(255) NOT NULL, |
126 |
perm SMALLINT NOT NULL |
127 |
); |
128 |
|
129 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header |
130 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header 2008-05-24 22:41:18.000000000 -0500 |
131 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header 2008-10-04 18:56:56.000000000 -0500 |
132 |
@@ -1,4 +1,4 @@ |
133 |
//00header |
134 |
/** |
135 |
- * $Horde: turba/config/sources.php.dist,v 1.97.6.29 2008/04/24 12:14:29 wrobel Exp $ |
136 |
+ * $Horde: turba/config/sources.php.dist,v 1.97.6.36 2008/09/12 10:02:42 jan Exp $ |
137 |
*/ |
138 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL |
139 |
--- e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2008-05-24 22:48:11.000000000 -0500 |
140 |
+++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2008-10-04 19:00:20.000000000 -0500 |
141 |
@@ -45,6 +45,10 @@ |
142 |
// 'format' => '%s %s'), |
143 |
'alias' => 'object_alias', |
144 |
'birthday' => 'object_bday', |
145 |
+ // The photo field requires at least Horde 3.3 and a matching type |
146 |
+ // field. |
147 |
+ 'photo' => 'object_photo', |
148 |
+ 'phototype' => 'object_phototype', |
149 |
'homeStreet' => 'object_homestreet', |
150 |
'homePOBox' => 'object_homepob', |
151 |
'homeCity' => 'object_homecity', |
152 |
@@ -74,6 +78,10 @@ |
153 |
'title' => 'object_title', |
154 |
'role' => 'object_role', |
155 |
'company' => 'object_company', |
156 |
+ // The logo field requires at least Horde 3.3 and a matching type |
157 |
+ // field. |
158 |
+ // 'logo' => 'object_logo', |
159 |
+ // 'logotype' => 'object_logotype', |
160 |
'category' => 'object_category', |
161 |
'notes' => 'object_notes', |
162 |
'website' => 'object_url', |
163 |
@@ -84,7 +92,7 @@ |
164 |
'tabs' => array( |
165 |
_("Personal") => array('firstname', 'lastname', 'middlenames', |
166 |
'namePrefix', 'nameSuffix', 'name', 'alias', |
167 |
- 'birthday'), |
168 |
+ 'birthday', 'photo'), |
169 |
_("Location") => array('homeStreet', 'homePOBox', 'homeCity', |
170 |
'homeProvince', 'homePostalCode', 'homeCountry', |
171 |
'homeAddress', 'workStreet', 'workPOBox', 'workCity', |
172 |
@@ -92,7 +100,7 @@ |
173 |
'timezone'), |
174 |
_("Communications") => array('email', 'homePhone', 'workPhone', |
175 |
'cellPhone', 'fax', 'pager'), |
176 |
- _("Organization") => array('title', 'role', 'company'), |
177 |
+ _("Organization") => array('title', 'role', 'company', 'logo'), |
178 |
_("Other") => array('category', 'notes', 'website', 'freebusyUrl', |
179 |
'pgpPublicKey', 'smimePublicKey'), |
180 |
), |
181 |
@@ -112,5 +120,6 @@ |
182 |
$OUT = " 'use_shares' => $sab,"; |
183 |
} |
184 |
'list_name_field' => 'lastname', |
185 |
+ 'alternative_name' => 'company', |
186 |
); |
187 |
|
188 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade |
189 |
--- e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2008-11-24 22:51:59.000000000 -0600 |
190 |
+++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2008-11-24 22:51:14.000000000 -0600 |
191 |
@@ -179,6 +179,36 @@ |
192 |
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
193 |
} |
194 |
|
195 |
+ unless (defined $turba_objects->{object_spouse}) |
196 |
+{ |
197 |
+ my $statement = |
198 |
+ "ALTER TABLE turba_objects ADD COLUMN object_spouse ". |
199 |
+ "VARCHAR(255)"; |
200 |
+ $statement = $db_turbahandle->prepare($statement) or |
201 |
+ die "prepare: $$statement: $DBI::errstr"; |
202 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
203 |
+} |
204 |
+ |
205 |
+ unless (defined $turba_objects->{object_anniversary}) |
206 |
+{ |
207 |
+ my $statement = |
208 |
+ "ALTER TABLE turba_objects ADD COLUMN object_anniversary ". |
209 |
+ "VARCHAR(10)"; |
210 |
+ $statement = $db_turbahandle->prepare($statement) or |
211 |
+ die "prepare: $$statement: $DBI::errstr"; |
212 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
213 |
+} |
214 |
+ |
215 |
+ unless (defined $turba_objects->{object_children}) |
216 |
+{ |
217 |
+ my $statement = |
218 |
+ "ALTER TABLE turba_objects ADD COLUMN object_children ". |
219 |
+ "VARCHAR(255)"; |
220 |
+ $statement = $db_turbahandle->prepare($statement) or |
221 |
+ die "prepare: $$statement: $DBI::errstr"; |
222 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
223 |
+} |
224 |
+ |
225 |
unless (defined $turba_objects->{object_homestreet}) |
226 |
{ |
227 |
my $statement = |
228 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL |
229 |
--- e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2008-11-24 22:51:59.000000000 -0600 |
230 |
+++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2008-11-24 22:46:00.000000000 -0600 |
231 |
@@ -45,7 +45,10 @@ |
232 |
// 'format' => '%s %s'), |
233 |
'alias' => 'object_alias', |
234 |
'birthday' => 'object_bday', |
235 |
- // The photo field requires at least Horde 3.3 and a matching type |
236 |
+ 'spouse' => 'object_spouse', |
237 |
+ 'anniversary' => 'object_anniversary', |
238 |
+ 'children' => 'object_children', |
239 |
+ // The photo field requires at least Horde 3.3 and a matching type |
240 |
// field. |
241 |
'photo' => 'object_photo', |
242 |
'phototype' => 'object_phototype', |
243 |
@@ -80,8 +83,8 @@ |
244 |
'company' => 'object_company', |
245 |
// The logo field requires at least Horde 3.3 and a matching type |
246 |
// field. |
247 |
- // 'logo' => 'object_logo', |
248 |
- // 'logotype' => 'object_logotype', |
249 |
+ 'logo' => 'object_logo', |
250 |
+ 'logotype' => 'object_logotype', |
251 |
'category' => 'object_category', |
252 |
'notes' => 'object_notes', |
253 |
'website' => 'object_url', |
254 |
@@ -92,7 +95,7 @@ |
255 |
'tabs' => array( |
256 |
_("Personal") => array('firstname', 'lastname', 'middlenames', |
257 |
'namePrefix', 'nameSuffix', 'name', 'alias', |
258 |
- 'birthday', 'photo'), |
259 |
+ 'birthday', 'spouse', 'anniversary', 'children' , 'photo'), |
260 |
_("Location") => array('homeStreet', 'homePOBox', 'homeCity', |
261 |
'homeProvince', 'homePostalCode', 'homeCountry', |
262 |
'homeAddress', 'workStreet', 'workPOBox', 'workCity', |