diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header
--- smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header	2009-09-28 22:08:33.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header	2009-09-28 18:27:10.000000000 -0500
@@ -1,6 +1,6 @@
 //00Header
 /**
- * $Horde: nag/config/prefs.php.dist,v 1.42.2.11 2008/11/25 20:56:00 chuck Exp $
+ * $Horde: nag/config/prefs.php.dist,v 1.42.2.12 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-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display
--- smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display	2009-09-28 22:08:33.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display	2009-09-28 18:26:02.000000000 -0500
@@ -3,7 +3,6 @@
     'column' => _("General Options"),
     'label' => _("Display Options"), 
     'desc' => _("Change your task sorting and display options."),
-    'members' => array('tasklist_columns', 'show_panel', 'sortby', 'altsortby',
-                       'sortdir'),
+    'members' => array('tasklist_columns', 'sortby', 'altsortby', 'sortdir'),
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel
--- smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel	2008-05-13 19:49:59.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel	2009-09-28 20:09:09.000000000 -0500
@@ -5,7 +5,6 @@
     'value' => 1,
     'locked' => false,
     'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Show task list options panel?"),
+    'type' => 'implicit',
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade
--- smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade	2009-10-08 14:26:40.000000000 -0500
+++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade	2009-10-08 14:26:27.000000000 -0500
@@ -47,6 +47,20 @@
 
 # These are all safe to run multiple times
 
+my @statements = (
+    "ALTER TABLE nag_shares CHANGE share_owner share_owner VARCHAR(255)",
+    "ALTER TABLE nag_shares_users CHANGE user_uid user_uid VARCHAR(255)",
+    "ALTER TABLE nag_shares_groups CHANGE group_uid group_uid VARCHAR(255)",
+);
+        
+foreach my $statement (@statements)
+{
+    $statement =
+        $db_naghandle->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_naghandle->prepare("show columns from nag_tasks");
@@ -144,42 +158,6 @@
     $statement->execute or die "execute: $$statement: $DBI::errstr";
 }
 
-unless (defined $nag_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 nag_shares CHANGE share_owner share_owner ".
-        "VARCHAR(255)";
-    $statement = $db_naghandle->prepare($statement) or
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
-
-unless (defined $nag_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 nag_shares_users CHANGE user_uid user_uid ".
-        "VARCHAR(255)";
-    $statement = $db_naghandle->prepare($statement) or
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
-
-unless (defined $nag_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 nag_shares_groups CHANGE group_uid group_uid ".
-        "VARCHAR(255)";
-    $statement = $db_naghandle->prepare($statement) or
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
-
 # Create an index for task_owner if needed
 unless ($nag_tasks->{task_owner}->{Key})
 {