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

fix some Scrutinizer "bugs"

Browse Source
This commit is contained in:
Ralf Becker 2016-07-15 08:17:54 +02:00
parent 847fb38194
commit b2ac90fec6
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/Accounts/Ads.php
View File

@ -758,7 +758,7 @@ class Ads
case 'account_primary_group':
// setting a primary group seems to fail, if user is no member of that group
if (isset($old['memberships'][$data[$egw]]) ||
$this->adldap->group()->addUser($group=$this->id2name($data[$egw]), $data['account_id']))
($group=$this->id2name($data[$egw])) && $this->adldap->group()->addUser($group, $data['account_id']))
{
$old['memberships'][$data[$egw]] = $group;
$ldap[$adldap] = abs($data[$egw]);
@ -1267,7 +1267,7 @@ class adLDAP extends \adLDAP
*
* Extended to use mbstring to convert from arbitrary charset to utf-8
*/
protected function encode8Bit(&$item, $key)
public function encode8Bit(&$item, $key)
{
if ($this->charset != 'utf-8' && $key != 'password')
{
@ -1416,7 +1416,7 @@ class adLDAPUsers extends \adLDAPUsers
public function encodePassword($password)
{
$password="\"".$password."\"";
if (function_exists('mb_convert_encoding'))
if (function_exists('mb_convert_encoding') && !empty($this->adldap->charset))
{
return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
}