nextcloud / server

apps/user_ldap/lib/BackendUtility.php

Indentation +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@
 
 
 abstract class BackendUtility {
-	protected $access;
+    protected $access;
 
-	/**
-	 * constructor, make sure the subclasses call this one!
-	 * @param Access $access an instance of Access for LDAP interaction
-	 */
-	public function __construct(Access $access) {
-		$this->access = $access;
-	}
+    /**
+     * constructor, make sure the subclasses call this one!
+     * @param Access $access an instance of Access for LDAP interaction
+     */
+    public function __construct(Access $access) {
+        $this->access = $access;
+    }
 }

apps/user_ldap/lib/WizardResult.php

Indentation +43 added lines, -43 removed lines

@@ -28,52 +28,52 @@
 namespace OCA\User_LDAP;
 
 class WizardResult {
-	protected $changes = array();
-	protected $options = array();
-	protected $markedChange = false;
+    protected $changes = array();
+    protected $options = array();
+    protected $markedChange = false;
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function addChange($key, $value) {
-		$this->changes[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function addChange($key, $value) {
+        $this->changes[$key] = $value;
+    }
 
-	/**
-	 *
-	 */
-	public function markChange() {
-		$this->markedChange = true;
-	}
+    /**
+     *
+     */
+    public function markChange() {
+        $this->markedChange = true;
+    }
 
-	/**
-	 * @param string $key
-	 * @param array|string $values
-	 */
-	public function addOptions($key, $values) {
-		if(!is_array($values)) {
-			$values = array($values);
-		}
-		$this->options[$key] = $values;
-	}
+    /**
+     * @param string $key
+     * @param array|string $values
+     */
+    public function addOptions($key, $values) {
+        if(!is_array($values)) {
+            $values = array($values);
+        }
+        $this->options[$key] = $values;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function hasChanges() {
-		return (count($this->changes) > 0 || $this->markedChange);
-	}
+    /**
+     * @return bool
+     */
+    public function hasChanges() {
+        return (count($this->changes) > 0 || $this->markedChange);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getResultArray() {
-		$result = array();
-		$result['changes'] = $this->changes;
-		if(count($this->options) > 0) {
-			$result['options'] = $this->options;
-		}
-		return $result;
-	}
+    /**
+     * @return array
+     */
+    public function getResultArray() {
+        $result = array();
+        $result['changes'] = $this->changes;
+        if(count($this->options) > 0) {
+            $result['options'] = $this->options;
+        }
+        return $result;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param array|string $values
 	 */
 	public function addOptions($key, $values) {
-		if(!is_array($values)) {
+		if (!is_array($values)) {
 			$values = array($values);
 		}
 		$this->options[$key] = $values;
@@ -71,7 +71,7 @@ 
 	public function getResultArray() {
 		$result = array();
 		$result['changes'] = $this->changes;
-		if(count($this->options) > 0) {
+		if (count($this->options) > 0) {
 			$result['options'] = $this->options;
 		}
 		return $result;

apps/user_ldap/lib/Proxy.php

Indentation +170 added lines, -170 removed lines

@@ -35,174 +35,174 @@
 use OCA\User_LDAP\User\Manager;
 
 abstract class Proxy {
-	static private $accesses = array();
-	private $ldap = null;
-
-	/** @var \OCP\ICache|null */
-	private $cache;
-
-	/**
-	 * @param ILDAPWrapper $ldap
-	 */
-	public function __construct(ILDAPWrapper $ldap) {
-		$this->ldap = $ldap;
-		$memcache = \OC::$server->getMemCacheFactory();
-		if($memcache->isAvailable()) {
-			$this->cache = $memcache->create();
-		}
-	}
-
-	/**
-	 * @param string $configPrefix
-	 */
-	private function addAccess($configPrefix) {
-		static $ocConfig;
-		static $fs;
-		static $log;
-		static $avatarM;
-		static $userMap;
-		static $groupMap;
-		static $db;
-		static $coreUserManager;
-		if(is_null($fs)) {
-			$ocConfig = \OC::$server->getConfig();
-			$fs       = new FilesystemHelper();
-			$log      = new LogWrapper();
-			$avatarM  = \OC::$server->getAvatarManager();
-			$db       = \OC::$server->getDatabaseConnection();
-			$userMap  = new UserMapping($db);
-			$groupMap = new GroupMapping($db);
-			$coreUserManager = \OC::$server->getUserManager();
-		}
-		$userManager =
-			new Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
-		$connector = new Connection($this->ldap, $configPrefix);
-		$access = new Access($connector, $this->ldap, $userManager, new Helper(\OC::$server->getConfig()));
-		$access->setUserMapper($userMap);
-		$access->setGroupMapper($groupMap);
-		self::$accesses[$configPrefix] = $access;
-	}
-
-	/**
-	 * @param string $configPrefix
-	 * @return mixed
-	 */
-	protected function getAccess($configPrefix) {
-		if(!isset(self::$accesses[$configPrefix])) {
-			$this->addAccess($configPrefix);
-		}
-		return self::$accesses[$configPrefix];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getUserCacheKey($uid) {
-		return 'user-'.$uid.'-lastSeenOn';
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupCacheKey($gid) {
-		return 'group-'.$gid.'-lastSeenOn';
-	}
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @param bool $passOnWhen
-	 * @return mixed
-	 */
-	abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @return mixed
-	 */
-	abstract protected function walkBackends($id, $method, $parameters);
-
-	/**
-	 * @param string $id
-	 * @return Access
-	 */
-	abstract public function getLDAPAccess($id);
-
-	/**
-	 * Takes care of the request to the User backend
-	 * @param string $id
-	 * @param string $method string, the method of the user backend that shall be called
-	 * @param array $parameters an array of parameters to be passed
-	 * @param bool $passOnWhen
-	 * @return mixed, the result of the specified method
-	 */
-	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
-		$result = $this->callOnLastSeenOn($id,  $method, $parameters, $passOnWhen);
-		if($result === $passOnWhen) {
-			$result = $this->walkBackends($id, $method, $parameters);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string|null $key
-	 * @return string
-	 */
-	private function getCacheKey($key) {
-		$prefix = 'LDAP-Proxy-';
-		if(is_null($key)) {
-			return $prefix;
-		}
-		return $prefix.md5($key);
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 */
-	public function getFromCache($key) {
-		if(is_null($this->cache) || !$this->isCached($key)) {
-			return null;
-		}
-		$key = $this->getCacheKey($key);
-
-		return json_decode(base64_decode($this->cache->get($key)));
-	}
-
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function isCached($key) {
-		if(is_null($this->cache)) {
-			return false;
-		}
-		$key = $this->getCacheKey($key);
-		return $this->cache->hasKey($key);
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function writeToCache($key, $value) {
-		if(is_null($this->cache)) {
-			return;
-		}
-		$key   = $this->getCacheKey($key);
-		$value = base64_encode(json_encode($value));
-		$this->cache->set($key, $value, '2592000');
-	}
-
-	public function clearCache() {
-		if(is_null($this->cache)) {
-			return;
-		}
-		$this->cache->clear($this->getCacheKey(null));
-	}
+    static private $accesses = array();
+    private $ldap = null;
+
+    /** @var \OCP\ICache|null */
+    private $cache;
+
+    /**
+     * @param ILDAPWrapper $ldap
+     */
+    public function __construct(ILDAPWrapper $ldap) {
+        $this->ldap = $ldap;
+        $memcache = \OC::$server->getMemCacheFactory();
+        if($memcache->isAvailable()) {
+            $this->cache = $memcache->create();
+        }
+    }
+
+    /**
+     * @param string $configPrefix
+     */
+    private function addAccess($configPrefix) {
+        static $ocConfig;
+        static $fs;
+        static $log;
+        static $avatarM;
+        static $userMap;
+        static $groupMap;
+        static $db;
+        static $coreUserManager;
+        if(is_null($fs)) {
+            $ocConfig = \OC::$server->getConfig();
+            $fs       = new FilesystemHelper();
+            $log      = new LogWrapper();
+            $avatarM  = \OC::$server->getAvatarManager();
+            $db       = \OC::$server->getDatabaseConnection();
+            $userMap  = new UserMapping($db);
+            $groupMap = new GroupMapping($db);
+            $coreUserManager = \OC::$server->getUserManager();
+        }
+        $userManager =
+            new Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
+        $connector = new Connection($this->ldap, $configPrefix);
+        $access = new Access($connector, $this->ldap, $userManager, new Helper(\OC::$server->getConfig()));
+        $access->setUserMapper($userMap);
+        $access->setGroupMapper($groupMap);
+        self::$accesses[$configPrefix] = $access;
+    }
+
+    /**
+     * @param string $configPrefix
+     * @return mixed
+     */
+    protected function getAccess($configPrefix) {
+        if(!isset(self::$accesses[$configPrefix])) {
+            $this->addAccess($configPrefix);
+        }
+        return self::$accesses[$configPrefix];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getUserCacheKey($uid) {
+        return 'user-'.$uid.'-lastSeenOn';
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupCacheKey($gid) {
+        return 'group-'.$gid.'-lastSeenOn';
+    }
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @param bool $passOnWhen
+     * @return mixed
+     */
+    abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @return mixed
+     */
+    abstract protected function walkBackends($id, $method, $parameters);
+
+    /**
+     * @param string $id
+     * @return Access
+     */
+    abstract public function getLDAPAccess($id);
+
+    /**
+     * Takes care of the request to the User backend
+     * @param string $id
+     * @param string $method string, the method of the user backend that shall be called
+     * @param array $parameters an array of parameters to be passed
+     * @param bool $passOnWhen
+     * @return mixed, the result of the specified method
+     */
+    protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
+        $result = $this->callOnLastSeenOn($id,  $method, $parameters, $passOnWhen);
+        if($result === $passOnWhen) {
+            $result = $this->walkBackends($id, $method, $parameters);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string|null $key
+     * @return string
+     */
+    private function getCacheKey($key) {
+        $prefix = 'LDAP-Proxy-';
+        if(is_null($key)) {
+            return $prefix;
+        }
+        return $prefix.md5($key);
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getFromCache($key) {
+        if(is_null($this->cache) || !$this->isCached($key)) {
+            return null;
+        }
+        $key = $this->getCacheKey($key);
+
+        return json_decode(base64_decode($this->cache->get($key)));
+    }
+
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function isCached($key) {
+        if(is_null($this->cache)) {
+            return false;
+        }
+        $key = $this->getCacheKey($key);
+        return $this->cache->hasKey($key);
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function writeToCache($key, $value) {
+        if(is_null($this->cache)) {
+            return;
+        }
+        $key   = $this->getCacheKey($key);
+        $value = base64_encode(json_encode($value));
+        $this->cache->set($key, $value, '2592000');
+    }
+
+    public function clearCache() {
+        if(is_null($this->cache)) {
+            return;
+        }
+        $this->cache->clear($this->getCacheKey(null));
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
 	public function __construct(ILDAPWrapper $ldap) {
 		$this->ldap = $ldap;
 		$memcache = \OC::$server->getMemCacheFactory();
-		if($memcache->isAvailable()) {
+		if ($memcache->isAvailable()) {
 			$this->cache = $memcache->create();
 		}
 	}
@@ -64,7 +64,7 @@ 
 		static $groupMap;
 		static $db;
 		static $coreUserManager;
-		if(is_null($fs)) {
+		if (is_null($fs)) {
 			$ocConfig = \OC::$server->getConfig();
 			$fs       = new FilesystemHelper();
 			$log      = new LogWrapper();
@@ -88,7 +88,7 @@ 
 	 * @return mixed
 	 */
 	protected function getAccess($configPrefix) {
-		if(!isset(self::$accesses[$configPrefix])) {
+		if (!isset(self::$accesses[$configPrefix])) {
 			$this->addAccess($configPrefix);
 		}
 		return self::$accesses[$configPrefix];
@@ -142,8 +142,8 @@ 
 	 * @return mixed, the result of the specified method
 	 */
 	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
-		$result = $this->callOnLastSeenOn($id,  $method, $parameters, $passOnWhen);
-		if($result === $passOnWhen) {
+		$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+		if ($result === $passOnWhen) {
 			$result = $this->walkBackends($id, $method, $parameters);
 		}
 		return $result;
@@ -155,7 +155,7 @@ 
 	 */
 	private function getCacheKey($key) {
 		$prefix = 'LDAP-Proxy-';
-		if(is_null($key)) {
+		if (is_null($key)) {
 			return $prefix;
 		}
 		return $prefix.md5($key);
@@ -166,7 +166,7 @@ 
 	 * @return mixed|null
 	 */
 	public function getFromCache($key) {
-		if(is_null($this->cache) || !$this->isCached($key)) {
+		if (is_null($this->cache) || !$this->isCached($key)) {
 			return null;
 		}
 		$key = $this->getCacheKey($key);
@@ -179,7 +179,7 @@ 
 	 * @return bool
 	 */
 	public function isCached($key) {
-		if(is_null($this->cache)) {
+		if (is_null($this->cache)) {
 			return false;
 		}
 		$key = $this->getCacheKey($key);
@@ -191,7 +191,7 @@ 
 	 * @param mixed $value
 	 */
 	public function writeToCache($key, $value) {
-		if(is_null($this->cache)) {
+		if (is_null($this->cache)) {
 			return;
 		}
 		$key   = $this->getCacheKey($key);
@@ -200,7 +200,7 @@ 
 	}
 
 	public function clearCache() {
-		if(is_null($this->cache)) {
+		if (is_null($this->cache)) {
 			return;
 		}
 		$this->cache->clear($this->getCacheKey(null));

apps/user_ldap/lib/Migration/UUIDFixInsert.php

Indentation +58 added lines, -58 removed lines

@@ -32,70 +32,70 @@
 
 class UUIDFixInsert implements IRepairStep {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var UserMapping */
-	protected $userMapper;
+    /** @var UserMapping */
+    protected $userMapper;
 
-	/** @var GroupMapping */
-	protected $groupMapper;
+    /** @var GroupMapping */
+    protected $groupMapper;
 
-	/** @var IJobList */
-	protected $jobList;
+    /** @var IJobList */
+    protected $jobList;
 
-	public function __construct(IConfig $config, UserMapping $userMapper, GroupMapping $groupMapper, IJobList $jobList) {
-		$this->config = $config;
-		$this->userMapper = $userMapper;
-		$this->groupMapper = $groupMapper;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IConfig $config, UserMapping $userMapper, GroupMapping $groupMapper, IJobList $jobList) {
+        $this->config = $config;
+        $this->userMapper = $userMapper;
+        $this->groupMapper = $groupMapper;
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Insert UUIDFix background job for user and group in batches';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Insert UUIDFix background job for user and group in batches';
+    }
 
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @param IOutput $output
-	 * @throws \Exception in case of failure
-	 * @since 9.1.0
-	 */
-	public function run(IOutput $output) {
-		$installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1');
-		if(version_compare($installedVersion, '1.2.1') !== -1) {
-			return;
-		}
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @param IOutput $output
+     * @throws \Exception in case of failure
+     * @since 9.1.0
+     */
+    public function run(IOutput $output) {
+        $installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1');
+        if(version_compare($installedVersion, '1.2.1') !== -1) {
+            return;
+        }
 
-		foreach ([$this->userMapper, $this->groupMapper] as $mapper) {
-			$offset = 0;
-			$batchSize = 50;
-			$jobClass = $mapper instanceof UserMapping ? UUIDFixUser::class : UUIDFixGroup::class;
-			do {
-				$retry = false;
-				$records = $mapper->getList($offset, $batchSize);
-				if(count($records) === 0){
-					continue;
-				}
-				try {
-					$this->jobList->add($jobClass, ['records' => $records]);
-					$offset += $batchSize;
-				} catch (\InvalidArgumentException $e) {
-					if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
-						$batchSize = intval(floor(count($records) * 0.8));
-						$retry = true;
-					}
-				}
-			} while (count($records) === $batchSize || $retry);
-		}
+        foreach ([$this->userMapper, $this->groupMapper] as $mapper) {
+            $offset = 0;
+            $batchSize = 50;
+            $jobClass = $mapper instanceof UserMapping ? UUIDFixUser::class : UUIDFixGroup::class;
+            do {
+                $retry = false;
+                $records = $mapper->getList($offset, $batchSize);
+                if(count($records) === 0){
+                    continue;
+                }
+                try {
+                    $this->jobList->add($jobClass, ['records' => $records]);
+                    $offset += $batchSize;
+                } catch (\InvalidArgumentException $e) {
+                    if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
+                        $batchSize = intval(floor(count($records) * 0.8));
+                        $retry = true;
+                    }
+                }
+            } while (count($records) === $batchSize || $retry);
+        }
 
-	}
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public function run(IOutput $output) {
 		$installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1');
-		if(version_compare($installedVersion, '1.2.1') !== -1) {
+		if (version_compare($installedVersion, '1.2.1') !== -1) {
 			return;
 		}
 
@@ -82,14 +82,14 @@ 
 			do {
 				$retry = false;
 				$records = $mapper->getList($offset, $batchSize);
-				if(count($records) === 0){
+				if (count($records) === 0) {
 					continue;
 				}
 				try {
 					$this->jobList->add($jobClass, ['records' => $records]);
 					$offset += $batchSize;
 				} catch (\InvalidArgumentException $e) {
-					if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
+					if (strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
 						$batchSize = intval(floor(count($records) * 0.8));
 						$retry = true;
 					}

apps/user_ldap/lib/Migration/UUIDFixGroup.php

Indentation +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@
 use OCP\IConfig;
 
 class UUIDFixGroup extends UUIDFix {
-	public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
-		$this->mapper = $mapper;
-		$this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config);
-	}
+    public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
+        $this->mapper = $mapper;
+        $this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config);
+    }
 }

apps/user_ldap/lib/Migration/UUIDFixUser.php

Indentation +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@
 use OCP\IConfig;
 
 class UUIDFixUser extends UUIDFix {
-	public function __construct(UserMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
-		$this->mapper = $mapper;
-		$this->proxy = new Group_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config);
-	}
+    public function __construct(UserMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
+        $this->mapper = $mapper;
+        $this->proxy = new Group_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config);
+    }
 }

apps/user_ldap/lib/Migration/UUIDFix.php

Indentation +24 added lines, -24 removed lines

@@ -30,31 +30,31 @@
 use OCA\User_LDAP\User_Proxy;
 
 abstract class UUIDFix extends QueuedJob {
-	/** @var  AbstractMapping */
-	protected $mapper;
+    /** @var  AbstractMapping */
+    protected $mapper;
 
-	/** @var  Proxy */
-	protected $proxy;
+    /** @var  Proxy */
+    protected $proxy;
 
-	public function run($argument) {
-		$isUser = $this->proxy instanceof User_Proxy;
-		foreach($argument['records'] as $record) {
-			$access = $this->proxy->getLDAPAccess($record['name']);
-			$uuid = $access->getUUID($record['dn'], $isUser);
-			if($uuid === false) {
-				// record not found, no prob, continue with the next
-				continue;
-			}
-			if($uuid !== $record['uuid']) {
-				$this->mapper->setUUIDbyDN($uuid, $record['dn']);
-			}
-		}
-	}
+    public function run($argument) {
+        $isUser = $this->proxy instanceof User_Proxy;
+        foreach($argument['records'] as $record) {
+            $access = $this->proxy->getLDAPAccess($record['name']);
+            $uuid = $access->getUUID($record['dn'], $isUser);
+            if($uuid === false) {
+                // record not found, no prob, continue with the next
+                continue;
+            }
+            if($uuid !== $record['uuid']) {
+                $this->mapper->setUUIDbyDN($uuid, $record['dn']);
+            }
+        }
+    }
 
-	/**
-	 * @param Proxy $proxy
-	 */
-	public function overrideProxy(Proxy $proxy) {
-		$this->proxy = $proxy;
-	}
+    /**
+     * @param Proxy $proxy
+     */
+    public function overrideProxy(Proxy $proxy) {
+        $this->proxy = $proxy;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -38,14 +38,14 @@
 
 	public function run($argument) {
 		$isUser = $this->proxy instanceof User_Proxy;
-		foreach($argument['records'] as $record) {
+		foreach ($argument['records'] as $record) {
 			$access = $this->proxy->getLDAPAccess($record['name']);
 			$uuid = $access->getUUID($record['dn'], $isUser);
-			if($uuid === false) {
+			if ($uuid === false) {
 				// record not found, no prob, continue with the next
 				continue;
 			}
-			if($uuid !== $record['uuid']) {
+			if ($uuid !== $record['uuid']) {
 				$this->mapper->setUUIDbyDN($uuid, $record['dn']);
 			}
 		}

apps/user_ldap/lib/Command/CheckUser.php

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
 			$this->isAllowed($input->getOption('force'));
 			$this->confirmUserIsMapped($uid);
 			$exists = $this->backend->userExistsOnLDAP($uid);
-			if($exists === true) {
+			if ($exists === true) {
 				$output->writeln('The user is still available on LDAP.');
 				return;
 			}
@@ -94,9 +94,9 @@ 
 			$this->dui->markUser($uid);
 			$output->writeln('The user does not exists on LDAP anymore.');
 			$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
-				. $uid . '"');
+				. $uid.'"');
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 		}
 	}
 
@@ -121,7 +121,7 @@ 
 	 * @return true
 	 */
 	protected function isAllowed($force) {
-		if($this->helper->haveDisabledConfigurations() && !$force) {
+		if ($this->helper->haveDisabledConfigurations() && !$force) {
 			throw new \Exception('Cannot check user existence, because '
 				. 'disabled LDAP configurations are present.');
 		}

Indentation +96 added lines, -96 removed lines

@@ -36,101 +36,101 @@
 use OCA\User_LDAP\User_Proxy;
 
 class CheckUser extends Command {
-	/** @var \OCA\User_LDAP\User_Proxy */
-	protected $backend;
-
-	/** @var \OCA\User_LDAP\Helper */
-	protected $helper;
-
-	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
-	protected $dui;
-
-	/** @var \OCA\User_LDAP\Mapping\UserMapping */
-	protected $mapping;
-
-	/**
-	 * @param User_Proxy $uBackend
-	 * @param LDAPHelper $helper
-	 * @param DeletedUsersIndex $dui
-	 * @param UserMapping $mapping
-	 */
-	public function __construct(User_Proxy $uBackend, LDAPHelper $helper, DeletedUsersIndex $dui, UserMapping $mapping) {
-		$this->backend = $uBackend;
-		$this->helper = $helper;
-		$this->dui = $dui;
-		$this->mapping = $mapping;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('ldap:check-user')
-			->setDescription('checks whether a user exists on LDAP.')
-			->addArgument(
-					'ocName',
-					InputArgument::REQUIRED,
-					'the user name as used in Nextcloud'
-				     )
-			->addOption(
-					'force',
-					null,
-					InputOption::VALUE_NONE,
-					'ignores disabled LDAP configuration'
-				     )
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		try {
-			$uid = $input->getArgument('ocName');
-			$this->isAllowed($input->getOption('force'));
-			$this->confirmUserIsMapped($uid);
-			$exists = $this->backend->userExistsOnLDAP($uid);
-			if($exists === true) {
-				$output->writeln('The user is still available on LDAP.');
-				return;
-			}
-
-			$this->dui->markUser($uid);
-			$output->writeln('The user does not exists on LDAP anymore.');
-			$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
-				. $uid . '"');
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
-		}
-	}
-
-	/**
-	 * checks whether a user is actually mapped
-	 * @param string $ocName the username as used in Nextcloud
-	 * @throws \Exception
-	 * @return true
-	 */
-	protected function confirmUserIsMapped($ocName) {
-		$dn = $this->mapping->getDNByName($ocName);
-		if ($dn === false) {
-			throw new \Exception('The given user is not a recognized LDAP user.');
-		}
-
-		return true;
-	}
-
-	/**
-	 * checks whether the setup allows reliable checking of LDAP user existence
-	 * @throws \Exception
-	 * @return true
-	 */
-	protected function isAllowed($force) {
-		if($this->helper->haveDisabledConfigurations() && !$force) {
-			throw new \Exception('Cannot check user existence, because '
-				. 'disabled LDAP configurations are present.');
-		}
-
-		// we don't check ldapUserCleanupInterval from config.php because this
-		// action is triggered manually, while the setting only controls the
-		// background job.
-
-		return true;
-	}
+    /** @var \OCA\User_LDAP\User_Proxy */
+    protected $backend;
+
+    /** @var \OCA\User_LDAP\Helper */
+    protected $helper;
+
+    /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+    protected $dui;
+
+    /** @var \OCA\User_LDAP\Mapping\UserMapping */
+    protected $mapping;
+
+    /**
+     * @param User_Proxy $uBackend
+     * @param LDAPHelper $helper
+     * @param DeletedUsersIndex $dui
+     * @param UserMapping $mapping
+     */
+    public function __construct(User_Proxy $uBackend, LDAPHelper $helper, DeletedUsersIndex $dui, UserMapping $mapping) {
+        $this->backend = $uBackend;
+        $this->helper = $helper;
+        $this->dui = $dui;
+        $this->mapping = $mapping;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('ldap:check-user')
+            ->setDescription('checks whether a user exists on LDAP.')
+            ->addArgument(
+                    'ocName',
+                    InputArgument::REQUIRED,
+                    'the user name as used in Nextcloud'
+                        )
+            ->addOption(
+                    'force',
+                    null,
+                    InputOption::VALUE_NONE,
+                    'ignores disabled LDAP configuration'
+                        )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        try {
+            $uid = $input->getArgument('ocName');
+            $this->isAllowed($input->getOption('force'));
+            $this->confirmUserIsMapped($uid);
+            $exists = $this->backend->userExistsOnLDAP($uid);
+            if($exists === true) {
+                $output->writeln('The user is still available on LDAP.');
+                return;
+            }
+
+            $this->dui->markUser($uid);
+            $output->writeln('The user does not exists on LDAP anymore.');
+            $output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
+                . $uid . '"');
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage(). '</error>');
+        }
+    }
+
+    /**
+     * checks whether a user is actually mapped
+     * @param string $ocName the username as used in Nextcloud
+     * @throws \Exception
+     * @return true
+     */
+    protected function confirmUserIsMapped($ocName) {
+        $dn = $this->mapping->getDNByName($ocName);
+        if ($dn === false) {
+            throw new \Exception('The given user is not a recognized LDAP user.');
+        }
+
+        return true;
+    }
+
+    /**
+     * checks whether the setup allows reliable checking of LDAP user existence
+     * @throws \Exception
+     * @return true
+     */
+    protected function isAllowed($force) {
+        if($this->helper->haveDisabledConfigurations() && !$force) {
+            throw new \Exception('Cannot check user existence, because '
+                . 'disabled LDAP configurations are present.');
+        }
+
+        // we don't check ldapUserCleanupInterval from config.php because this
+        // action is triggered manually, while the setting only controls the
+        // background job.
+
+        return true;
+    }
 
 }

apps/user_ldap/lib/Command/Search.php

Spacing +7 added lines, -7 removed lines

@@ -87,16 +87,16 @@ 
 	 * @throws \InvalidArgumentException
 	 */
 	protected function validateOffsetAndLimit($offset, $limit) {
-		if($limit < 0) {
+		if ($limit < 0) {
 			throw new \InvalidArgumentException('limit must be  0 or greater');
 		}
-		if($offset  < 0) {
+		if ($offset < 0) {
 			throw new \InvalidArgumentException('offset must be 0 or greater');
 		}
-		if($limit === 0 && $offset !== 0) {
+		if ($limit === 0 && $offset !== 0) {
 			throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0');
 		}
-		if($offset > 0 && ($offset % $limit !== 0)) {
+		if ($offset > 0 && ($offset % $limit !== 0)) {
 			throw new \InvalidArgumentException('offset must be a multiple of limit');
 		}
 	}
@@ -110,7 +110,7 @@ 
 		$limit = intval($input->getOption('limit'));
 		$this->validateOffsetAndLimit($offset, $limit);
 
-		if($input->getOption('group')) {
+		if ($input->getOption('group')) {
 			$proxy = new Group_Proxy($configPrefixes, $ldapWrapper);
 			$getMethod = 'getGroups';
 			$printID = false;
@@ -121,8 +121,8 @@ 
 		}
 
 		$result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
-		foreach($result as $id => $name) {
-			$line = $name . ($printID ? ' ('.$id.')' : '');
+		foreach ($result as $id => $name) {
+			$line = $name.($printID ? ' ('.$id.')' : '');
 			$output->writeln($line);
 		}
 	}

Indentation +87 added lines, -87 removed lines

@@ -37,98 +37,98 @@
 use OCP\IConfig;
 
 class Search extends Command {
-	/** @var \OCP\IConfig */
-	protected $ocConfig;
+    /** @var \OCP\IConfig */
+    protected $ocConfig;
 
-	/**
-	 * @param \OCP\IConfig $ocConfig
-	 */
-	public function __construct(IConfig $ocConfig) {
-		$this->ocConfig = $ocConfig;
-		parent::__construct();
-	}
+    /**
+     * @param \OCP\IConfig $ocConfig
+     */
+    public function __construct(IConfig $ocConfig) {
+        $this->ocConfig = $ocConfig;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:search')
-			->setDescription('executes a user or group search')
-			->addArgument(
-					'search',
-					InputArgument::REQUIRED,
-					'the search string (can be empty)'
-				     )
-			->addOption(
-					'group',
-					null,
-					InputOption::VALUE_NONE,
-					'searches groups instead of users'
-				     )
-			->addOption(
-					'offset',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'The offset of the result set. Needs to be a multiple of limit. defaults to 0.',
-					0
-				     )
-			->addOption(
-					'limit',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'limit the results. 0 means no limit, defaults to 15',
-					15
-				     )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:search')
+            ->setDescription('executes a user or group search')
+            ->addArgument(
+                    'search',
+                    InputArgument::REQUIRED,
+                    'the search string (can be empty)'
+                        )
+            ->addOption(
+                    'group',
+                    null,
+                    InputOption::VALUE_NONE,
+                    'searches groups instead of users'
+                        )
+            ->addOption(
+                    'offset',
+                    null,
+                    InputOption::VALUE_REQUIRED,
+                    'The offset of the result set. Needs to be a multiple of limit. defaults to 0.',
+                    0
+                        )
+            ->addOption(
+                    'limit',
+                    null,
+                    InputOption::VALUE_REQUIRED,
+                    'limit the results. 0 means no limit, defaults to 15',
+                    15
+                        )
+        ;
+    }
 
-	/**
-	 * Tests whether the offset and limit options are valid
-	 * @param int $offset
-	 * @param int $limit
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateOffsetAndLimit($offset, $limit) {
-		if($limit < 0) {
-			throw new \InvalidArgumentException('limit must be  0 or greater');
-		}
-		if($offset  < 0) {
-			throw new \InvalidArgumentException('offset must be 0 or greater');
-		}
-		if($limit === 0 && $offset !== 0) {
-			throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0');
-		}
-		if($offset > 0 && ($offset % $limit !== 0)) {
-			throw new \InvalidArgumentException('offset must be a multiple of limit');
-		}
-	}
+    /**
+     * Tests whether the offset and limit options are valid
+     * @param int $offset
+     * @param int $limit
+     * @throws \InvalidArgumentException
+     */
+    protected function validateOffsetAndLimit($offset, $limit) {
+        if($limit < 0) {
+            throw new \InvalidArgumentException('limit must be  0 or greater');
+        }
+        if($offset  < 0) {
+            throw new \InvalidArgumentException('offset must be 0 or greater');
+        }
+        if($limit === 0 && $offset !== 0) {
+            throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0');
+        }
+        if($offset > 0 && ($offset % $limit !== 0)) {
+            throw new \InvalidArgumentException('offset must be a multiple of limit');
+        }
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$helper = new Helper($this->ocConfig);
-		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-		$ldapWrapper = new LDAP();
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $helper = new Helper($this->ocConfig);
+        $configPrefixes = $helper->getServerConfigurationPrefixes(true);
+        $ldapWrapper = new LDAP();
 
-		$offset = intval($input->getOption('offset'));
-		$limit = intval($input->getOption('limit'));
-		$this->validateOffsetAndLimit($offset, $limit);
+        $offset = intval($input->getOption('offset'));
+        $limit = intval($input->getOption('limit'));
+        $this->validateOffsetAndLimit($offset, $limit);
 
-		if($input->getOption('group')) {
-			$proxy = new Group_Proxy($configPrefixes, $ldapWrapper);
-			$getMethod = 'getGroups';
-			$printID = false;
-			// convert the limit of groups to null. This will show all the groups available instead of
-			// nothing, and will match the same behaviour the search for users has.
-			if ($limit === 0) {
-				$limit = null;
-			}
-		} else {
-			$proxy = new User_Proxy($configPrefixes, $ldapWrapper, $this->ocConfig);
-			$getMethod = 'getDisplayNames';
-			$printID = true;
-		}
+        if($input->getOption('group')) {
+            $proxy = new Group_Proxy($configPrefixes, $ldapWrapper);
+            $getMethod = 'getGroups';
+            $printID = false;
+            // convert the limit of groups to null. This will show all the groups available instead of
+            // nothing, and will match the same behaviour the search for users has.
+            if ($limit === 0) {
+                $limit = null;
+            }
+        } else {
+            $proxy = new User_Proxy($configPrefixes, $ldapWrapper, $this->ocConfig);
+            $getMethod = 'getDisplayNames';
+            $printID = true;
+        }
 
-		$result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
-		foreach($result as $id => $name) {
-			$line = $name . ($printID ? ' ('.$id.')' : '');
-			$output->writeln($line);
-		}
-	}
+        $result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
+        foreach($result as $id => $name) {
+            $line = $name . ($printID ? ' ('.$id.')' : '');
+            $output->writeln($line);
+        }
+    }
 }