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 ezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/00header --- 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 0 -0500 +++ 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 5:01:12.000000000 -0500 @@ -1,3 +1,3 @@ /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ -// $Horde: turba/config/conf.xml,v 1.6.2.5 2008/05/06 21:26:59 bklang Exp $ +// $Horde: turba/config/conf.xml,v 1.6.2.6 2008/06/25 15:52:54 jan Exp $ 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 --- e-smith-turba-2.2/root/etc/e-smith/events/actions/turba_upgrade 2008-06-12 22:00:21.000000000 -0500 +++ mezzanine_patched_e-smith-turba-2.2/root/etc/e-smith/events/actions/turba_upgrade 2008-09-30 22:47:38.000000000 -0500 @@ -417,6 +417,36 @@ $statement->execute or die "execute: $$statement: $DBI::errstr"; } + unless (defined $turba_shares->{share_owner}) +{ + my $statement = + "ALTER TABLE turba_shares CHANGE share_owner share_onwer ". + "VARCHAR(255)"; + $statement = $db_turbahandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + + unless (defined $turba_shares_users->{user_uid}) +{ + my $statement = + "ALTER TABLE turba_shares_users CHANGE user_uid user_uid ". + "VARCHAR(255)"; + $statement = $db_turbahandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + + unless (defined $turba_shares_groups->{group_uid}) +{ + my $statement = + "ALTER TABLE turba_shares_groups CHANGE group_uid group_uid ". + "VARCHAR(255)"; + $statement = $db_turbahandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + # Create an index for owner_id if needed unless ($turba_objects->{owner_id}->{Key}) { 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 --- 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 +++ 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 @@ -1,6 +1,6 @@ //00header /** - * $Horde: turba/config/prefs.php.dist,v 1.28.10.9 2008/06/13 14:44:04 jan Exp $ + * $Horde: turba/config/prefs.php.dist,v 1.28.10.10 2008/07/10 22:52:41 jan Exp $ * * See horde/config/prefs.php for documentation on the structure of this file. */ 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 --- 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 +++ 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 @@ -1,5 +1,5 @@ //160addressbookselect -// address Book selection widget +// Address Book selection widget $_prefs['addressbookselect'] = array( 'locked' => false, 'type' => 'special', 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 --- 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 +++ 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 @@ -6,7 +6,7 @@ // double quotes are REQUIRED). If 'value' is empty (''), all address // books that the user has permissions to will be listed. $_prefs['addressbooks'] = array( - 'value' => 'localsql', + 'value' => '', 'locked' => false, 'shared' => false, 'type' => 'implicit', 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 --- 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 +++ 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 @@ -0,0 +1,9 @@ +//265prefbooks +// preference for holding any preferences-based addressbooks. +$_prefs['prefbooks'] = array( + 'value' => '', + 'locked' => false, + 'shared' => false, + 'type' => 'implicit', +); + 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 --- 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 +++ 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 @@ -0,0 +1,10 @@ +//275owncontact +// Personal contact. +$_prefs['own_contact'] = array( + // The format is 'source_name;contact_id'. + 'value' => '', + 'locked' => false, + 'shared' => false, + 'type' => 'implicit' +); + --- e-smith-turba-3.0.0/root/home/httpd/html/horde/smeserver/turba.sql.orig 2008-06-19 05:59:32.000000000 +0200 +++ e-smith-turba-3.0.0/root/home/httpd/html/horde/smeserver/turba.sql 2009-01-04 18:51:02.000000000 +0100 @@ -1,4 +1,4 @@ --- $Horde: turba/scripts/sql/turba.sql,v 1.1.2.5 2008/04/29 19:33:23 chuck Exp $ +-- $Horde: turba/scripts/sql/turba.sql,v 1.1.2.7 2008/09/23 15:18:25 jan Exp $ CREATE TABLE IF NOT EXISTS turba_objects ( object_id VARCHAR(32) NOT NULL, @@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS turba_shares_groups ( share_id INT NOT NULL, - group_uid INT NOT NULL, + group_uid VARCHAR(255) NOT NULL, perm SMALLINT NOT NULL ); 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 --- 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 +++ 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 @@ -1,4 +1,4 @@ //00header /** - * $Horde: turba/config/sources.php.dist,v 1.97.6.29 2008/04/24 12:14:29 wrobel Exp $ + * $Horde: turba/config/sources.php.dist,v 1.97.6.36 2008/09/12 10:02:42 jan Exp $ */ 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 --- 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 +++ 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 @@ -45,6 +45,10 @@ // 'format' => '%s %s'), 'alias' => 'object_alias', 'birthday' => 'object_bday', + // The photo field requires at least Horde 3.3 and a matching type + // field. + 'photo' => 'object_photo', + 'phototype' => 'object_phototype', 'homeStreet' => 'object_homestreet', 'homePOBox' => 'object_homepob', 'homeCity' => 'object_homecity', @@ -74,6 +78,10 @@ 'title' => 'object_title', 'role' => 'object_role', 'company' => 'object_company', + // The logo field requires at least Horde 3.3 and a matching type + // field. + // 'logo' => 'object_logo', + // 'logotype' => 'object_logotype', 'category' => 'object_category', 'notes' => 'object_notes', 'website' => 'object_url', @@ -84,7 +92,7 @@ 'tabs' => array( _("Personal") => array('firstname', 'lastname', 'middlenames', 'namePrefix', 'nameSuffix', 'name', 'alias', - 'birthday'), + 'birthday', 'photo'), _("Location") => array('homeStreet', 'homePOBox', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', 'homeAddress', 'workStreet', 'workPOBox', 'workCity', @@ -92,7 +100,7 @@ 'timezone'), _("Communications") => array('email', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'pager'), - _("Organization") => array('title', 'role', 'company'), + _("Organization") => array('title', 'role', 'company', 'logo'), _("Other") => array('category', 'notes', 'website', 'freebusyUrl', 'pgpPublicKey', 'smimePublicKey'), ), @@ -112,5 +120,6 @@ $OUT = " 'use_shares' => $sab,"; } 'list_name_field' => 'lastname', + 'alternative_name' => 'company', ); 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 --- e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2008-11-24 22:51:59.000000000 -0600 +++ mezzanine_patched_e-smith-turba-3.0.0/root/etc/e-smith/events/actions/turba_upgrade 2008-11-24 22:51:14.000000000 -0600 @@ -179,6 +179,36 @@ $statement->execute or die "execute: $$statement: $DBI::errstr"; } + unless (defined $turba_objects->{object_spouse}) +{ + my $statement = + "ALTER TABLE turba_objects ADD COLUMN object_spouse ". + "VARCHAR(255)"; + $statement = $db_turbahandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + + unless (defined $turba_objects->{object_anniversary}) +{ + my $statement = + "ALTER TABLE turba_objects ADD COLUMN object_anniversary ". + "VARCHAR(10)"; + $statement = $db_turbahandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + + unless (defined $turba_objects->{object_children}) +{ + my $statement = + "ALTER TABLE turba_objects ADD COLUMN object_children ". + "VARCHAR(255)"; + $statement = $db_turbahandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + unless (defined $turba_objects->{object_homestreet}) { my $statement = 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 --- 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 +++ 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 @@ -45,7 +45,10 @@ // 'format' => '%s %s'), 'alias' => 'object_alias', 'birthday' => 'object_bday', - // The photo field requires at least Horde 3.3 and a matching type + 'spouse' => 'object_spouse', + 'anniversary' => 'object_anniversary', + 'children' => 'object_children', + // The photo field requires at least Horde 3.3 and a matching type // field. 'photo' => 'object_photo', 'phototype' => 'object_phototype', @@ -80,8 +83,8 @@ 'company' => 'object_company', // The logo field requires at least Horde 3.3 and a matching type // field. - // 'logo' => 'object_logo', - // 'logotype' => 'object_logotype', + 'logo' => 'object_logo', + 'logotype' => 'object_logotype', 'category' => 'object_category', 'notes' => 'object_notes', 'website' => 'object_url', @@ -92,7 +95,7 @@ 'tabs' => array( _("Personal") => array('firstname', 'lastname', 'middlenames', 'namePrefix', 'nameSuffix', 'name', 'alias', - 'birthday', 'photo'), + 'birthday', 'spouse', 'anniversary', 'children' , 'photo'), _("Location") => array('homeStreet', 'homePOBox', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', 'homeAddress', 'workStreet', 'workPOBox', 'workCity',