extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-25 14:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Addressbook/LDAP: fixed country handling for mozillaOrgPerson schema, which has two distinct attributes for 2-letter code and arbitrary name

Browse Source
This commit is contained in:
Ralf Becker 2011-09-13 10:36:03 +00:00
parent a2730516fe
commit 117179ad0f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addressbook/inc/class.addressbook_ldap.inc.php
View File

@ -137,7 +137,7 @@ class addressbook_ldap
// similar to the newer mozillaAbPerson, but uses mozillaPostalAddress2 instead of mozillaStreet2 // similar to the newer mozillaAbPerson, but uses mozillaPostalAddress2 instead of mozillaStreet2
'mozillaorgperson' => array( 'mozillaorgperson' => array(
'adr_one_street2' => 'mozillapostaladdress2', 'adr_one_street2' => 'mozillapostaladdress2',
'adr_one_countryname' => 'c', // 2 letter country code 'adr_one_countrycode' => 'c', // 2 letter country code
'adr_one_countryname' => 'co', // human readable country name, must be after 'c' to take precedence on read! 'adr_one_countryname' => 'co', // human readable country name, must be after 'c' to take precedence on read!
'adr_two_street' => 'mozillahomestreet', 'adr_two_street' => 'mozillahomestreet',
'adr_two_street2' => 'mozillahomepostaladdress2', 'adr_two_street2' => 'mozillahomepostaladdress2',
@ -1144,10 +1144,7 @@ class addressbook_ldap
*/ */
function _mozillaorgperson2egw(&$contact,$data) function _mozillaorgperson2egw(&$contact,$data)
{ {
if ($data['c'] && strlen($contact['adr_one_countryname']) <= 2) // dont overwrite a set human readable name // no special handling necessary, as it supports two distinct attributes: c, cn
{
$contact['adr_one_countryname'] = ExecMethod('phpgwapi.country.get_full_name',$data['c'][0]);
}
} }
/** /**
@ -1162,14 +1159,24 @@ class addressbook_ldap
*/ */
function _egw2mozillaorgperson(&$ldapContact,$data,$isUpdate) function _egw2mozillaorgperson(&$ldapContact,$data,$isUpdate)
{ {
if ($data['adr_one_countryname']) if ($data['adr_one_countrycode'])
{
$ldapContact['c'] = $data['adr_one_countrycode'];
if ($isUpdate) $ldapContact['co'] = array();
}
elseif ($data['adr_one_countryname'])
{ {
$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']); $ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']);
if ($ldapContact['c'] && strlen($ldapContact['c']) > 2) // Bad countryname when "custom" selected!
{
$ldapContact['c'] = array(); // should return error...
}
} }
elseif ($isUpdate) elseif ($isUpdate)
{ {
$ldapContact['c'] = array(); $ldapContact['c'] = $ldapContact['co'] = array();
} }
//error_log(__METHOD__."() adr_one_countrycode='{$data['adr_one_countrycode']}', adr_one_countryname='{$data['adr_one_countryname']}' --> c=".array2string($ldapContact['c']).', co='.array2string($ldapContact['co']));
} }
/** /**