diff options
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/l10n/cs.js | 4 | ||||
| -rw-r--r-- | apps/user_ldap/l10n/cs.json | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 20 |
3 files changed, 16 insertions, 12 deletions
diff --git a/apps/user_ldap/l10n/cs.js b/apps/user_ldap/l10n/cs.js index d63fca44d9a..def04b5c034 100644 --- a/apps/user_ldap/l10n/cs.js +++ b/apps/user_ldap/l10n/cs.js @@ -118,8 +118,8 @@ OC.L10N.register( "Please renew your password." : "Obnovte své heslo.", "An internal error occurred." : "Došlo k interní chybě.", "Please try again or contact your administrator." : "Zkuste to znovu, nebo se obraťte na svého správce.", - "Current password" : "Aktuální heslo", - "New password" : "Žádné heslo", + "Current password" : "Dosavadní heslo", + "New password" : "Nové heslo", "Renew password" : "Obnovit heslo", "Wrong password." : "Chybné heslo.", "Cancel" : "Storno", diff --git a/apps/user_ldap/l10n/cs.json b/apps/user_ldap/l10n/cs.json index 9752f609b3a..d683d434758 100644 --- a/apps/user_ldap/l10n/cs.json +++ b/apps/user_ldap/l10n/cs.json @@ -116,8 +116,8 @@ "Please renew your password." : "Obnovte své heslo.", "An internal error occurred." : "Došlo k interní chybě.", "Please try again or contact your administrator." : "Zkuste to znovu, nebo se obraťte na svého správce.", - "Current password" : "Aktuální heslo", - "New password" : "Žádné heslo", + "Current password" : "Dosavadní heslo", + "New password" : "Nové heslo", "Renew password" : "Obnovit heslo", "Wrong password." : "Chybné heslo.", "Cancel" : "Storno", diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 0b55f8a4e92..0a348c2ee64 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -739,20 +739,24 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD if ($result === false) { \OCP\Util::writeLog('user_ldap', 'No uid attribute found for DN ' . $userDN . ' on '. $this->access->connection->ldapHost, ILogger::DEBUG); + $uid = false; + } else { + $uid = $result[0]; } - $uid = $result[0]; } else { // just in case $uid = $userDN; } - if(isset($this->cachedGroupsByMember[$uid])) { - $groups = array_merge($groups, $this->cachedGroupsByMember[$uid]); - } else { - $groupsByMember = array_values($this->getGroupsByMember($uid)); - $groupsByMember = $this->access->nextcloudGroupNames($groupsByMember); - $this->cachedGroupsByMember[$uid] = $groupsByMember; - $groups = array_merge($groups, $groupsByMember); + if($uid !== false) { + if (isset($this->cachedGroupsByMember[$uid])) { + $groups = array_merge($groups, $this->cachedGroupsByMember[$uid]); + } else { + $groupsByMember = array_values($this->getGroupsByMember($uid)); + $groupsByMember = $this->access->nextcloudGroupNames($groupsByMember); + $this->cachedGroupsByMember[$uid] = $groupsByMember; + $groups = array_merge($groups, $groupsByMember); + } } if($primaryGroup !== false) { |