holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to new field names and add ADR_Country

Browse Source
This commit is contained in:
Miles Lott 2001-02-02 07:24:45 +00:00
parent 4f95d122cd
commit 435c1dc721
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
addressbook/vcardout.php
View File

@ -32,27 +32,28 @@
if ($filter != "private") if ($filter != "private")
$filtermethod = " or ab_access='public' " . $phpgw->accounts->sql_search("ab_access"); $filtermethod = " or ab_access='public' " . $phpgw->accounts->sql_search("ab_access");
$fields = $this->read_single_entry($ab_id,$this->stock_addressbook_fields); $fields = $this->read_single_entry($ab_id,$this->stock_contact_fields);
$email = $fields[0]["email"]; $email = $fields[0]["D_EMAIL"];
$firstname = $fields[0]["firstname"]; $firstname = $fields[0]["N_Given"];
$lastname = $fields[0]["lastname"]; $lastname = $fields[0]["N_Family"];
$title = $fields[0]["title"]; $title = $fields[0]["TITLE"];
$hphone = $fields[0]["hphone"]; $hphone = $fields[0]["A_TEL"];
$wphone = $fields[0]["wphone"]; $wphone = $fields[0]["B_TEL"];
$fax = $fields[0]["fax"]; $fax = $fields[0]["C_TEL"];
$pager = $fields[0]["pager"]; $pager = $fields[0]["pager"];
$mphone = $fields[0]["mphone"]; $mphone = $fields[0]["mphone"];
$ophone = $fields[0]["ophone"]; $ophone = $fields[0]["ophone"];
$street = $fields[0]["street"]; $street = $fields[0]["ADR_Street"];
$address2 = $fields[0]["address2"]; $address2 = $fields[0]["address2"];
$city = $fields[0]["city"]; $city = $fields[0]["ADR_Locality"];
$state = $fields[0]["state"]; $state = $fields[0]["ADR_Region"];
$zip = $fields[0]["zip"]; $zip = $fields[0]["ADR_PostalCode"];
$country = $fields[0]["ADR_Country"];
$company = $fields[0]["ORG_Name"];
$bday = $fields[0]["bday"]; $bday = $fields[0]["bday"];
$notes = $fields[0]["notes"]; $notes = $fields[0]["notes"];
$access = $fields[0]["access"]; $access = $fields[0]["access"];
$company = $fields[0]["company"];
$url = $fields[0]["url"]; $url = $fields[0]["url"];
if(!$nolname && !$nofname) if(!$nolname && !$nofname)
@ -102,9 +103,8 @@
$city != "" || /* City */ $city != "" || /* City */
$state != "" || /* State */ $state != "" || /* State */
$zip != "") /* Zip */ $zip != "") /* Zip */
// Warning Ugly U.S. centric assumption made here.....
printf("ADR:;%s;%s;%s;%s;%s;%s\r\n", $address2, printf("ADR:;%s;%s;%s;%s;%s;%s\r\n", $address2,
$street,$city,$state,$zip,"United States" $street,$city,$state,$zip,$country
); );
if($bday != "" && $bday != "//") /* Birthday */ if($bday != "" && $bday != "//") /* Birthday */