nextcloud / server

lib/private/Encryption/File.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 		// always add owner to the list of users with access to the file
 		$userIds = array($owner);
 
-		if (!$this->util->isFile($owner . '/' . $ownerPath)) {
+		if (!$this->util->isFile($owner.'/'.$ownerPath)) {
 			return array('users' => $userIds, 'public' => false);
 		}
 

lib/private/Encryption/Keys/Storage.php

Spacing +19 added lines, -19 removed lines

@@ -66,8 +66,8 @@ 
 		$this->util = $util;
 
 		$this->encryption_base_dir = '/files_encryption';
-		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
-		$this->backup_base_dir = $this->encryption_base_dir .'/backup';
+		$this->keys_base_dir = $this->encryption_base_dir.'/keys';
+		$this->backup_base_dir = $this->encryption_base_dir.'/backup';
 		$this->root_dir = $this->util->getKeyStorageRoot();
 	}
 
@@ -85,14 +85,14 @@ 
 	public function getFileKey($path, $keyId, $encryptionModuleId) {
 		$realFile = $this->util->stripPartialFileExtension($path);
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
-		$key = $this->getKey($keyDir . $keyId);
+		$key = $this->getKey($keyDir.$keyId);
 
 		if ($key === '' && $realFile !== $path) {
 			// Check if the part file has keys and use them, if no normal keys
 			// exist. This is required to fix copyBetweenStorage() when we
 			// rename a .part file over storage borders.
 			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-			$key = $this->getKey($keyDir . $keyId);
+			$key = $this->getKey($keyDir.$keyId);
 		}
 
 		return $key;
@@ -119,7 +119,7 @@ 
 	 */
 	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return $this->setKey($keyDir . $keyId, $key);
+		return $this->setKey($keyDir.$keyId, $key);
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
+		return !$this->view->file_exists($keyDir.$keyId) || $this->view->unlink($keyDir.$keyId);
 	}
 
 	/**
@@ -173,10 +173,10 @@ 
 	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
 
 		if ($uid === null) {
-			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+			$path = $this->root_dir.'/'.$this->encryption_base_dir.'/'.$encryptionModuleId.'/'.$keyId;
 		} else {
-			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
-				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
+			$path = $this->root_dir.'/'.$uid.$this->encryption_base_dir.'/'
+				. $encryptionModuleId.'/'.$uid.'.'.$keyId;
 		}
 
 		return \OC\Files\Filesystem::normalizePath($path);
@@ -194,7 +194,7 @@ 
 
 		if ($this->view->file_exists($path)) {
 			if (isset($this->keyCache[$path])) {
-				$key =  $this->keyCache[$path];
+				$key = $this->keyCache[$path];
 			} else {
 				$key = $this->view->file_get_contents($path);
 				$this->keyCache[$path] = $key;
@@ -238,12 +238,12 @@ 
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$this->keys_base_dir.$filename.'/';
 		} else {
-			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$filename.'/';
 		}
 
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
+		return Filesystem::normalizePath($keyPath.$encryptionModuleId.'/', false);
 	}
 
 	/**
@@ -300,13 +300,13 @@ 
 	 * @since 12.0.0
 	 */
 	public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
-		$source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
-		$backupDir = $uid . $this->backup_base_dir;
+		$source = $uid.$this->encryption_base_dir.'/'.$encryptionModuleId;
+		$backupDir = $uid.$this->backup_base_dir;
 		if (!$this->view->file_exists($backupDir)) {
 			$this->view->mkdir($backupDir);
 		}
 
-		$backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
+		$backupDir = $backupDir.'/'.$purpose.'.'.$encryptionModuleId.'.'.$this->getTimestamp();
 		$this->view->mkdir($backupDir);
 
 		return $this->view->copy($source, $backupDir);
@@ -332,9 +332,9 @@ 
 		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
 
 		if ($systemWideMountPoint) {
-			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$this->keys_base_dir.$relativePath.'/';
 		} else {
-			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$relativePath.'/';
 		}
 
 		return  Filesystem::normalizePath($systemPath, false);
@@ -351,7 +351,7 @@ 
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if (!$this->view->is_dir($dir)) {
 					$this->view->mkdir($dir);
 				}

lib/private/Encryption/Manager.php

Spacing +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
 		}
 
 		// check if key storage is mounted correctly
