diff options
author | thomascube <thomas@roundcube.net> | 2006-08-11 18:31:35 +0000 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2006-08-11 18:31:35 +0000 |
commit | 64009eb8495a9bc8855fd43846777a38dc5cdcc5 (patch) | |
tree | ae26b3866f8653d8f50efe5e481d905d7bce0559 /program/steps | |
parent | c670f6ba1bb8e91022779186815661160e662a09 (diff) |
Reverted files to r305
Diffstat (limited to 'program/steps')
-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 |
3 files changed, 5 insertions, 8 deletions
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 |