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

fix to use fn (=fullname) in the addr_id function

Browse Source
This commit is contained in:
Ralf Becker 2004-06-20 09:18:59 +00:00
parent d0b2a3a823
commit b56a9b86c8
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
infolog/csv_import.php
View File

@ -66,19 +66,30 @@
$CPre = '|['; $CPreReg = '\|\['; // |{csv-fieldname} is expanded to the value of the csv-field $CPre = '|['; $CPreReg = '\|\['; // |{csv-fieldname} is expanded to the value of the csv-field
$CPos = ']'; $CPosReg = '\]'; // if used together with @ (replacement is eval-ed) value gets autom. quoted $CPos = ']'; $CPosReg = '\]'; // if used together with @ (replacement is eval-ed) value gets autom. quoted
function addr_id( $n_family,$n_given,$org_name ) function addr_id( $n_family,$n_given=False,$org_name=False )
{ // find in Addressbook, at least n_family AND (n_given OR org_name) have to match { // find in Addressbook, at least n_family AND (n_given OR org_name) have to match
$contacts = createobject('phpgwapi.contacts'); $contacts = createobject('phpgwapi.contacts');
$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" ); if ($org_name !== False) // org_name given?
if (!count($addrs)) {
$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
if (!count($addrs))
{
$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name" );
}
}
if ($n_given !== False && ($org_name === False || !count($addrs))) // first name given and no result so far
{
$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given" ); $addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given" );
if (!count($addrs)) }
$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name" ); if ($n_given === False && $org_name === False) // just one name given, check against fn (= full name)
{
$addrs = $contacts->read( 0,0,array('id'),'',"fn=$n_family" );
}
if (count($addrs)) if (count($addrs))
{
return $addrs[0]['id']; return $addrs[0]['id'];
}
return False; return False;
} }