summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/User_Proxy.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-09-15 16:01:54 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-09-29 11:44:04 +0200
commitc9622ccb62652b71fc12f000813d94f62f7ac327 (patch)
tree3fa46984183dafb4179fb941319d782a10542bb0 /apps/user_ldap/lib/User_Proxy.php
parent95ec247d102f968322457e49ba16e13a2ec1bddd (diff)
downloadnextcloud-server-c9622ccb62652b71fc12f000813d94f62f7ac327.tar.gz
nextcloud-server-c9622ccb62652b71fc12f000813d94f62f7ac327.zip
fix LDAP User deletion (cleanup)
discovered a bug in the integration test which lead to following a different code path and giving a false-positive success feedback. Also listens now to the evendispatcher instead of old hook system Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap/lib/User_Proxy.php')
-rw-r--r--apps/user_ldap/lib/User_Proxy.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php
index d1784ad7c14..a25eb1bc621 100644
--- a/apps/user_ldap/lib/User_Proxy.php
+++ b/apps/user_ldap/lib/User_Proxy.php
@@ -31,6 +31,7 @@ namespace OCA\User_LDAP;
use OCA\User_LDAP\User\User;
use OCP\IConfig;
+use OCP\IUserSession;
use OCP\Notification\IManager as INotificationManager;
class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, IUserLDAP {
@@ -39,14 +40,19 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface,
/**
* Constructor
+ *
* @param array $serverConfigPrefixes array containing the config Prefixes
+ * @param ILDAPWrapper $ldap
+ * @param IConfig $ocConfig
+ * @param INotificationManager $notificationManager
+ * @param IUserSession $userSession
*/
public function __construct(array $serverConfigPrefixes, ILDAPWrapper $ldap, IConfig $ocConfig,
- INotificationManager $notificationManager) {
+ INotificationManager $notificationManager, IUserSession $userSession) {
parent::__construct($ldap);
foreach($serverConfigPrefixes as $configPrefix) {
$this->backends[$configPrefix] =
- new User_LDAP($this->getAccess($configPrefix), $ocConfig, $notificationManager);
+ new User_LDAP($this->getAccess($configPrefix), $ocConfig, $notificationManager, $userSession);
if(is_null($this->refBackend)) {
$this->refBackend = &$this->backends[$configPrefix];
}