]> source.dussan.org Git - nextcloud-server.git/commitdiff
FIX: emit assignedUserId only for users
authorArthur Schiwon <blizzz@arthur-schiwon.de>
Wed, 11 Apr 2018 13:33:36 +0000 (15:33 +0200)
committerArthur Schiwon <blizzz@arthur-schiwon.de>
Thu, 9 Aug 2018 21:45:11 +0000 (23:45 +0200)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
apps/user_ldap/lib/Access.php

index 91089e779a034834c73bf130160db1567a5a611b..a03b4a4cb9c6a730913300fe5c7eb923c9234ac3 100644 (file)
@@ -609,23 +609,23 @@ class Access extends LDAPUtility implements IUserTools {
                //NOTE: mind, disabling cache affects only this instance! Using it
                // outside of core user management will still cache the user as non-existing.
                $originalTTL = $this->connection->ldapCacheTTL;
-               $this->connection->setConfiguration(array('ldapCacheTTL' => 0));
+               $this->connection->setConfiguration(['ldapCacheTTL' => 0]);
                if(($isUser && $intName !== '' && !$this->ncUserManager->userExists($intName))
                        || (!$isUser && !\OC::$server->getGroupManager()->groupExists($intName))) {
                        if($mapper->map($fdn, $intName, $uuid)) {
-                               $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
-                               if($this->ncUserManager instanceof PublicEmitter) {
+                               $this->connection->setConfiguration(['ldapCacheTTL' => $originalTTL]);
+                               if($this->ncUserManager instanceof PublicEmitter && $isUser) {
                                        $this->ncUserManager->emit('\OC\User', 'assignedUserId', [$intName]);
                                }
                                $newlyMapped = true;
                                return $intName;
                        }
                }
-               $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
+               $this->connection->setConfiguration(['ldapCacheTTL' => $originalTTL]);
 
                $altName = $this->createAltInternalOwnCloudName($intName, $isUser);
                if(is_string($altName) && $mapper->map($fdn, $altName, $uuid)) {
-                       if($this->ncUserManager instanceof PublicEmitter) {
+                       if($this->ncUserManager instanceof PublicEmitter && $isUser) {
                                $this->ncUserManager->emit('\OC\User', 'assignedUserId', [$intName]);
                        }
                        $newlyMapped = true;