From 5c89ffd8302afaaf020d6fcd33178023081e4ef9 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Mon, 12 Mar 2001 01:57:51 +0000 Subject: [PATCH] Hopefully fix home/work phone confusion again --- addressbook/conv/Debug Netscape to SQL | 4 ++-- addressbook/conv/Import from Netscape | 4 ++-- addressbook/inc/functions.inc.php | 4 ++-- addressbook/vcardout.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addressbook/conv/Debug Netscape to SQL b/addressbook/conv/Debug Netscape to SQL index 1507837106..d88c53ca31 100644 --- a/addressbook/conv/Debug Netscape to SQL +++ b/addressbook/conv/Debug Netscape to SQL @@ -40,8 +40,8 @@ "st" => "adr_region", "postalcode" => "adr_postalcode", "countryname" => "adr_countryname", - "telephonenumber" => "b_tel", - "homephone" => "a_tel", + "telephonenumber" => "a_tel", + "homephone" => "b_tel", "facsimiletelephonenumber" => "c_tel", "xmozillaanyphone" => "", "cellphone" => "mphone", diff --git a/addressbook/conv/Import from Netscape b/addressbook/conv/Import from Netscape index 9afc7850ed..8fd492da92 100644 --- a/addressbook/conv/Import from Netscape +++ b/addressbook/conv/Import from Netscape @@ -33,8 +33,8 @@ "st" => "adr_region", "postalcode" => "adr_postalcode", "countryname" => "adr_countryname", - "telephonenumber" => "b_tel", - "homephone" => "a_tel", + "telephonenumber" => "a_tel", + "homephone" => "b_tel", "facsimiletelephonenumber" => "c_tel", "xmozillaanyphone" => "ophone", "cellphone" => "mphone", diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php index 13217a9f6c..5d95cd4a2a 100755 --- a/addressbook/inc/functions.inc.php +++ b/addressbook/inc/functions.inc.php @@ -55,14 +55,14 @@ "adr_postal" => "", //yn "tz" => "time zone", "geo" => "geo", - "a_tel" => "home phone", + "a_tel" => "work phone", "a_tel_work" => "", //yn "a_tel_home" => "", //yn "a_tel_voice" => "", //yn "a_tel_msg" => "", //yn "a_tel_fax" => "", //yn "a_tel_prefer" => "", //yn - "b_tel" => "work phone", + "b_tel" => "home phone", "b_tel_work" => "", //yn "b_tel_home" => "", //yn "b_tel_voice" => "", //yn diff --git a/addressbook/vcardout.php b/addressbook/vcardout.php index 2e68504829..f3df60fc7b 100644 --- a/addressbook/vcardout.php +++ b/addressbook/vcardout.php @@ -49,8 +49,8 @@ $lastname = $fields["n_family"]; $suffix = $fields["n_suffix"]; $title = $fields["title"]; - $hphone = $fields["a_tel"]; - $wphone = $fields["b_tel"]; + $wphone = $fields["a_tel"]; + $hphone = $fields["b_tel"]; $fax = $fields["c_tel"]; $pager = $fields["pager"]; $mphone = $fields["mphone"];