Commit c64fe2ba authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #1333 supportDaemon can cause some PHP errors

Showing with 4 additions and 4 deletions
+4 -4
...@@ -734,8 +734,8 @@ class supportDaemon ...@@ -734,8 +734,8 @@ class supportDaemon
$ldap->search("(&(objectClass=FAIprofile)(objectClass=FAIclass))",array('cn')); $ldap->search("(&(objectClass=FAIprofile)(objectClass=FAIclass))",array('cn'));
$res = array(); $res = array();
while($entry = $ldap->fetch()) { while ($entry = $ldap->fetch()) {
$res[]=$entry['cn'][0]; $res[] = $entry['cn'][0];
} }
return $res; return $res;
......
...@@ -135,9 +135,9 @@ class recoveryConfig extends simplePlugin ...@@ -135,9 +135,9 @@ class recoveryConfig extends simplePlugin
$ldap->create_missing_trees($tokenBranch); $ldap->create_missing_trees($tokenBranch);
if (!$ldap->success()) { if (!$ldap->success()) {
$display = msgPool::ldaperror($ldap->get_error(), $display = msgPool::ldaperror($ldap->get_error(),
$token, LDAP_MOD, get_class()); $tokenBranch, LDAP_MOD, get_class());
} }
fusiondirectory_log("Created token branch ".$token); fusiondirectory_log("Created token branch ".$tokenBranch);
} }
parent::__construct($config, $dn, $object); parent::__construct($config, $dn, $object);
......
  • bmortier @bmortier

    mentioned in issue #501 (closed)

    By Côme Chilliet on 2017-09-02T14:49:14 (imported from GitLab)

    ·

    mentioned in issue #501 (closed)

    By Côme Chilliet on 2017-09-02T14:49:14 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment