From 9fb0322fea822fc43e1092b1d52fa813883f3340 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Sun, 4 Feb 2001 12:55:22 +0000 Subject: [PATCH] Change fieldnames to lowercase --- addressbook/add.php | 54 ++++++++++++++++++++++++---------------- addressbook/edit.php | 41 +++++++++++++++--------------- addressbook/vcardout.php | 36 +++++++++++++-------------- 3 files changed, 71 insertions(+), 60 deletions(-) diff --git a/addressbook/add.php b/addressbook/add.php index b23c185776..6a30884c0d 100755 --- a/addressbook/add.php +++ b/addressbook/add.php @@ -49,29 +49,39 @@ $url = ""; } - $fields["ORG_Name"] = $company; - $fields["N_Given"] = $firstname; - $fields["N_Family"] = $lastname; - $fields["D_EMAIL"] = $email; - $fields["D_EMAILTYPE"] = $email_type; - $fields["TITLE"] = $title; - $fields["A_TEL"] = $wphone; - $fields["B_TEL"] = $hphone; - $fields["C_TEL"] = $fax; - $fields["pager"] = $pager; - $fields["mphone"] = $mphone; - $fields["ophone"] = $ophone; - $fields["ADR_Street"] = $street; - $fields["address2"] = $address2; - $fields["ADR_Locality"] = $city; - $fields["ADR_Region"] = $state; - $fields["ADR_PostalCode"] = $zip; - $fields["ADR_Country"] = $country; - $fields["bday"] = $bday; - $fields["url"] = $url; - $fields["notes"] = $notes; + $fields["org_name"] = $company; + $fields["org_unit"] = $department; + $fields["n_given"] = $firstname; + $fields["n_family"] = $lastname; + $fields["n_middle"] = $middle; + $fields["n_prefix"] = $prefix; + $fields["n_suffix"] = $suffix; + if ($prefix) { $pspc = " "; } + if ($middle) { $mspc = " "; } + if ($suffix) { $sspc = " "; } + $fields["fn"] = $prefix . $pspc . $firstname . $mspc . $middle . $mspc . $lastname . $sspc . $suffix; + $fields["d_email"] = $email; + $fields["d_emailtype"] = $email_type; + $fields["title"] = $title; + $fields["a_tel"] = $wphone; + $fields["b_tel"] = $hphone; + $fields["c_tel"] = $fax; + $fields["pager"] = $pager; + $fields["mphone"] = $mphone; + $fields["ophone"] = $ophone; + $fields["adr_street"] = $street; + $fields["address2"] = $address2; + $fields["adr_locality"] = $city; + $fields["adr_region"] = $state; + $fields["adr_postalcode"] = $zip; + $fields["adr_Countryname"] = $country; + $fields["tz"] = $timezone; + $fields["bday"] = $bday; + $fields["url"] = $url; + $fields["notes"] = $notes; + $fields["access"] = $access; - $this->add($phpgw_info["user"]["account_id"],$access,$fields); + $this->add($phpgw_info["user"]["account_id"],$fields); Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/addressbook/", "cd=14")); diff --git a/addressbook/edit.php b/addressbook/edit.php index 0f41fdc6f0..4ba1baeb2f 100755 --- a/addressbook/edit.php +++ b/addressbook/edit.php @@ -57,36 +57,37 @@ $access = $phpgw->accounts->array_to_string($access,$n_groups); } - $fields["ORG_Name"] = $company; - $fields["ORG_Unit"] = $department; - $fields["N_Given"] = $firstname; - $fields["N_Family"] = $lastname; - $fields["N_Middle"] = $middle; - $fields["N_Prefix"] = $prefix; - $fields["N_Suffix"] = $suffix; + $fields["org_name"] = $company; + $fields["org_unit"] = $department; + $fields["n_given"] = $firstname; + $fields["n_family"] = $lastname; + $fields["n_middle"] = $middle; + $fields["n_prefix"] = $prefix; + $fields["n_suffix"] = $suffix; if ($prefix) { $pspc = " "; } if ($middle) { $mspc = " "; } if ($suffix) { $sspc = " "; } - $fields["FN"] = $prefix . $pspc . $firstname . $mspc . $middle . $mspc . $lastname . $sspc . $suffix; - $fields["D_EMAIL"] = $email; - $fields["D_EMAILTYPE"] = $email_type; - $fields["TITLE"] = $title; - $fields["A_TEL"] = $wphone; - $fields["B_TEL"] = $hphone; - $fields["C_TEL"] = $fax; + $fields["fn"] = $prefix . $pspc . $firstname . $mspc . $middle . $mspc . $lastname . $sspc . $suffix; + $fields["d_email"] = $email; + $fields["d_emailtype"] = $email_type; + $fields["title"] = $title; + $fields["a_tel"] = $wphone; + $fields["b_tel"] = $hphone; + $fields["c_tel"] = $fax; $fields["pager"] = $pager; $fields["mphone"] = $mphone; $fields["ophone"] = $ophone; - $fields["ADR_Street"] = $street; + $fields["adr_street"] = $street; $fields["address2"] = $address2; - $fields["ADR_Locality"] = $city; - $fields["ADR_Region"] = $state; - $fields["ADR_PostalCode"] = $zip; - $fields["ADR_CountryName"] = $country; - $fields["TZ"] = $timezone; + $fields["adr_locality"] = $city; + $fields["adr_region"] = $state; + $fields["adr_postalcode"] = $zip; + $fields["adr_countryname"] = $country; + $fields["tz"] = $timezone; $fields["bday"] = $bday; $fields["url"] = $url; $fields["notes"] = $notes; + $fields["access"] = $access; $this->update($ab_id,$phpgw_info["user"]["account_id"],$fields); diff --git a/addressbook/vcardout.php b/addressbook/vcardout.php index 7e581091f7..981ac5f14e 100644 --- a/addressbook/vcardout.php +++ b/addressbook/vcardout.php @@ -34,28 +34,28 @@ $fields = $this->read_single_entry($ab_id,$this->stock_contact_fields); - $email = $fields[0]["D_EMAIL"]; - $fullname = $fields[0]["FN"]; - $prefix = $fields[0]["N_Prefix"]; - $firstname = $fields[0]["N_Given"]; - $middle = $fields[0]["N_Middle"]; - $lastname = $fields[0]["N_Family"]; - $suffix = $fields[0]["N_Suffix"]; - $title = $fields[0]["TITLE"]; - $hphone = $fields[0]["A_TEL"]; - $wphone = $fields[0]["B_TEL"]; - $fax = $fields[0]["C_TEL"]; + $email = $fields[0]["d_email"]; + $fullname = $fields[0]["fn"]; + $prefix = $fields[0]["n_prefix"]; + $firstname = $fields[0]["n_given"]; + $middle = $fields[0]["n_middle"]; + $lastname = $fields[0]["n_family"]; + $suffix = $fields[0]["n_suffix"]; + $title = $fields[0]["title"]; + $hphone = $fields[0]["a_tel"]; + $wphone = $fields[0]["b_tel"]; + $fax = $fields[0]["c_tel"]; $pager = $fields[0]["pager"]; $mphone = $fields[0]["mphone"]; $ophone = $fields[0]["ophone"]; - $street = $fields[0]["ADR_Street"]; + $street = $fields[0]["adr_street"]; $address2 = $fields[0]["address2"]; - $city = $fields[0]["ADR_Locality"]; - $state = $fields[0]["ADR_Region"]; - $zip = $fields[0]["ADR_PostalCode"]; - $country = $fields[0]["ADR_CountryName"]; - $company = $fields[0]["ORG_Name"]; - $dept = $fields[0]["ORG_Unit"]; + $city = $fields[0]["adr_locality"]; + $state = $fields[0]["adr_region"]; + $zip = $fields[0]["adr_postalcode"]; + $country = $fields[0]["adr_countryname"]; + $company = $fields[0]["org_name"]; + $dept = $fields[0]["org_unit"]; $bday = $fields[0]["bday"]; $notes = $fields[0]["notes"]; $access = $fields[0]["access"];