diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade
--- e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade	2009-10-08 12:59:55.000000000 -0500
+++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade	2009-10-08 12:59:27.000000000 -0500
@@ -46,6 +46,22 @@
 
 # These are all safe to run multiple times
 
+my @statements = (
+    "ALTER TABLE horde_datatree CHANGE COLUMN datatree_id datatree_id INT(11) UNSIGNED NOT NULL",
+    "ALTER TABLE horde_datatree_attributes CHANGE COLUMN datatree_id datatree_id INT(11) UNSIGNED NOT NULL",
+    "ALTER TABLE horde_vfs CHANGE COLUMN vfs_id vfs_id INT(11) UNSIGNED NOT NULL",
+    "ALTER TABLE horde_prefs CHANGE COLUMN pref_uid pref_uid VARCHAR(200) NOT NULL",
+    "DELETE FROM horde_prefs WHERE pref_name = 'last_login' AND pref_scope = 'imp'",
+);
+
+foreach my $statement (@statements)
+{
+    $statement =
+        $db_hordehandle->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_horde_datatree = $db_hordehandle->prepare("show columns from horde_datatree");
@@ -92,29 +108,10 @@
 $sth_horde_syncml_anchors ->execute;
 my $horde_syncml_anchors  = $sth_horde_syncml_anchors ->fetchall_hashref('Field');
 
-unless (defined $horde_prefs->{pref_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 horde_prefs CHANGE COLUMN pref_uid pref_uid ' .
-        'VARCHAR(200) NOT NULL';
-    $statement = $db_hordehandle->prepare($statement) or 
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
+my $sth_horde_signups  = $db_hordehandle->prepare("show columns from horde_signups ");
+$sth_horde_signups ->execute;
+my $horde_signups  = $sth_horde_signups ->fetchall_hashref('Field');
 
-unless (defined $horde_prefs->{pref_name})
-{
-    # We need to be careful about this one as it will fail if the 
-    # column exists, so we check the error. 
-    my $statement = 
-        "DELETE FROM horde_prefs WHERE " .
-        "pref_name = 'last_login' AND pref_scope = 'imp'";
-    $statement = $db_hordehandle->prepare($statement) or 
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
 
 unless (defined $horde_users->{user_soft_expiration_date})
 {
@@ -135,6 +132,17 @@
     $statement->execute or die "execute: $$statement: $DBI::errstr";
 }
 
+unless (!defined $horde_signups->{signup_email})
+{
+    # 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 horde_signups DROP COLUMN signup_email';
+    $statement = $db_hordehandle->prepare($statement) or
+        die "prepare: $$statement: $DBI::errstr";
+    $statement->execute or die "execute: $$statement: $DBI::errstr";
+}
+
 # Create an index for group_uid if needed
 unless ($horde_groups_members ->{group_uid}->{Key})
 {
@@ -464,4 +472,3 @@
         die "prepare: $$statement: $DBI::errstr";
     $statement->execute or die "execute: $$statement: $DBI::errstr";
 }
-
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header
--- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header	2009-10-08 12:59:55.000000000 -0500
+++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header	2009-10-08 08:50:29.000000000 -0500
@@ -1,4 +1,4 @@
 //00header
 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: horde/config/conf.xml,v 1.74.2.84 2009/04/04 12:30:51 jan Exp $
+// $Horde: horde/config/conf.xml,v 1.74.2.88 2009/09/02 08:21:46 jan Exp $
 
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header
--- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header	2009-10-08 12:59:55.000000000 -0500
+++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header	2009-10-08 08:51:01.000000000 -0500
@@ -1,6 +1,6 @@
 // 00header
 /**
- * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.12 2008/07/07 16:24:24 jan Exp $
+ * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.13 2009/05/29 05:59:25 slusarz Exp $
  *
  * Decide which output drivers you want to activate for all Horde
  * applications. Individual Horde applications can override these settings
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple
--- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple	2008-04-17 23:23:01.000000000 -0500
+++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple	2009-10-08 08:51:32.000000000 -0500
@@ -3,7 +3,7 @@
  * Default text driver settings
  */
 $mime_drivers['horde']['simple'] = array(
-    'inline' => true,
+    'inline' => false,
     'handles' => array(
         'text/*'
     ),
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql mezzanine_patched_e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql
--- e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql	2009-10-08 12:59:55.000000000 -0500
+++ mezzanine_patched_e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql	2009-10-08 09:48:14.000000000 -0500
@@ -1,4 +1,4 @@
--- $Horde: horde/scripts/sql/create.mysql.sql,v 1.4.6.22 2008/08/13 20:18:03 chuck Exp $
+-- $Horde: horde/scripts/sql/create.mysql.sql,v 1.4.6.25 2009/07/07 03:01:40 mrubinsk Exp $
 
 CREATE DATABASE IF NOT EXISTS horde;
 
@@ -17,10 +17,8 @@
     user_name VARCHAR(255) NOT NULL,   
     signup_date VARCHAR(255) NOT NULL, 
     signup_host VARCHAR(255) NOT NULL, 
-    signup_email VARCHAR(255) NOT NULL,
     signup_data TEXT NOT NULL,
-    UNIQUE KEY user_name (user_name),
-    UNIQUE KEY signup_email (signup_email)
+    PRIMARY KEY user_name (user_name)
 );
 
 CREATE TABLE IF NOT EXISTS horde_groups (
@@ -56,7 +54,7 @@
 );
 
 CREATE TABLE IF NOT EXISTS horde_datatree (
-    datatree_id INT NOT NULL,
+    datatree_id INT UNSIGNED NOT NULL,
     group_uid VARCHAR(255) NOT NULL,
     user_uid VARCHAR(255) NOT NULL,
     datatree_name VARCHAR(255) NOT NULL,
@@ -69,7 +67,7 @@
 );
 
 CREATE TABLE IF NOT EXISTS horde_datatree_attributes (
-    datatree_id INT NOT NULL,
+    datatree_id INT UNSIGNED NOT NULL,
     attribute_name VARCHAR(255) NOT NULL,
     attribute_key VARCHAR(255) DEFAULT '' NOT NULL,
     attribute_value TEXT
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header
--- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header	2009-10-08 14:01:50.000000000 -0500
+++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header	2009-10-08 13:59:39.000000000 -0500
@@ -2,7 +2,7 @@
 /**
  * registry.php -- Horde application registry.
  *
- * $Horde: horde/config/registry.php.dist,v 1.255.2.26 2008/07/07 12:17:08 jan Exp $
+ * $Horde: horde/config/registry.php.dist,v 1.255.2.27 2009/07/24 08:58:06 jan Exp $
  *
  * This configuration file is used by Horde to determine which Horde
  * applications are installed and where, as well as how they interact.