Initial TinyMCE editor support (still need to work on spellcheck and skins)

6 files changed, 11 insertions, 3 deletions

diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 716268b1a..f49fd7084 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -58,6 +58,7 @@ CREATE TABLE `identities` (
   `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`)
 );
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index cfd5af361..b16f2555f 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -7,3 +7,5 @@ ALTER TABLE `messages`
   ADD `structure` TEXT,
   ADD UNIQUE `uniqueness` (`cache_key`, `uid`);
 
+ALTER TABLE 'identities'
+  ADD 'html_signature' tinyint(1) default 0 NOT NULL;
diff --git a/SQL/mysql5.initial.sql b/SQL/mysql5.initial.sql
index 24e143119..ee6fc3352 100644
--- a/SQL/mysql5.initial.sql
+++ b/SQL/mysql5.initial.sql
@@ -114,6 +114,7 @@ CREATE TABLE `identities` (
  `reply-to` varchar(128) NOT NULL,
  `bcc` varchar(128) NOT NULL,
  `signature` text NOT NULL,
+ `html_signature` tinyint(1) NOT NULL DEFAULT '0',
  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
  PRIMARY KEY(`identity_id`),
  CONSTRAINT `User_ID_FK_identities` FOREIGN KEY (`user_id`)
@@ -123,4 +124,4 @@ CREATE TABLE `identities` (
 ) TYPE=MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS=1;
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index 029afaab3..ebd504d0d 100755
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -69,7 +69,8 @@ CREATE TABLE identities (
     email character varying(128) NOT NULL,
     "reply-to" character varying(128),
     bcc character varying(128),
-    signature text
+    signature text,
+    html_signature integer DEFAULT 0 NOT NULL
 );
 
 
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
index 6ca855edc..2ad60298f 100644
--- a/SQL/postgres.update.sql
+++ b/SQL/postgres.update.sql
@@ -5,3 +5,5 @@ ALTER TABLE "messages" DROP body;
 ALTER TABLE "messages" ADD structure TEXT;
 ALTER TABLE "messages" ADD UNIQUE (cache_key, uid);
 
+ALTER TABLE "identities" ADD html_signature integer DEFAULT 0 NOT NULL;
+
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index 4ddc40d5d..5be69785a 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -58,7 +58,8 @@ CREATE TABLE identities (
   email varchar(128) NOT NULL default '',
   "reply-to" varchar(128) NOT NULL default '',
   bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default ''
+  signature text NOT NULL default '',
+  html_signature tinyint NOT NULL default '0'
 );
 
 CREATE INDEX ix_identities_user_id ON identities(user_id);