diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2008-05-24 21:46:21.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2008-09-29 21:39:28.000000000 -0500 @@ -1,7 +1,7 @@ //00Header /** -* $Horde: kronolith/config/prefs.php.dist,v 1.66.2.11 2008/02/01 21:47:08 chuck Exp $ + * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.12 2008/07/17 00:21:57 mrubinsk Exp $ * * See horde/config/prefs.php for documentation on the structure of this file. */ diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance 2008-09-29 21:51:40.000000000 -0500 @@ -0,0 +1,8 @@ +//122Maintenance +$prefGroups['maintenance'] = array( + 'column' => _("Events"), + 'label' => _("Maintenance"), + 'desc' => _("Set options for deleting old events."), + 'members' => array('purge_events', 'purge_events_interval', 'purge_events_keep') +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect 2008-09-29 22:01:04.000000000 -0500 @@ -0,0 +1,4 @@ +//232ShareSelect +// default calendar selection widget +$_prefs['shareselect'] = array('type' => 'special'); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect 2008-04-09 22:04:00.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -//245ShareSelect -// default calendar selection widget -$_prefs['shareselect'] = array('type' => 'special'); - diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals 2008-04-09 22:05:05.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals 2008-09-29 22:02:37.000000000 -0500 @@ -1,5 +1,5 @@ //260DisplayRemoteCals -// store the remote calendars to display +// remote calendars $_prefs['remote_cals'] = array( 'value' => 'a:0:\{\}', 'locked' => false, diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals 2008-09-29 22:04:47.000000000 -0500 @@ -0,0 +1,9 @@ +//265DisplayRemoteCals +// store the remote calendars to display +$_prefs['display_remote_cals'] = array( + 'value' => 'a:0:\{\}', + 'locked' => false, + 'shared' => false, + 'type' => 'implicit' +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals 2008-09-29 22:05:32.000000000 -0500 @@ -0,0 +1,9 @@ +//270DisplayExternalCals +// store the external calendars to display +$_prefs['display_external_cals'] = array( + 'value' => 'a:0:\{\}', + 'locked' => false, + 'shared' => false, + 'type' => 'implicit' +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals 2008-04-09 22:05:57.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals 1969-12-31 18:00:00.000000000 -0600 @@ -1,9 +0,0 @@ -//270DisplayRemoteCals -// store the remote calendars to display -$_prefs['display_remote_cals'] = array( - 'value' => 'a:0:\{\}', - 'locked' => false, - 'shared' => false, - 'type' => 'implicit' -); - diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder 2008-04-16 07:53:58.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder 2008-09-29 22:07:26.000000000 -0500 @@ -1,5 +1,5 @@ //290EventReminder -//reminder notifications +// reminder notifications $_prefs['event_reminder'] = array( 'value' => 'owner', 'locked' => false, diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources 2008-06-18 22:16:01.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources 2008-09-29 22:09:05.000000000 -0500 @@ -7,7 +7,7 @@ // 'value' => "source_one\tsource_two" // refer to turba/config/sources.php for possible source values $_prefs['search_sources'] = array( - 'value' => "localldap", + 'value' => "localldap\tlocalsql", 'locked' => false, 'shared' => false, 'type' => 'implicit', diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents 2008-09-29 22:11:16.000000000 -0500 @@ -0,0 +1,9 @@ +//330PurgeEvents +$_prefs['purge_events'] = array( + 'value' => 0, + 'locked' => false, + 'shared' => false, + 'type' => 'checkbox', + 'desc' => _("Purge old events from your calender?"), +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval 2008-09-29 22:12:05.000000000 -0500 @@ -0,0 +1,10 @@ +//335PurgeEventsInterval +// 'value': yearly = 1, monthly = 2, weekly = 3, daily = 4, every login = 5 +$_prefs['purge_events_interval'] = array( + 'value' => '2', + 'locked' => false, + 'shared' => false, + 'type' => 'select', + 'desc' => _("Purge old events how often:"), +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep 2008-09-29 22:12:49.000000000 -0500 @@ -0,0 +1,9 @@ +//340PurgeEventsKeep +$_prefs['purge_events_keep'] = array( + 'value' => 365, + 'locked' => false, + 'shared' => false, + 'type' => 'number', + 'desc' => _("Purge old events older than this amount of days."), +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance --- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance 2008-09-29 22:13:35.000000000 -0500 @@ -0,0 +1,10 @@ +//345LastKronolithMaintenance +// last time maintenance was run. +// value is a UNIX timestamp of the last time maintenance ran for the user. +$_prefs['last_kronolith_maintenance'] = array( + 'value' => 0, + 'locked' => false, + 'shared' => false, + 'type' => 'implicit' +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade mezzanine_patched_smeserv er-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade --- smeserver-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade 2008-05-29 23:18:17.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade 2008-09-29 22:28:23.000000000 -0500 @@ -91,6 +91,18 @@ $statement->execute or die "execute: $$statement: $DBI::errstr"; } +unless (defined $kronolith_shares_groups->{group_uid}) +{ + # We need to be careful about this one as it will fail if the + # column exists, so we check the error. + my $statement = + 'ALTER TABLE kronolith_shares_groups CHANGE group_uid group_uid ' . + 'VARCHAR(255) '; + $statement = $db_kronolithhandle->prepare($statement) or + die "prepare: $$statement: $DBI::errstr"; + $statement->execute or die "execute: $$statement: $DBI::errstr"; +} + # Create an index for calendar_id if needed unless ($kronolith_events ->{calendar_id}->{Key}) { diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql mezzanine_patched_ smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql --- smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql 2008-06-18 22:58:30.000000000 -0500 +++ mezzanine_patched_smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql 2008-09-29 22:23:25.00000000 0 -0500 @@ -1,4 +1,4 @@ --- $Horde: kronolith/scripts/sql/kronolith.mysql.sql,v 1.3.2.5 2008/04/29 19:33:21 chuck Exp $ +-- $Horde: kronolith/scripts/sql/kronolith.mysql.sql,v 1.3.2.8 2008/09/23 15:18:27 jan Exp $ CREATE TABLE IF NOT EXISTS kronolith_events ( event_id VARCHAR(32) NOT NULL, @@ -48,14 +48,12 @@ PRIMARY KEY (share_id) ); - CREATE TABLE IF NOT EXISTS kronolith_shares_groups ( share_id INT NOT NULL, - group_uid INT NOT NULL, + group_uid VARCHAR(255) NOT NULL, perm SMALLINT NOT NULL ); - CREATE TABLE IF NOT EXISTS kronolith_shares_users ( share_id INT NOT NULL, user_uid VARCHAR(255) NOT NULL,