extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-23 11:21:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

* LDAP: fix fatal error in minimal install

Browse Source
This commit is contained in:
Ralf Becker 2017-04-07 18:49:30 +02:00
parent fef4df3ab2
commit e817e59fb8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Contacts/Ldap.php
View File

@ -1374,7 +1374,7 @@ class Ldap
{ {
if ($data['c']) if ($data['c'])
{ {
$contact['adr_one_countryname'] = ExecMethod('phpgwapi.country.get_full_name',$data['c'][0]); $contact['adr_one_countryname'] = Api\Country::get_full_name($data['c'][0]);
} }
} }
@ -1396,7 +1396,7 @@ class Ldap
} }
elseif ($data['adr_one_countryname']) elseif ($data['adr_one_countryname'])
{ {
$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']); $ldapContact['c'] = Api\Country::country_code($data['adr_one_countryname']);
if ($ldapContact['c'] && strlen($ldapContact['c']) > 2) // Bad countryname when "custom" selected! if ($ldapContact['c'] && strlen($ldapContact['c']) > 2) // Bad countryname when "custom" selected!
{ {
$ldapContact['c'] = array(); // should return error... $ldapContact['c'] = array(); // should return error...
@ -1442,7 +1442,7 @@ class Ldap
} }
elseif ($data['adr_one_countryname']) elseif ($data['adr_one_countryname'])
{ {
$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']); $ldapContact['c'] = Api\Country::country_code($data['adr_one_countryname']);
if ($ldapContact['c'] && strlen($ldapContact['c']) > 2) // Bad countryname when "custom" selected! if ($ldapContact['c'] && strlen($ldapContact['c']) > 2) // Bad countryname when "custom" selected!
{ {
$ldapContact['c'] = array(); // should return error... $ldapContact['c'] = array(); // should return error...