-		if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) {
+		if ($this->rootView->file_exists($rootDir.'/'.Storage::KEY_STORAGE_MARKER)) {
 			return true;
 		}
 

lib/private/NaturalSort.php

Spacing +2 added lines, -2 removed lines

@@ -117,8 +117,8 @@
 			if ($aChunk !== $bChunk) {
 				// test first character (character comparison, not number comparison)
 				if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') {
-					$aNum = (int)$aChunk;
-					$bNum = (int)$bChunk;
+					$aNum = (int) $aChunk;
+					$bNum = (int) $bChunk;
 					return $aNum - $bNum;
 				}
 				return self::getCollator()->compare($aChunk, $bChunk);

lib/private/Cache/File.php

Spacing +11 added lines, -11 removed lines

@@ -51,10 +51,10 @@ 
 			$rootView = new View();
 			$user = \OC::$server->getUserSession()->getUser();
 			Filesystem::initMountPoints($user->getUID());
-			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
-				$rootView->mkdir('/' . $user->getUID() . '/cache');
+			if (!$rootView->file_exists('/'.$user->getUID().'/cache')) {
+				$rootView->mkdir('/'.$user->getUID().'/cache');
 			}
-			$this->storage = new View('/' . $user->getUID() . '/cache');
+			$this->storage = new View('/'.$user->getUID().'/cache');
 			return $this->storage;
 		} else {
 			\OCP\Util::writeLog('core', 'Can\'t get cache storage, user not logged in', \OCP\Util::ERROR);
@@ -104,12 +104,12 @@ 
 		// unique id to avoid chunk collision, just in case
 		$uniqueId = \OC::$server->getSecureRandom()->generate(
 			16,
-			ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
+			ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER
 		);
 
 		// use part file to prevent hasKey() to find the key
 		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
+		$keyPart = $key.'.'.$uniqueId.'.part';
 		if ($storage and $storage->file_put_contents($keyPart, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -158,7 +158,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 					if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
-						$storage->unlink('/' . $file);
+						$storage->unlink('/'.$file);
 					}
 				}
 			}
@@ -183,17 +183,17 @@ 
 			while (($file = readdir($dh)) !== false) {
 				if ($file != '.' and $file != '..') {
 					try {
-						$mtime = $storage->filemtime('/' . $file);
+						$mtime = $storage->filemtime('/'.$file);
 						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
+							$storage->unlink('/'.$file);
 						}
 					} catch (\OCP\Lock\LockedException $e) {
 						// ignore locked chunks
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', array('app' => 'core'));
 					} catch (\OCP\Files\ForbiddenException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', array('app' => 'core'));
+						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "'.$file.'"', array('app' => 'core'));
 					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', array('app' => 'core'));
 					}
 				}
 			}

lib/private/SystemTag/SystemTagObjectMapper.php

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
 		$result->closeCursor();
 
 		if ($all) {
-			return ((int)$row[0] === count($objIds));
+			return ((int) $row[0] === count($objIds));
 		} else {
 			return (bool) $row;
 		}

lib/private/SystemTag/SystemTagManager.php

Spacing +15 added lines, -15 removed lines

@@ -136,14 +136,14 @@ 
 			->from(self::TAG_TABLE);
 
 		if (!is_null($visibilityFilter)) {
-			$query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int)$visibilityFilter)));
+			$query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int) $visibilityFilter)));
 		}
 
 		if (!empty($nameSearchPattern)) {
 			$query->andWhere(
 				$query->expr()->like(
 					'name',
-					$query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
+					$query->createNamedParameter('%'.$this->connection->escapeLikeParameter($nameSearchPattern).'%')
 				)
 			);
 		}
@@ -167,8 +167,8 @@ 
 	 * {@inheritdoc}
 	 */
 	public function getTag($tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
+		$userVisible = (int) $userVisible;
+		$userAssignable = (int) $userAssignable;
 
 		$result = $this->selectTagQuery
 			->setParameter('name', $tagName)
@@ -180,7 +180,7 @@ 
 		$result->closeCursor();
 		if (!$row) {
 			throw new TagNotFoundException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
+				'Tag ("'.$tagName.'", '.$userVisible.', '.$userAssignable.') does not exist'
 			);
 		}
 
@@ -191,8 +191,8 @@ 
 	 * {@inheritdoc}
 	 */
 	public function createTag($tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
+		$userVisible = (int) $userVisible;
+		$userAssignable = (int) $userAssignable;
 
 		$query = $this->connection->getQueryBuilder();
 		$query->insert(self::TAG_TABLE)
@@ -206,7 +206,7 @@ 
 			$query->execute();
 		} catch (UniqueConstraintViolationException $e) {
 			throw new TagAlreadyExistsException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+				'Tag ("'.$tagName.'", '.$userVisible.', '.$userAssignable.') already exists',
 				0,
 				$e
 			);
