From 54d830fa44e3e387b06a19c8fb9daf63d0994941 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 14 Apr 2008 09:06:28 -0400
Subject: [PATCH] Fix html quoting in textareas

---
 SQL/mysql.initial.sql |   70 ++++++----------------------------
 1 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 9a15360..019675e 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -1,5 +1,5 @@
 -- RoundCube Webmail initial database structure
--- Version 0.1beta2
+-- Version 0.1
 -- 
 
 -- --------------------------------------------------------
@@ -16,9 +16,7 @@
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `data` longtext NOT NULL,
   PRIMARY KEY  (`cache_id`),
-  KEY `user_id` (`user_id`),
-  KEY `cache_key` (`cache_key`),
-  KEY `session_id` (`session_id`)
+  INDEX `user_cache_index` (`user_id`,`cache_key`)
 );
 
 -- --------------------------------------------------------
@@ -34,50 +32,8 @@
   `del` tinyint(1) NOT NULL default '0',
   `name` varchar(128) NOT NULL default '',
   `email` varchar(128) NOT NULL default '',
-  `first_name` varchar(128) NOT NULL default '',
-  `middle_name` varchar(128) NOT NULL default '',
-  `last_name` varchar(128) NOT NULL default '',
-  `edu_title` varchar(128) NOT NULL default '',
-  `addon` varchar(128) NOT NULL default '',
-  `nickname` varchar(128) NOT NULL default '',
-  `company` varchar(128) NOT NULL default '',
-  `organisation` varchar(128) NOT NULL default '',
-  `department` varchar(128) NOT NULL default '',
-  `job_title` varchar(128) NOT NULL default '',
-  `note` varchar(128) NOT NULL default '',
-  `tel_work1_voice` varchar(128) NOT NULL default '',
-  `tel_work2_voice` varchar(128) NOT NULL default '',
-  `tel_home1_voice` varchar(128) NOT NULL default '',
-  `tel_home2_voice` varchar(128) NOT NULL default '',
-  `tel_cell_voice` varchar(128) NOT NULL default '',
-  `tel_car_voice` varchar(128) NOT NULL default '',
-  `tel_pager_voice` varchar(128) NOT NULL default '',
-  `tel_additional` varchar(128) NOT NULL default '',
-  `tel_work_fax` varchar(128) NOT NULL default '',
-  `tel_home_fax` varchar(128) NOT NULL default '',
-  `tel_isdn` varchar(128) NOT NULL default '',
-  `tel_preferred` varchar(128) NOT NULL default '',
-  `tel_telex` varchar(128) NOT NULL default '',
-  `work_street` varchar(128) NOT NULL default '',
-  `work_zip` varchar(128) NOT NULL default '',
-  `work_city` varchar(128) NOT NULL default '',
-  `work_region` varchar(128) NOT NULL default '',
-  `work_country` varchar(128) NOT NULL default '',
-  `home_street` varchar(128) NOT NULL default '',
-  `home_zip` varchar(128) NOT NULL default '',
-  `home_city` varchar(128) NOT NULL default '',
-  `home_region` varchar(128) NOT NULL default '',
-  `home_country` varchar(128) NOT NULL default '',
-  `postal_street` varchar(128) NOT NULL default '',
-  `postal_zip` varchar(128) NOT NULL default '',
-  `postal_city` varchar(128) NOT NULL default '',
-  `postal_region` varchar(128) NOT NULL default '',
-  `postal_country` varchar(128) NOT NULL default '',
-  `url_work` varchar(128) NOT NULL default '',
-  `role` varchar(128) NOT NULL default '',
-  `birthday` varchar(128) NOT NULL default '',
-  `rev` varchar(128) NOT NULL default '',
-  `lang` varchar(128) NOT NULL default '',
+  `firstname` varchar(128) NOT NULL default '',
+  `surname` varchar(128) NOT NULL default '',
   `vcard` text NOT NULL,
   PRIMARY KEY  (`contact_id`),
   KEY `user_id` (`user_id`)
@@ -100,6 +56,7 @@
   `reply-to` varchar(128) NOT NULL default '',
   `bcc` varchar(128) NOT NULL default '',
   `signature` text NOT NULL,
+  `html_signature` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`identity_id`),
   KEY `user_id` (`user_id`)
 );
@@ -114,7 +71,7 @@
   `sess_id` varchar(40) NOT NULL default '',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `changed` datetime NOT NULL default '0000-00-00 00:00:00',
-  `ip` VARCHAR(15) NOT NULL default '',
+  `ip` VARCHAR(40) NOT NULL default '',
   `vars` text NOT NULL,
   PRIMARY KEY  (`sess_id`)
 );
@@ -133,8 +90,10 @@
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `last_login` datetime NOT NULL default '0000-00-00 00:00:00',
   `language` varchar(5) NOT NULL default 'en',
-  `preferences` text NOT NULL default '',
-  PRIMARY KEY  (`user_id`)
+  `preferences` text,
+  PRIMARY KEY  (`user_id`),
+  INDEX `username_index` (`username`),
+  INDEX `alias_index` (`alias`)
 );
 
 -- --------------------------------------------------------
@@ -158,12 +117,9 @@
   `date` datetime NOT NULL default '0000-00-00 00:00:00',
   `size` int(11) unsigned NOT NULL default '0',
   `headers` text NOT NULL,
-  `body` longtext,
-  PRIMARY KEY  (`message_id`),
-  KEY `user_id` (`user_id`),
-  KEY `cache_key` (`cache_key`),
-  KEY `idx` (`idx`),
-  KEY `uid` (`uid`)
+  `structure` text,
+  PRIMARY KEY (`message_id`),
+  UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`)
 );
 
 

--
Gitblit v1.9.1