Reverted files to r305

2 files changed, 2 insertions, 91 deletions

diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 9a1536078..7546e52da 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -34,50 +34,8 @@ CREATE TABLE `contacts` (
   `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`)
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index c01e8f150..7fa296b0b 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -1,53 +1,6 @@
 -- RoundCube Webmail update script for MySQL databases
 -- Updates from version 0.1-20051007
 
- ALTER TABLE `contacts` CHANGE `firstname` `first_name` VARCHAR( 128 ) NOT NULL; ALTER TABLE `contacts` CHANGE `surname` `last_name` VARCHAR( 128 ) NOT NULL; 
-
- ALTER TABLE `contacts` ADD `middle_name` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `edu_title` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `addon` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `nickname` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `company` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `organisation` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `department` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `job_title` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `note` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_work1_voice` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_work2_voice` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_home1_voice` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_home2_voice` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_cell_voice` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_car_voice` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_pager_voice` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_additional` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_work_fax` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_home_fax` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_isdn` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_preferred` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `tel_telex` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `work_street` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `work_zip` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `work_city` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `work_region` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `work_country` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `home_street` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `home_zip` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `home_city` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `home_region` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `home_country` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `postal_street` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `postal_zip` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `postal_city` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `postal_region` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `postal_country` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `url_work` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `role` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `birthday` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `rev` varchar(128) NOT NULL default '';
- ALTER TABLE `contacts` ADD `lang` varchar(128) NOT NULL default '';
-
--- RoundCube Webmail update script for MySQL databases
--- Updates from version 0.1-20051007
 
 ALTER TABLE `session` ADD `ip` VARCHAR(15) NOT NULL AFTER changed;
 ALTER TABLE `users` ADD `alias` VARCHAR(128) NOT NULL AFTER mail_host;