diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | SQL/mysql.initial.sql | 46 | ||||
| -rw-r--r-- | SQL/mysql.update.sql | 47 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 51 | ||||
| -rw-r--r-- | program/steps/addressbook/edit.inc | 5 | ||||
| -rw-r--r-- | program/steps/addressbook/save.inc | 3 | ||||
| -rw-r--r-- | program/steps/addressbook/show.inc | 5 |
7 files changed, 11 insertions, 150 deletions
@@ -1,10 +1,6 @@ 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 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; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 1b517e2aa..5945392d3 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -10,7 +10,6 @@ | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | - | Author: Tobias 'tri' Richter <tobias@datenwerkstatt-richter.de> | +-----------------------------------------------------------------------+ $Id$ @@ -147,52 +146,10 @@ $labels['showimages'] = 'Display images'; // address boook -$labels['name'] = 'Display name'; -$labels['first_name'] = 'First name'; -$labels['last_name'] = 'Last name'; -$labels['email'] = 'E-Mail'; -$labels['middle_name'] = 'Middle Name'; -$labels['edu_title'] = 'Education Title'; -$labels['addon'] = 'Addon'; -$labels['nickname'] = 'Nickname'; -$labels['company'] = 'Company'; -$labels['organisation'] = 'Organisation'; -$labels['department'] = 'Department'; -$labels['job_title'] = 'Job Title'; -$labels['note'] = 'Note'; -$labels['tel_work1_voice'] = 'Tel Work1 Voice'; -$labels['tel_work2_voice'] = 'Tel Work2 Voice'; -$labels['tel_home1_voice'] = 'Tel Home1 Voice'; -$labels['tel_home2_voice'] = 'Tel Home2 Voice'; -$labels['tel_cell_voice'] = 'Tel Cell Voice'; -$labels['tel_car_voice'] = 'Tel Car Voice'; -$labels['tel_pager_voice'] = 'Tel Pager Voice'; -$labels['tel_additional'] = 'Tel Additional'; -$labels['tel_work_fax'] = 'Tel Work Fax'; -$labels['tel_home_fax'] = 'Tel Home Fax'; -$labels['tel_isdn'] = 'Tel ISDN'; -$labels['tel_preferred'] = 'Tel Preferred'; -$labels['tel_telex'] = 'Tel Telex'; -$labels['work_street'] = 'Work Street'; -$labels['work_zip'] = 'Work Zip'; -$labels['work_city'] = 'Work City'; -$labels['work_region'] = 'Work Region'; -$labels['work_country'] = 'Work Country'; -$labels['home_street'] = 'Home Street'; -$labels['home_zip'] = 'Home Zip'; -$labels['home_city'] = 'Home City'; -$labels['home_region'] = 'Home Region'; -$labels['home_country'] = 'Home Country'; -$labels['postal_street'] = 'Postal Street'; -$labels['postal_zip'] = 'Postal Zip'; -$labels['postal_city'] = 'Postal City'; -$labels['postal_region'] = 'Postal Region'; -$labels['postal_country'] = 'Postal Country'; -$labels['url_work'] = 'URL Work'; -$labels['role'] = 'Role'; -$labels['birthday'] = 'Birthday'; -$labels['rev'] = 'Revision'; -$labels['lang'] = 'Language'; +$labels['name'] = 'Display name'; +$labels['firstname'] = 'First name'; +$labels['surname'] = 'Last name'; +$labels['email'] = 'E-Mail'; $labels['addcontact'] = 'Add new contact'; $labels['editcontact'] = 'Edit contact'; diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index 5a3bd78ca..a129d0094 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -13,7 +13,6 @@ | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | - | Author: Tobias 'tri' Richter <tobias@datenwerkstatt-richter.de | +-----------------------------------------------------------------------+ $Id$ @@ -66,7 +65,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', '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'); + $a_show_cols = array('name', 'firstname', 'surname', 'email'); foreach ($a_show_cols as $col) { $attrib['id'] = 'rcmfd_'.$col; @@ -124,4 +123,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 6ba867504..5135e4b04 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -13,7 +13,6 @@ | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | - | Author: Tobias 'tri' Richter <tobias@datenwerkstatt-richter.de> | +-----------------------------------------------------------------------+ $Id$ @@ -29,7 +28,7 @@ if ((empty($_POST['_name']) || empty($_POST['_email'])) && empty($_GET['_framed' } // setup some vars we need -$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'); +$a_save_cols = array('name', 'firstname', 'surname', 'email'); $contacts_table = get_table_name('contacts'); // update an existing contact diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index c5192b368..960ea1c45 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -13,7 +13,6 @@ | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | - | Author: Tobias 'tri' Richter <tobias@datenwerkstatt-richter.de | +-----------------------------------------------------------------------+ $Id$ @@ -54,7 +53,7 @@ function rcmail_contact_details($attrib) // return the complete address record as table $out = "<table>\n\n"; - $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'); + $a_show_cols = array('name', 'firstname', 'surname', 'email'); foreach ($a_show_cols as $col) { if ($col=='email' && $CONTACT_RECORD[$col]) @@ -78,4 +77,4 @@ function rcmail_contact_details($attrib) parse_template('showcontact'); -?> +?>
\ No newline at end of file |