nextcloud / server

apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php

Spacing +8 added lines, -8 removed lines

@@ -104,7 +104,7 @@ 
 	 * @return boolean
 	 */
 	public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
-		if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
+		if ($request->getPath() !== 'provisioning/'.AppleProvisioningNode::FILENAME) {
 			return true;
 		}
 
@@ -142,16 +142,16 @@ 
 		$carddavUUID = call_user_func($this->uuidClosure);
 		$profileUUID = call_user_func($this->uuidClosure);
 
-		$caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
-		$carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
-		$profileIdentifier = $reverseDomain . '.' . $profileUUID;
+		$caldavIdentifier = $reverseDomain.'.'.$caldavUUID;
+		$carddavIdentifier = $reverseDomain.'.'.$carddavUUID;
+		$profileIdentifier = $reverseDomain.'.'.$profileUUID;
 
 		$caldavDescription = $this->l10n->t('Configures a CalDAV account');
-		$caldavDisplayname = $description . ' CalDAV';
+		$caldavDisplayname = $description.' CalDAV';
 		$carddavDescription = $this->l10n->t('Configures a CardDAV account');
-		$carddavDisplayname = $description . ' CardDAV';
+		$carddavDisplayname = $description.' CardDAV';
 
-		$filename = $userId . '-' . AppleProvisioningNode::FILENAME;
+		$filename = $userId.'-'.AppleProvisioningNode::FILENAME;
 
 		$xmlSkeleton = $this->getTemplate();
 		$body = vsprintf($xmlSkeleton, array_map(function($v) {
@@ -180,7 +180,7 @@ 
 		));
 
 		$response->setStatus(200);
-		$response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
 		$response->setBody($body);
 

lib/private/AppFramework/Http/Request.php

Spacing +39 added lines, -39 removed lines

@@ -132,7 +132,7 @@ 
 	 * @param string $stream
 	 * @see http://www.php.net/manual/en/reserved.variables.php
 	 */
-	public function __construct(array $vars= [],
+	public function __construct(array $vars = [],
 								ISecureRandom $secureRandom = null,
 								IConfig $config,
 								CsrfTokenManager $csrfTokenManager = null,
@@ -143,11 +143,11 @@ 
 		$this->config = $config;
 		$this->csrfTokenManager = $csrfTokenManager;
 
-		if(!array_key_exists('method', $vars)) {
+		if (!array_key_exists('method', $vars)) {
 			$vars['method'] = 'GET';
 		}
 
-		foreach($this->allowedKeys as $name) {
+		foreach ($this->allowedKeys as $name) {
 			$this->items[$name] = isset($vars[$name])
 				? $vars[$name]
 				: [];
@@ -257,12 +257,12 @@ 
 	* @return mixed|null
 	*/
 	public function __get($name) {
-		switch($name) {
+		switch ($name) {
 			case 'put':
 			case 'patch':
 			case 'get':
 			case 'post':
-				if($this->method !== strtoupper($name)) {
+				if ($this->method !== strtoupper($name)) {
 					throw new \LogicException(sprintf('%s cannot be accessed in a %s request.', $name, $this->method));
 				}
 				return $this->getContent();
@@ -313,9 +313,9 @@ 
 	 */
 	public function getHeader(string $name): string {
 
-		$name = strtoupper(str_replace('-', '_',$name));
-		if (isset($this->server['HTTP_' . $name])) {
-			return $this->server['HTTP_' . $name];
+		$name = strtoupper(str_replace('-', '_', $name));
+		if (isset($this->server['HTTP_'.$name])) {
+			return $this->server['HTTP_'.$name];
 		}
 
 		// There's a few headers that seem to end up in the top-level
@@ -445,21 +445,21 @@ 
 		// 'application/json' must be decoded manually.
 		if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) {
 			$params = json_decode(file_get_contents($this->inputStream), true);
-			if($params !== null && \count($params) > 0) {
+			if ($params !== null && \count($params) > 0) {
 				$this->items['params'] = $params;
-				if($this->method === 'POST') {
+				if ($this->method === 'POST') {
 					$this->items['post'] = $params;
 				}
 			}
 
 		// Handle application/x-www-form-urlencoded for methods other than GET
 		// or post correctly
-		} elseif($this->method !== 'GET'
+		} elseif ($this->method !== 'GET'
 				&& $this->method !== 'POST'
 				&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) {
 
 			parse_str(file_get_contents($this->inputStream), $params);
-			if(\is_array($params)) {
+			if (\is_array($params)) {
 				$this->items['params'] = $params;
 			}
 		}
@@ -476,11 +476,11 @@ 
 	 * @return bool true if CSRF check passed
 	 */
 	public function passesCSRFCheck(): bool {
-		if($this->csrfTokenManager === null) {
+		if ($this->csrfTokenManager === null) {
 			return false;
 		}
 
-		if(!$this->passesStrictCookieCheck()) {
+		if (!$this->passesStrictCookieCheck()) {
 			return false;
 		}
 
@@ -508,7 +508,7 @@ 
 		if ($this->getHeader('OCS-APIREQUEST')) {
 			return false;
 		}
-		if($this->getCookie(session_name()) === null && $this->getCookie('nc_token') === null) {
+		if ($this->getCookie(session_name()) === null && $this->getCookie('nc_token') === null) {
 			return false;
 		}
 
@@ -533,7 +533,7 @@ 
 	protected function getProtectedCookieName(string $name): string {
 		$cookieParams = $this->getCookieParams();
 		$prefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
 			$prefix = '__Host-';
 		}
 
@@ -548,12 +548,12 @@ 
 	 * @since 9.1.0
 	 */
 	public function passesStrictCookieCheck(): bool {
-		if(!$this->cookieCheckRequired()) {
+		if (!$this->cookieCheckRequired()) {
 			return true;
 		}
 
 		$cookieName = $this->getProtectedCookieName('nc_sameSiteCookiestrict');
-		if($this->getCookie($cookieName) === 'true'
+		if ($this->getCookie($cookieName) === 'true'
 			&& $this->passesLaxCookieCheck()) {
 			return true;
 		}
@@ -568,12 +568,12 @@ 
 	 * @since 9.1.0
 	 */
 	public function passesLaxCookieCheck(): bool {
-		if(!$this->cookieCheckRequired()) {
+		if (!$this->cookieCheckRequired()) {
 			return true;
 		}
 
 		$cookieName = $this->getProtectedCookieName('nc_sameSiteCookielax');
-		if($this->getCookie($cookieName) === 'true') {
+		if ($this->getCookie($cookieName) === 'true') {
 			return true;
 		}
 		return false;
@@ -586,12 +586,12 @@ 
 	 * @return string
 	 */
 	public function getId(): string {
-		if(isset($this->server['UNIQUE_ID'])) {
+		if (isset($this->server['UNIQUE_ID'])) {
 			return $this->server['UNIQUE_ID'];
 		}
 
-		if(empty($this->requestId)) {
-			$validChars = ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS;
+		if (empty($this->requestId)) {
+			$validChars = ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS;
 			$this->requestId = $this->secureRandom->generate(20, $validChars);
 		}
 
@@ -647,15 +647,15 @@ 
 		$remoteAddress = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
 		$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
 
-		if(\is_array($trustedProxies) && $this->isTrustedProxy($trustedProxies, $remoteAddress)) {
+		if (\is_array($trustedProxies) && $this->isTrustedProxy($trustedProxies, $remoteAddress)) {
 			$forwardedForHeaders = $this->config->getSystemValue('forwarded_for_headers', [
 				'HTTP_X_FORWARDED_FOR'
 				// only have one default, so we cannot ship an insecure product out of the box
 			]);
 
-			foreach($forwardedForHeaders as $header) {
-				if(isset($this->server[$header])) {
-					foreach(explode(',', $this->server[$header]) as $IP) {
+			foreach ($forwardedForHeaders as $header) {
+				if (isset($this->server[$header])) {
+					foreach (explode(',', $this->server[$header]) as $IP) {
 						$IP = trim($IP);
 						if (filter_var($IP, FILTER_VALIDATE_IP) !== false) {
 							return $IP;
@@ -674,7 +674,7 @@ 
 	 * @return bool
 	 */
 	private function isOverwriteCondition(string $type = ''): bool {
-		$regex = '/' . $this->config->getSystemValue('overwritecondaddr', '')  . '/';
+		$regex = '/'.$this->config->getSystemValue('overwritecondaddr', '').'/';
 		$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
 		return $regex === '//' || preg_match($regex, $remoteAddr) === 1
 		|| $type !== 'protocol';
@@ -686,7 +686,7 @@ 
 	 * @return string Server protocol (http or https)
 	 */
 	public function getServerProtocol(): string {
-		if($this->config->getSystemValue('overwriteprotocol') !== ''
+		if ($this->config->getSystemValue('overwriteprotocol') !== ''
 			&& $this->isOverwriteCondition('protocol')) {
 			return $this->config->getSystemValue('overwriteprotocol');
 		}
@@ -732,7 +732,7 @@ 
 			'HTTP/2',
 		];
 
-		if(\in_array($claimedProtocol, $validProtocols, true)) {
+		if (\in_array($claimedProtocol, $validProtocols, true)) {
 			return $claimedProtocol;
 		}
 
@@ -746,8 +746,8 @@ 
 	 */
 	public function getRequestUri(): string {
 		$uri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : '';
-		if($this->config->getSystemValue('overwritewebroot') !== '' && $this->isOverwriteCondition()) {
-			$uri = $this->getScriptName() . substr($uri, \strlen($this->server['SCRIPT_NAME']));
+		if ($this->config->getSystemValue('overwritewebroot') !== '' && $this->isOverwriteCondition()) {
+			$uri = $this->getScriptName().substr($uri, \strlen($this->server['SCRIPT_NAME']));
 		}
 		return $uri;
 	}
@@ -774,7 +774,7 @@ 
 		// FIXME: Sabre does not really belong here
 		list($path, $name) = \Sabre\Uri\split($scriptName);
 		if (!empty($path)) {
-			if($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) {
+			if ($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) {
 				$pathInfo = substr($pathInfo, \strlen($path));
 			} else {
 				throw new \Exception("The requested uri($requestUri) cannot be processed by the script '$scriptName')");
@@ -790,7 +790,7 @@ 
 		if ($name !== '' && strpos($pathInfo, $name) === 0) {
 			$pathInfo = substr($pathInfo, \strlen($name));
 		}
-		if($pathInfo === false || $pathInfo === '/'){
+		if ($pathInfo === false || $pathInfo === '/') {
 			return '';
 		} else {
 			return $pathInfo;
@@ -808,7 +808,7 @@ 
 		$pathInfo = rawurldecode($pathInfo);
 		$encoding = mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']);
 
-		switch($encoding) {
+		switch ($encoding) {
 			case 'ISO-8859-1' :
 				$pathInfo = utf8_encode($pathInfo);
 		}
@@ -824,12 +824,12 @@ 
 	 */
 	public function getScriptName(): string {
 		$name = $this->server['SCRIPT_NAME'];
-		$overwriteWebRoot =  $this->config->getSystemValue('overwritewebroot');
+		$overwriteWebRoot = $this->config->getSystemValue('overwritewebroot');
 		if ($overwriteWebRoot !== '' && $this->isOverwriteCondition()) {
 			// FIXME: This code is untestable due to __DIR__, also that hardcoded path is really dangerous
 			$serverRoot = str_replace('\\', '/', substr(__DIR__, 0, -\strlen('lib/private/appframework/http/')));
 			$suburi = str_replace('\\', '/', substr(realpath($this->server['SCRIPT_FILENAME']), \strlen($serverRoot)));
-			$name = '/' . ltrim($overwriteWebRoot . $suburi, '/');
+			$name = '/'.ltrim($overwriteWebRoot.$suburi, '/');
 		}
 		return $name;
 	}
@@ -899,7 +899,7 @@ 
 			return $host;
 		} else {
 			$trustedList = $this->config->getSystemValue('trusted_domains', []);
-			if(!empty($trustedList)) {
+			if (!empty($trustedList)) {
 				return $trustedList[0];
 			} else {
 				return '';
@@ -914,7 +914,7 @@ 
 	 * isn't met
 	 */
 	private function getOverwriteHost() {
-		if($this->config->getSystemValue('overwritehost') !== '' && $this->isOverwriteCondition()) {
+		if ($this->config->getSystemValue('overwritehost') !== '' && $this->isOverwriteCondition()) {
 			return $this->config->getSystemValue('overwritehost');
 		}
 		return null;

apps/dav/templates/settings-admin-caldav.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 			],
 			[
 				'<a target="_blank" href="../apps/office/calendar">',
-				'<a target="_blank" href="' . link_to_docs('user-sync-calendars') . '" rel="noreferrer noopener">',
+				'<a target="_blank" href="'.link_to_docs('user-sync-calendars').'" rel="noreferrer noopener">',
 				'</a>',
 			],
 			$l->t('Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}.')

themes/example/defaults.php

Spacing +5 added lines, -5 removed lines

@@ -90,8 +90,8 @@ 
 	 * @return string short footer
 	 */
 	public function getShortFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -101,8 +101,8 @@ 
 	 * @return string long footer
 	 */
 	public function getLongFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -112,7 +112,7 @@ 
 	 * @return string documentation link
 	 */
 	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/15/go.php?to='.$key;
 	}
 
 

lib/private/Avatar/AvatarManager.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 */
 	public function clearCachedAvatars() {
 		$users = $this->config->getUsersForUserValue('avatar', 'generated', 'true');
-		foreach($users as $userId) {
+		foreach ($users as $userId) {
 			try {
 				$folder = $this->appData->getFolder($userId);
 				$folder->delete();

lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 			return;
 		}
 
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
+		$folders = array_filter($folders, function(ISimpleFolder $folder) {
 			return $folder->fileExists('photo.');
 		});
 
@@ -75,7 +75,7 @@ 
 			return;
 		}
 
-		$output->info('Delete ' . count($folders) . ' "photo." files');
+		$output->info('Delete '.count($folders).' "photo." files');
 
 		foreach ($folders as $folder) {
 			try {
@@ -83,7 +83,7 @@ 
 				$folder->getFile('photo.')->delete();
 			} catch (\Exception $e) {
 				$this->logger->logException($e);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+				$output->warning('Could not delete file "dav-photocache/'.$folder->getName().'/photo."');
 			}
 		}
 	}

lib/private/Security/Bruteforce/Throttler.php

Spacing +12 added lines, -12 removed lines

@@ -82,7 +82,7 @@ 
 	private function getCutoff($expire) {
 		$d1 = new \DateTime();
 		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
+		$d2->sub(new \DateInterval('PT'.$expire.'S'));
 		return $d2->diff($d1);
 	}
 
@@ -98,7 +98,7 @@ 
 									$ip,
 									array $metadata = []) {
 		// No need to log if the bruteforce protection is disabled
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
+		if ($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
 			return;
 		}
 
@@ -106,7 +106,7 @@ 
 		$values = [
 			'action' => $action,
 			'occurred' => $this->timeFactory->getTime(),
-			'ip' => (string)$ipAddress,
+			'ip' => (string) $ipAddress,
 			'subnet' => $ipAddress->getSubnet(),
 			'metadata' => json_encode($metadata),
 		];
@@ -124,7 +124,7 @@ 
 
 		$qb = $this->db->getQueryBuilder();
 		$qb->insert('bruteforce_attempts');
-		foreach($values as $column => $value) {
+		foreach ($values as $column => $value) {
 			$qb->setValue($column, $qb->createNamedParameter($value));
 		}
 		$qb->execute();
@@ -137,7 +137,7 @@ 
 	 * @return bool
 	 */
 	private function isIPWhitelisted($ip) {
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
+		if ($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
 			return true;
 		}
 
@@ -162,7 +162,7 @@ 
 
 			$cx = explode('/', $cidr);
 			$addr = $cx[0];
-			$mask = (int)$cx[1];
+			$mask = (int) $cx[1];
 
 			// Do not compare ipv4 to ipv6
 			if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
@@ -173,9 +173,9 @@ 
 			$addr = inet_pton($addr);
 
 			$valid = true;
-			for($i = 0; $i < $mask; $i++) {
-				$part = ord($addr[(int)($i/8)]);
-				$orig = ord($ip[(int)($i/8)]);
+			for ($i = 0; $i < $mask; $i++) {
+				$part = ord($addr[(int) ($i / 8)]);
+				$orig = ord($ip[(int) ($i / 8)]);
 
 				$bitmask = 1 << (7 - ($i % 8));
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function getDelay($ip, $action = '') {
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return 0;
 		}
 
@@ -232,7 +232,7 @@ 
 
 		$maxDelay = 25;
 		$firstDelay = 0.1;
-		if ($attempts > (8 * PHP_INT_SIZE - 1))  {
+		if ($attempts > (8 * PHP_INT_SIZE - 1)) {
 			// Don't ever overflow. Just assume the maxDelay time:s
 			$firstDelay = $maxDelay;
 		} else {
@@ -253,7 +253,7 @@ 
 	 */
 	public function resetDelay($ip, $action, $metadata) {
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return;
 		}
 

apps/files/templates/list.php

Spacing +5 added lines, -5 removed lines

@@ -12,10 +12,10 @@ 
 	*/ ?>
 	<input type="hidden" name="permissions" value="" id="permissions">
 	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
-	<?php if(isset($_['dirToken'])):?>
+	<?php if (isset($_['dirToken'])):?>
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
-	<?php endif;?>
+	<?php endif; ?>
 	<input type="hidden" class="max_human_file_size"
 		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
 </div>
@@ -43,7 +43,7 @@ 
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
 					<a class="name sort columntitle" data-sort="name">
-                        <span><?php p($l->t( 'Name' )); ?></span>
+                        <span><?php p($l->t('Name')); ?></span>
                         <span class="sort-indicator"></span>
 
                     </a>
@@ -59,7 +59,7 @@ 
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>
@@ -75,6 +75,6 @@ 
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
 	<p>
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.')); ?>
 	</p>
 </div>

apps/user_ldap/lib/User/Manager.php

Spacing +13 added lines, -13 removed lines

@@ -141,7 +141,7 @@ 
 	 * @param $uid
 	 */
 	public function invalidate($uid) {
-		if(!isset($this->usersByUid[$uid])) {
+		if (!isset($this->usersByUid[$uid])) {
 			return;
 		}
 		$dn = $this->usersByUid[$uid]->getDN();
@@ -155,7 +155,7 @@ 
 	 * @return null
 	 */
 	private function checkAccess() {
-		if(is_null($this->access)) {
+		if (is_null($this->access)) {
 			throw new \Exception('LDAP Access instance must be set first');
 		}
 	}
@@ -179,11 +179,11 @@ 
 		];
 
 		$homeRule = $this->access->getConnection()->homeFolderNamingRule;
-		if(strpos($homeRule, 'attr:') === 0) {
+		if (strpos($homeRule, 'attr:') === 0) {
 			$attributes[] = substr($homeRule, strlen('attr:'));
 		}
 
-		if(!$minimal) {
+		if (!$minimal) {
 			// attributes that are not really important but may come with big
 			// payload.
 			$attributes = array_merge(
@@ -194,8 +194,8 @@ 
 
 		$attributes = array_reduce($attributes,
 			function($list, $attribute) {
-				$attribute = strtolower(trim((string)$attribute));
-				if(!empty($attribute) && !in_array($attribute, $list)) {
+				$attribute = strtolower(trim((string) $attribute));
+				if (!empty($attribute) && !in_array($attribute, $list)) {
 					$list[] = $attribute;
 				}
 
@@ -215,7 +215,7 @@ 
 	public function isDeletedUser($id) {
 		$isDeleted = $this->ocConfig->getUserValue(
 			$id, 'user_ldap', 'isDeleted', 0);
-		return (int)$isDeleted === 1;
+		return (int) $isDeleted === 1;
 	}
 
 	/**
@@ -238,11 +238,11 @@ 
 	 */
 	protected function createInstancyByUserName($id) {
 		//most likely a uid. Check whether it is a deleted user
-		if($this->isDeletedUser($id)) {
+		if ($this->isDeletedUser($id)) {
 			return $this->getDeletedUser($id);
 		}
 		$dn = $this->access->username2dn($id);
-		if($dn !== false) {
+		if ($dn !== false) {
 			return $this->createAndCache($dn, $id);
 		}
 		return null;
@@ -256,15 +256,15 @@ 
 	 */
 	public function get($id) {
 		$this->checkAccess();
-		if(isset($this->usersByDN[$id])) {
+		if (isset($this->usersByDN[$id])) {
 			return $this->usersByDN[$id];
-		} else if(isset($this->usersByUid[$id])) {
+		} else if (isset($this->usersByUid[$id])) {
 			return $this->usersByUid[$id];
 		}
 
-		if($this->access->stringResemblesDN($id) ) {
+		if ($this->access->stringResemblesDN($id)) {
 			$uid = $this->access->dn2username($id);
-			if($uid !== false) {
+			if ($uid !== false) {
 				return $this->createAndCache($id, $uid);
 			}
 		}