fix email type field in upgrade for 16-18

This commit is contained in:
Miles Lott 2001-03-21 17:16:16 +00:00
parent 5ae83147c5
commit 35c89c43f1
2 changed files with 2 additions and 2 deletions

View File

@ -1273,7 +1273,7 @@
$phpgw_setup->db->query("alter table phpgw_addressbook change b_tel_msg tel_video varchar(40) DEFAULT '+1 (000) 000-0000' NOT NULL"); $phpgw_setup->db->query("alter table phpgw_addressbook change b_tel_msg tel_video varchar(40) DEFAULT '+1 (000) 000-0000' NOT NULL");
$phpgw_setup->db->query("alter table phpgw_addressbook change a_tel_prefer tel_prefer varchar(32)"); $phpgw_setup->db->query("alter table phpgw_addressbook change a_tel_prefer tel_prefer varchar(32)");
$phpgw_setup->db->query("alter table phpgw_addressbook change d_email email varchar(64)"); $phpgw_setup->db->query("alter table phpgw_addressbook change d_email email varchar(64)");
$phpgw_setup->db->query("alter table phpgw_addressbook change d_email_type email_type varchar(32) DEFAULT 'INTERNET' NOT NULL"); $phpgw_setup->db->query("alter table phpgw_addressbook change d_emailtype email_type varchar(32) DEFAULT 'INTERNET' NOT NULL");
$phpgw_setup->db->query("alter table phpgw_addressbook change d_email_work email_home varchar(64)"); $phpgw_setup->db->query("alter table phpgw_addressbook change d_email_work email_home varchar(64)");
$phpgw_setup->db->query("alter table phpgw_addressbook change d_email_home email_home_type varchar(32) DEFAULT 'INTERNET' NOT NULL"); $phpgw_setup->db->query("alter table phpgw_addressbook change d_email_home email_home_type varchar(32) DEFAULT 'INTERNET' NOT NULL");
$phpgw_setup->db->query("alter table phpgw_addressbook drop b_tel_prefer"); $phpgw_setup->db->query("alter table phpgw_addressbook drop b_tel_prefer");

View File

@ -1518,7 +1518,7 @@
$fields['n_given'] = $phpgw_setup->db->f("firstname"); $fields['n_given'] = $phpgw_setup->db->f("firstname");
$fields['n_family'] = $phpgw_setup->db->f("lastname"); $fields['n_family'] = $phpgw_setup->db->f("lastname");
$fields['email'] = $phpgw_setup->db->f("d_email"); $fields['email'] = $phpgw_setup->db->f("d_email");
$fields['email_type'] = $phpgw_setup->db->f("d_email_type"); $fields['email_type'] = $phpgw_setup->db->f("d_emailtype");
$fields['tel_home'] = $phpgw_setup->db->f("hphone"); $fields['tel_home'] = $phpgw_setup->db->f("hphone");
$fields['tel_work'] = $phpgw_setup->db->f("wphone"); $fields['tel_work'] = $phpgw_setup->db->f("wphone");
$fields['tel_fax'] = $phpgw_setup->db->f("fax"); $fields['tel_fax'] = $phpgw_setup->db->f("fax");