diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-03-19 15:23:30 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-04-05 12:46:15 +0200 |
| commit | 373a1d53918db011ca36351ad8e5240567ad999c (patch) | |
| tree | 99277022939c8af14f31c9d35034fe2a9565fd5f /apps/user_ldap | |
| parent | 2ebf26e4447c6c5eef41be35ee4487c78ffe8231 (diff) | |
| download | nextcloud-server-373a1d53918db011ca36351ad8e5240567ad999c.tar.gz nextcloud-server-373a1d53918db011ca36351ad8e5240567ad999c.zip | |
more consistent naming
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/ajax/clearMappings.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User_LDAP.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php index 009a491d349..8e2d63e3eb2 100644 --- a/apps/user_ldap/ajax/clearMappings.php +++ b/apps/user_ldap/ajax/clearMappings.php @@ -38,10 +38,10 @@ try { $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); $result = $mapping->clearCb( function ($uid) { - \OC::$server->getUserManager()->emit('\OC\User', 'preRevokeUser', [$uid]); + \OC::$server->getUserManager()->emit('\OC\User', 'preUnassignedUserId', [$uid]); }, function ($uid) { - \OC::$server->getUserManager()->emit('\OC\User', 'postRevokeUser', [$uid]); + \OC::$server->getUserManager()->emit('\OC\User', 'postUnassignedUserId', [$uid]); } ); } else if($subject === 'group') { diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index c9a7cd557a1..198fb478fed 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -609,7 +609,7 @@ class Access extends LDAPUtility implements IUserTools { || (!$isUser && !\OC::$server->getGroupManager()->groupExists($intName))) { if($mapper->map($fdn, $intName, $uuid)) { $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL)); - \OC::$server->getUserManager()->emit('\OC\User', 'announceUser', [$intName]); + \OC::$server->getUserManager()->emit('\OC\User', 'assignedUserId', [$intName]); $newlyMapped = true; return $intName; } @@ -618,7 +618,7 @@ class Access extends LDAPUtility implements IUserTools { $altName = $this->createAltInternalOwnCloudName($intName, $isUser); if(is_string($altName) && $mapper->map($fdn, $altName, $uuid)) { - \OC::$server->getUserManager()->emit('\OC\User', 'announceUser', [$intName]); + \OC::$server->getUserManager()->emit('\OC\User', 'assignedUserId', [$intName]); $newlyMapped = true; return $altName; } diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index 3868645caec..e56e4675e39 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -396,7 +396,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn \OC::$server->getLogger()->info('Cleaning up after user ' . $uid, array('app' => 'user_ldap')); - $this->access->getUserMapper()->unmap($uid); // we don't emit revoke signals here, since it is implicit to delete signals fired from core + $this->access->getUserMapper()->unmap($uid); // we don't emit unassign signals here, since it is implicit to delete signals fired from core $this->access->userManager->invalidate($uid); return true; } |