| 1 |
mrjhb3 |
1.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 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-2.2/root/home/httpd/html/horde/smeserver/turba.sql mezzanine_patched_e-smith-turba-2.2/root/home/httpd/html/horde/smeserver/turba.sql |
| 113 |
|
|
--- e-smith-turba-2.2/root/home/httpd/html/horde/smeserver/turba.sql 2008-06-18 22:59:32.000000000 -0500 |
| 114 |
|
|
+++ mezzanine_patched_e-smith-turba-2.2/root/home/httpd/html/horde/smeserver/turba.sql 2008-09-30 22:37:57.000000000 -0500 |
| 115 |
|
|
@@ -1,4 +1,4 @@ |
| 116 |
|
|
--- $Horde: turba/scripts/sql/turba.sql,v 1.1.2.5 2008/04/29 19:33:23 chuck Exp $ |
| 117 |
|
|
+-- $Horde: turba/scripts/sql/turba.sql,v 1.1.2.7 2008/09/23 15:18:25 jan Exp $ |
| 118 |
|
|
|
| 119 |
|
|
CREATE TABLE IF NOT EXISTS turba_objects ( |
| 120 |
|
|
object_id VARCHAR(32) NOT NULL, |
| 121 |
|
|
@@ -65,7 +65,7 @@ |
| 122 |
|
|
|
| 123 |
|
|
CREATE TABLE IF NOT EXISTS turba_shares_groups ( |
| 124 |
|
|
share_id INT NOT NULL, |
| 125 |
|
|
- group_uid INT NOT NULL, |
| 126 |
|
|
+ group_uid VARCHAR(255) NOT NULL, |
| 127 |
|
|
perm SMALLINT NOT NULL |
| 128 |
|
|
); |
| 129 |
|
|
|
| 130 |
|
|
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 |
| 131 |
|
|
--- 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 |
| 132 |
|
|
+++ 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 |
| 133 |
|
|
@@ -1,4 +1,4 @@ |
| 134 |
|
|
//00header |
| 135 |
|
|
/** |
| 136 |
|
|
- * $Horde: turba/config/sources.php.dist,v 1.97.6.29 2008/04/24 12:14:29 wrobel Exp $ |
| 137 |
|
|
+ * $Horde: turba/config/sources.php.dist,v 1.97.6.36 2008/09/12 10:02:42 jan Exp $ |
| 138 |
|
|
*/ |
| 139 |
|
|
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 |
| 140 |
|
|
--- 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 |
| 141 |
|
|
+++ 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 |
| 142 |
|
|
@@ -45,6 +45,10 @@ |
| 143 |
|
|
// 'format' => '%s %s'), |
| 144 |
|
|
'alias' => 'object_alias', |
| 145 |
|
|
'birthday' => 'object_bday', |
| 146 |
|
|
+ // The photo field requires at least Horde 3.3 and a matching type |
| 147 |
|
|
+ // field. |
| 148 |
|
|
+ 'photo' => 'object_photo', |
| 149 |
|
|
+ 'phototype' => 'object_phototype', |
| 150 |
|
|
'homeStreet' => 'object_homestreet', |
| 151 |
|
|
'homePOBox' => 'object_homepob', |
| 152 |
|
|
'homeCity' => 'object_homecity', |
| 153 |
|
|
@@ -74,6 +78,10 @@ |
| 154 |
|
|
'title' => 'object_title', |
| 155 |
|
|
'role' => 'object_role', |
| 156 |
|
|
'company' => 'object_company', |
| 157 |
|
|
+ // The logo field requires at least Horde 3.3 and a matching type |
| 158 |
|
|
+ // field. |
| 159 |
|
|
+ // 'logo' => 'object_logo', |
| 160 |
|
|
+ // 'logotype' => 'object_logotype', |
| 161 |
|
|
'category' => 'object_category', |
| 162 |
|
|
'notes' => 'object_notes', |
| 163 |
|
|
'website' => 'object_url', |
| 164 |
|
|
@@ -84,7 +92,7 @@ |
| 165 |
|
|
'tabs' => array( |
| 166 |
|
|
_("Personal") => array('firstname', 'lastname', 'middlenames', |
| 167 |
|
|
'namePrefix', 'nameSuffix', 'name', 'alias', |
| 168 |
|
|
- 'birthday'), |
| 169 |
|
|
+ 'birthday', 'photo'), |
| 170 |
|
|
_("Location") => array('homeStreet', 'homePOBox', 'homeCity', |
| 171 |
|
|
'homeProvince', 'homePostalCode', 'homeCountry', |
| 172 |
|
|
'homeAddress', 'workStreet', 'workPOBox', 'workCity', |
| 173 |
|
|
@@ -92,7 +100,7 @@ |
| 174 |
|
|
'timezone'), |
| 175 |
|
|
_("Communications") => array('email', 'homePhone', 'workPhone', |
| 176 |
|
|
'cellPhone', 'fax', 'pager'), |
| 177 |
|
|
- _("Organization") => array('title', 'role', 'company'), |
| 178 |
|
|
+ _("Organization") => array('title', 'role', 'company', 'logo'), |
| 179 |
|
|
_("Other") => array('category', 'notes', 'website', 'freebusyUrl', |
| 180 |
|
|
'pgpPublicKey', 'smimePublicKey'), |
| 181 |
|
|
), |
| 182 |
|
|
@@ -112,5 +120,6 @@ |
| 183 |
|
|
$OUT = " 'use_shares' => $sab,"; |
| 184 |
|
|
} |
| 185 |
|
|
'list_name_field' => 'lastname', |
| 186 |
|
|
+ 'alternative_name' => 'company', |
| 187 |
|
|
); |
| 188 |
|
|
|
| 189 |
|
|
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 |
| 190 |
|
|
--- e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2008-11-24 22:51:59.000000000 -0600 |
| 191 |
|
|
+++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2008-11-24 22:51:14.000000000 -0600 |
| 192 |
|
|
@@ -179,6 +179,36 @@ |
| 193 |
|
|
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 194 |
|
|
} |
| 195 |
|
|
|
| 196 |
|
|
+ unless (defined $turba_objects->{object_spouse}) |
| 197 |
|
|
+{ |
| 198 |
|
|
+ my $statement = |
| 199 |
|
|
+ "ALTER TABLE turba_objects ADD COLUMN object_spouse ". |
| 200 |
|
|
+ "VARCHAR(255)"; |
| 201 |
|
|
+ $statement = $db_turbahandle->prepare($statement) or |
| 202 |
|
|
+ die "prepare: $$statement: $DBI::errstr"; |
| 203 |
|
|
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 204 |
|
|
+} |
| 205 |
|
|
+ |
| 206 |
|
|
+ unless (defined $turba_objects->{object_anniversary}) |
| 207 |
|
|
+{ |
| 208 |
|
|
+ my $statement = |
| 209 |
|
|
+ "ALTER TABLE turba_objects ADD COLUMN object_anniversary ". |
| 210 |
|
|
+ "VARCHAR(10)"; |
| 211 |
|
|
+ $statement = $db_turbahandle->prepare($statement) or |
| 212 |
|
|
+ die "prepare: $$statement: $DBI::errstr"; |
| 213 |
|
|
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 214 |
|
|
+} |
| 215 |
|
|
+ |
| 216 |
|
|
+ unless (defined $turba_objects->{object_children}) |
| 217 |
|
|
+{ |
| 218 |
|
|
+ my $statement = |
| 219 |
|
|
+ "ALTER TABLE turba_objects ADD COLUMN object_children ". |
| 220 |
|
|
+ "VARCHAR(255)"; |
| 221 |
|
|
+ $statement = $db_turbahandle->prepare($statement) or |
| 222 |
|
|
+ die "prepare: $$statement: $DBI::errstr"; |
| 223 |
|
|
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 224 |
|
|
+} |
| 225 |
|
|
+ |
| 226 |
|
|
unless (defined $turba_objects->{object_homestreet}) |
| 227 |
|
|
{ |
| 228 |
|
|
my $statement = |
| 229 |
|
|
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 |
| 230 |
|
|
--- 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 |
| 231 |
|
|
+++ 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 |
| 232 |
|
|
@@ -45,7 +45,10 @@ |
| 233 |
|
|
// 'format' => '%s %s'), |
| 234 |
|
|
'alias' => 'object_alias', |
| 235 |
|
|
'birthday' => 'object_bday', |
| 236 |
|
|
- // The photo field requires at least Horde 3.3 and a matching type |
| 237 |
|
|
+ 'spouse' => 'object_spouse', |
| 238 |
|
|
+ 'anniversary' => 'object_anniversary', |
| 239 |
|
|
+ 'children' => 'object_children', |
| 240 |
|
|
+ // The photo field requires at least Horde 3.3 and a matching type |
| 241 |
|
|
// field. |
| 242 |
|
|
'photo' => 'object_photo', |
| 243 |
|
|
'phototype' => 'object_phototype', |
| 244 |
|
|
@@ -80,8 +83,8 @@ |
| 245 |
|
|
'company' => 'object_company', |
| 246 |
|
|
// The logo field requires at least Horde 3.3 and a matching type |
| 247 |
|
|
// field. |
| 248 |
|
|
- // 'logo' => 'object_logo', |
| 249 |
|
|
- // 'logotype' => 'object_logotype', |
| 250 |
|
|
+ 'logo' => 'object_logo', |
| 251 |
|
|
+ 'logotype' => 'object_logotype', |
| 252 |
|
|
'category' => 'object_category', |
| 253 |
|
|
'notes' => 'object_notes', |
| 254 |
|
|
'website' => 'object_url', |
| 255 |
|
|
@@ -92,7 +95,7 @@ |
| 256 |
|
|
'tabs' => array( |
| 257 |
|
|
_("Personal") => array('firstname', 'lastname', 'middlenames', |
| 258 |
|
|
'namePrefix', 'nameSuffix', 'name', 'alias', |
| 259 |
|
|
- 'birthday', 'photo'), |
| 260 |
|
|
+ 'birthday', 'spouse', 'anniversary', 'children' , 'photo'), |
| 261 |
|
|
_("Location") => array('homeStreet', 'homePOBox', 'homeCity', |
| 262 |
|
|
'homeProvince', 'homePostalCode', 'homeCountry', |
| 263 |
|
|
'homeAddress', 'workStreet', 'workPOBox', 'workCity', |
Parent Directory
| 
Revision Log
| 
Revision Graph