@@ -215,10 +215,10 @@ 
 		$tagId = $query->getLastInsertId();
 
 		$tag = new SystemTag(
-			(int)$tagId,
+			(int) $tagId,
 			$tagName,
-			(bool)$userVisible,
-			(bool)$userAssignable
+			(bool) $userVisible,
+			(bool) $userAssignable
 		);
 
 		$this->dispatcher->dispatch(ManagerEvent::EVENT_CREATE, new ManagerEvent(
@@ -232,8 +232,8 @@ 
 	 * {@inheritdoc}
 	 */
 	public function updateTag($tagId, $tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
+		$userVisible = (int) $userVisible;
+		$userAssignable = (int) $userAssignable;
 
 		try {
 			$tags = $this->getTagsByIds($tagId);
@@ -270,7 +270,7 @@ 
 			}
 		} catch (UniqueConstraintViolationException $e) {
 			throw new TagAlreadyExistsException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+				'Tag ("'.$tagName.'", '.$userVisible.', '.$userAssignable.') already exists',
 				0,
 				$e
 			);
@@ -377,7 +377,7 @@ 
 	}
 
 	private function createSystemTagFromRow($row) {
-		return new SystemTag((int)$row['id'], $row['name'], (bool)$row['visibility'], (bool)$row['editable']);
+		return new SystemTag((int) $row['id'], $row['name'], (bool) $row['visibility'], (bool) $row['editable']);
 	}
 
 	/**

lib/private/Group/Group.php

Spacing +2 added lines, -2 removed lines

@@ -222,8 +222,8 @@
 	public function count($search = '') {
 		$users = false;
 		foreach ($this->backends as $backend) {
-			if($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
-				if($users === false) {
+			if ($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
+				if ($users === false) {
 					//we could directly add to a bool variable, but this would
 					//be ugly
 					$users = 0;

lib/private/Group/Database.php

Spacing +16 added lines, -16 removed lines

@@ -76,7 +76,7 @@ 
 	 * Tries to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
-	public function createGroup( $gid ) {
+	public function createGroup($gid) {
 		$this->fixDI();
 
 		// Add group
@@ -97,7 +97,7 @@ 
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public function deleteGroup( $gid ) {
+	public function deleteGroup($gid) {
 		$this->fixDI();
 
 		// Delete the group
@@ -132,7 +132,7 @@ 
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public function inGroup( $uid, $gid ) {
+	public function inGroup($uid, $gid) {
 		$this->fixDI();
 
 		// check
@@ -157,18 +157,18 @@ 
 	 *
 	 * Adds a user to a group.
 	 */
-	public function addToGroup( $uid, $gid ) {
+	public function addToGroup($uid, $gid) {
 		$this->fixDI();
 
 		// No duplicate entries!
-		if( !$this->inGroup( $uid, $gid )) {
+		if (!$this->inGroup($uid, $gid)) {
 			$qb = $this->dbConn->getQueryBuilder();
 			$qb->insert('group_user')
 				->setValue('uid', $qb->createNamedParameter($uid))
 				->setValue('gid', $qb->createNamedParameter($gid))
 				->execute();
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -181,7 +181,7 @@ 
 	 *
 	 * removes the user from a group.
 	 */
-	public function removeFromGroup( $uid, $gid ) {
+	public function removeFromGroup($uid, $gid) {
 		$this->fixDI();
 
 		$qb = $this->dbConn->getQueryBuilder();
@@ -201,7 +201,7 @@ 
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public function getUserGroups( $uid ) {
+	public function getUserGroups($uid) {
 		//guests has empty or null $uid
 		if ($uid === null || $uid === '') {
 			return [];
@@ -217,7 +217,7 @@ 
 			->execute();
 
 		$groups = [];
-		while( $row = $cursor->fetch()) {
+		while ($row = $cursor->fetch()) {
 			$groups[] = $row["gid"];
 			$this->groupCache[$row['gid']] = $row['gid'];
 		}
@@ -239,11 +239,11 @@ 
 		$parameters = [];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $search . '%';
+			$parameters[] = '%'.$search.'%';
 			$searchLike = ' WHERE LOWER(`gid`) LIKE LOWER(?)';
 		}
 
-		$stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`' . $searchLike . ' ORDER BY `gid` ASC', $limit, $offset);
+		$stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`'.$searchLike.' ORDER BY `gid` ASC', $limit, $offset);
 		$result = $stmt->execute($parameters);
 		$groups = array();
 		while ($row = $result->fetchRow()) {
@@ -292,11 +292,11 @@ 
 		$parameters = [$gid];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
+			$parameters[] = '%'.$this->dbConn->escapeLikeParameter($search).'%';
 			$searchLike = ' AND `uid` LIKE ?';
 		}
 
-		$stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike . ' ORDER BY `uid` ASC',
+		$stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?'.$searchLike.' ORDER BY `uid` ASC',
 			$limit,
 			$offset);
 		$result = $stmt->execute($parameters);
@@ -318,14 +318,14 @@ 
 		$parameters = [$gid];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
+			$parameters[] = '%'.$this->dbConn->escapeLikeParameter($search).'%';
 			$searchLike = ' AND `uid` LIKE ?';
 		}
 
-		$stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike);
+		$stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?'.$searchLike);
 		$result = $stmt->execute($parameters);
 		$count = $result->fetchOne();
-		if($count !== false) {
+		if ($count !== false) {
 			$count = intval($count);
 		}
 		return $count;