extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix result of parsevcard explode on url value

Browse Source
This commit is contained in:
Miles Lott 2001-03-13 17:14:08 +00:00
parent 6b219e8add
commit 46f97bdea0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addressbook/inc/functions.inc.php
View File

@ -429,7 +429,7 @@
$t->pparse("out","form"); $t->pparse("out","form");
} //end form function } //end form function
function parsevcard($filename,$access) { function parsevcard($filename,$access='') {
global $phpgw; global $phpgw;
global $phpgw_info; global $phpgw_info;
@ -481,8 +481,8 @@
} }
} }
fillab($varray,$access); // Add this entry to the addressbook before // Add this entry to the addressbook before moving on to the next one.
// moving on to the next one. fillab($varray);
} // while(!feof($vcard)) } // while(!feof($vcard))
fclose($vcard); fclose($vcard);
@ -490,7 +490,7 @@
} }
function fillab($varray,$access) { function fillab($varray,$access='') {
global $phpgw; global $phpgw;
global $phpgw_info; global $phpgw_info;
@ -513,6 +513,14 @@
break; break;
case "url": case "url":
$url = $v[0]; $url = $v[0];
// Fix the result of exploding on ':' above
if (substr($url,0,5) == 'http/') {
$url = ereg_replace('http//','http://',$url);
} elseif (substr($url,0,6) == 'https/') {
$url = ereg_replace('https//','https://',$url);
} elseif (substr($url,0,7) != 'http://') {
$url = 'http://' . $url;
}
break; break;
case "adr": // This one is real ugly. :( case "adr": // This one is real ugly. :(
$street = $v[2]; $street = $v[2];
@ -630,7 +638,7 @@
*/ */
$fields["owner"] = $phpgw_info["user"]["account_id"]; $fields["owner"] = $phpgw_info["user"]["account_id"];
$fields["access"] = $access; //$fields["access"] = $access;
$fields["n_given"] = addslashes($firstname); $fields["n_given"] = addslashes($firstname);
$fields["n_family"] = addslashes($lastname); $fields["n_family"] = addslashes($lastname);
$fields["fn"] = addslashes($firstname . " " . $lastname); $fields["fn"] = addslashes($firstname . " " . $lastname);
@ -648,7 +656,7 @@
$fields["adr_region"] = addslashes($state); $fields["adr_region"] = addslashes($state);
$fields["adr_postalcode"] = addslashes($zip); $fields["adr_postalcode"] = addslashes($zip);
$fields["bday"] = addslashes($bday); $fields["bday"] = addslashes($bday);
$fields["url"] = addslashes($url); $fields["url"] = $url;
$fields["note"] = addslashes($notes); $fields["note"] = addslashes($notes);
$fields["org_name"] = addslashes($company); $fields["org_name"] = addslashes($company);