diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | SQL/mysql.initial.sql | 46 | ||||
| -rw-r--r-- | SQL/mysql.update.sql | 49 | ||||
| -rw-r--r-- | program/steps/addressbook/edit.inc | 5 | ||||
| -rw-r--r-- | program/steps/addressbook/save.inc | 3 |
5 files changed, 102 insertions, 5 deletions
@@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2006/08/10 (tri) +---------- +- Added a few fields to the contact table and made this fields avaiable (Ticket #1332930) + 2006/08/10 (thomasb) ---------- - Fixed charset problems with folder renaming diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql index 7546e52da..9a1536078 100644 --- a/SQL/mysql.initial.sql +++ b/SQL/mysql.initial.sql @@ -34,8 +34,50 @@ CREATE TABLE `contacts` ( `del` tinyint(1) NOT NULL default '0', `name` varchar(128) NOT NULL default '', `email` varchar(128) NOT NULL default '', - `firstname` varchar(128) NOT NULL default '', - `surname` 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 '', `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 7fa296b0b..80deb84d2 100644 --- a/SQL/mysql.update.sql +++ b/SQL/mysql.update.sql @@ -1,6 +1,55 @@ -- RoundCube Webmail update script for MySQL databases -- Updates from version 0.1-20051007 + ALTER TABLE `contacts` ADD `name` varchar(128) NOT NULL default ''; + ALTER TABLE `contacts` ADD `email` varchar(128) NOT NULL default ''; + ALTER TABLE `contacts` ADD `first_name` varchar(128) NOT NULL default ''; + ALTER TABLE `contacts` ADD `middle_name` varchar(128) NOT NULL default ''; + ALTER TABLE `contacts` ADD `last_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; diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index a129d0094..5a3bd78ca 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -13,6 +13,7 @@ | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | + | Author: Tobias 'tri' Richter <tobias@datenwerkstatt-richter.de | +-----------------------------------------------------------------------+ $Id$ @@ -65,7 +66,7 @@ function rcmail_contact_editform($attrib) // return the complete address edit form as table $out = "$form_start<table>\n\n"; - $a_show_cols = array('name', 'firstname', 'surname', 'email'); + $a_show_cols = array('name', 'email', 'first_name', 'middle_name', 'last_name', 'edu_title', 'addon', 'nickname', 'company', 'organisation', 'department', 'job_title', 'note', 'tel_work1_voice', 'tel_work2_voice', 'tel_home1_voice', 'tel_home2_voice', 'tel_cell_voice', 'tel_car_voice', 'tel_pager_voice', 'tel_additional', 'tel_work_fax', 'tel_home_fax', 'tel_isdn', 'tel_preferred', 'tel_telex', 'work_street', 'work_zip', 'work_city', 'work_region', 'work_country', 'home_street', 'home_zip', 'home_city', 'home_region', 'home_country', 'postal_street', 'postal_zip', 'postal_city', 'postal_region', 'postal_country', 'url_work', 'role', 'birthday', 'rev', 'lang'); foreach ($a_show_cols as $col) { $attrib['id'] = 'rcmfd_'.$col; @@ -123,4 +124,4 @@ if (!$CONTACT_RECORD && template_exists('addcontact')) // this will be executed if no template for addcontact exists parse_template('editcontact'); -?>
\ No newline at end of file +?> diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 5135e4b04..6ba867504 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -13,6 +13,7 @@ | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | + | Author: Tobias 'tri' Richter <tobias@datenwerkstatt-richter.de> | +-----------------------------------------------------------------------+ $Id$ @@ -28,7 +29,7 @@ if ((empty($_POST['_name']) || empty($_POST['_email'])) && empty($_GET['_framed' } // setup some vars we need -$a_save_cols = array('name', 'firstname', 'surname', 'email'); +$a_save_cols = array('name', 'email', 'first_name', 'middle_name', 'last_name', 'edu_title', 'addon', 'nickname', 'company', 'organisation', 'department', 'job_title', 'note', 'tel_work1_voice', 'tel_work2_voice', 'tel_home1_voice', 'tel_home2_voice', 'tel_cell_voice', 'tel_car_voice', 'tel_pager_voice', 'tel_additional', 'tel_work_fax', 'tel_home_fax', 'tel_isdn', 'tel_preferred', 'tel_telex', 'work_street', 'work_zip', 'work_city', 'work_region', 'work_country', 'home_street', 'home_zip', 'home_city', 'home_region', 'home_country', 'postal_street', 'postal_zip', 'postal_city', 'postal_region', 'postal_country', 'url_work', 'role', 'birthday', 'rev', 'lang'); $contacts_table = get_table_name('contacts'); // update an existing contact |