diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header
--- smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header	2009-09-28 22:35:38.000000000 -0500
+++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header	2009-09-28 22:31:20.000000000 -0500
@@ -1,7 +1,7 @@
 
 //00Header
 /**
- * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.12 2008/07/17 00:21:57 mrubinsk Exp $
+ * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.14 2009/06/19 17:06:22 jan Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View
--- smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View	2008-04-08 22:41:02.000000000 -0500
+++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View	2009-09-28 22:32:07.000000000 -0500
@@ -7,6 +7,6 @@
                        'time_between_days', 'week_start_monday',
                        'day_hour_start', 'day_hour_end', 'day_hour_force',
                        'slots_per_hour', 'show_icons', 'show_time', 'show_location',
-                       'show_legend', 'show_panel', 'show_fb_legend', 'show_shared_side_by_side', 'show_external_colors'),
+                       'show_legend', 'show_fb_legend', 'show_shared_side_by_side', 'show_external_colors'),
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel
--- smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel	2008-04-09 22:01:19.000000000 -0500
+++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel	2009-09-28 22:33:22.000000000 -0500
@@ -5,7 +5,6 @@
     'value' => 1,
     'locked' => false,
     'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Show calendar options panel?"),
+    'type' => 'implicit',
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade
--- smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade	2009-10-08 14:17:23.000000000 -0500
+++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade	2009-10-08 14:17:08.000000000 -0500
@@ -46,6 +46,20 @@
 
 # These are all safe to run multiple times
 
+my @statements = (
+    "ALTER TABLE kronolith_shares CHANGE share_owner share_owner VARCHAR(255)",
+    "ALTER TABLE kronolith_shares_users CHANGE user_uid user_uid VARCHAR(255)",
+    "ALTER TABLE kronolith_shares_groups CHANGE group_uid group_uid VARCHAR(255)",
+);
+        
+foreach my $statement (@statements)
+{
+    $statement =
+        $db_kronolithhandle->prepare("$statement")
+            or die "prepare: $$statement: $DBI::errstr";
+    $statement->execute or die "execute: $$statement: $DBI::errstr";
+}
+
 # We now need to create some columns, but we need to first check
 # whether they exist already
 my $sth = $db_kronolithhandle->prepare("show columns from kronolith_events");
@@ -91,42 +105,6 @@
     $statement->execute or die "execute: $$statement: $DBI::errstr";
 }
 
-unless (defined $kronolith_shares->{share_owner})
-{
-    # 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 CHANGE share_owner share_owner ' .
-        'VARCHAR(255) ';
-    $statement = $db_kronolithhandle->prepare($statement) or 
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
-
-unless (defined $kronolith_shares_users->{user_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_users CHANGE user_uid user_uid ' .
-        'VARCHAR(255) ';
-    $statement = $db_kronolithhandle->prepare($statement) or 
-        die "prepare: $$statement: $DBI::errstr";
-    $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})
 {