nextcloud / server

lib/private/Share/Share.php

Spacing +33 added lines, -33 removed lines

@@ -149,7 +149,7 @@ 
 
 		$select = self::createSelectStatement(self::FORMAT_NONE, $fileDependent);
 
-		$where .= ' `' . $column . '` = ? AND `item_type` = ? ';
+		$where .= ' `'.$column.'` = ? AND `item_type` = ? ';
 		$arguments = [$itemSource, $itemType];
 		// for link shares $user === null
 		if ($user !== null) {
@@ -167,7 +167,7 @@ 
 			$arguments[] = $owner;
 		}
 
-		$query = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` '. $fileDependentWhere . $where);
+		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$fileDependentWhere.$where);
 
 		$result = \OC_DB::executeAudited($query, $arguments);
 
@@ -175,7 +175,7 @@ 
 			if ($fileDependent && !self::isFileReachable($row['path'], $row['storage_id'])) {
 				continue;
 			}
-			if ($fileDependent && (int)$row['file_parent'] === -1) {
+			if ($fileDependent && (int) $row['file_parent'] === -1) {
 				// if it is a mount point we need to get the path from the mount manager
 				$mountManager = \OC\Files\Filesystem::getMountManager();
 				$mountPoint = $mountManager->findByStorageId($row['storage_id']);
@@ -186,7 +186,7 @@ 
 					$row['path'] = $path;
 				} else {
 					\OC::$server->getLogger()->warning(
-						'Could not resolve mount point for ' . $row['storage_id'],
+						'Could not resolve mount point for '.$row['storage_id'],
 						['app' => 'OCP\Share']
 					);
 				}
@@ -195,7 +195,7 @@ 
 		}
 
 		//if didn't found a result than let's look for a group share.
-		if(empty($shares) && $user !== null) {
+		if (empty($shares) && $user !== null) {
 			$userObject = \OC::$server->getUserManager()->get($user);
 			$groups = [];
 			if ($userObject) {
@@ -203,7 +203,7 @@ 
 			}
 
 			if (!empty($groups)) {
-				$where = $fileDependentWhere . ' WHERE `' . $column . '` = ? AND `item_type` = ? AND `share_with` in (?)';
+				$where = $fileDependentWhere.' WHERE `'.$column.'` = ? AND `item_type` = ? AND `share_with` in (?)';
 				$arguments = [$itemSource, $itemType, $groups];
 				$types = [null, null, IQueryBuilder::PARAM_STR_ARRAY];
 
@@ -217,7 +217,7 @@ 
 				// class isn't static anymore...
 				$conn = \OC::$server->getDatabaseConnection();
 				$result = $conn->executeQuery(
-					'SELECT ' . $select . ' FROM `*PREFIX*share` ' . $where,
+					'SELECT '.$select.' FROM `*PREFIX*share` '.$where,
 					$arguments,
 					$types
 				);
@@ -351,12 +351,12 @@ 
 		$currentUser = $owner ? $owner : \OC_User::getUser();
 		foreach ($items as $item) {
 			// delete the item with the expected share_type and owner
-			if ((int)$item['share_type'] === (int)$shareType && $item['uid_owner'] === $currentUser) {
+			if ((int) $item['share_type'] === (int) $shareType && $item['uid_owner'] === $currentUser) {
 				$toDelete = $item;
 				// if there is more then one result we don't have to delete the children
 				// but update their parent. For group shares the new parent should always be
 				// the original group share and not the db entry with the unique name
-			} else if ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) {
+			} else if ((int) $item['share_type'] === self::$shareTypeGroupUserUnique) {
 				$newParent = $item['parent'];
 			} else {
 				$newParent = $item['id'];
@@ -415,7 +415,7 @@ 
 	 */
 	protected static function unshareItem(array $item, $newParent = null) {
 
-		$shareType = (int)$item['share_type'];
+		$shareType = (int) $item['share_type'];
 		$shareWith = null;
 		if ($shareType !== \OCP\Share::SHARE_TYPE_LINK) {
 			$shareWith = $item['share_with'];
@@ -431,7 +431,7 @@ 
 			'itemParent'    => $item['parent'],
 			'uidOwner'      => $item['uid_owner'],
 		];
-		if($item['item_type'] === 'file' || $item['item_type'] === 'folder') {
+		if ($item['item_type'] === 'file' || $item['item_type'] === 'folder') {
 			$hookParams['fileSource'] = $item['file_source'];
 			$hookParams['fileTarget'] = $item['file_target'];
 		}
@@ -441,7 +441,7 @@ 
 		$deletedShares[] = $hookParams;
 		$hookParams['deletedShares'] = $deletedShares;
 		\OC_Hook::emit(\OCP\Share::class, 'post_unshare', $hookParams);
-		if ((int)$item['share_type'] === \OCP\Share::SHARE_TYPE_REMOTE && \OC::$server->getUserSession()->getUser()) {
+		if ((int) $item['share_type'] === \OCP\Share::SHARE_TYPE_REMOTE && \OC::$server->getUserSession()->getUser()) {
 			list(, $remote) = Helper::splitUserRemote($item['share_with']);
 			self::sendRemoteUnshare($remote, $item['id'], $item['token']);
 		}
@@ -605,7 +605,7 @@ 
 		// Get filesystem root to add it to the file target and remove from the
 		// file source, match file_source with the file cache
 		if ($itemType == 'file' || $itemType == 'folder') {
-			if(!is_null($uidOwner)) {
+			if (!is_null($uidOwner)) {
 				$root = \OC\Files\Filesystem::getRoot();
 			} else {
 				$root = '';
@@ -750,7 +750,7 @@ 
 		$result = $query->execute($queryArgs);
 		if ($result === false) {
 			\OCP\Util::writeLog('OCP\Share',
-				\OC_DB::getErrorMessage() . ', select=' . $select . ' where=',
+				\OC_DB::getErrorMessage().', select='.$select.' where=',
 				ILogger::ERROR);
 		}
 		$items = [];
@@ -792,14 +792,14 @@ 
 						}
 						// Switch ids if sharing permission is granted on only
 						// one share to ensure correct parent is used if resharing
-						if (~(int)$items[$id]['permissions'] & \OCP\Constants::PERMISSION_SHARE
-							&& (int)$row['permissions'] & \OCP\Constants::PERMISSION_SHARE) {
+						if (~(int) $items[$id]['permissions'] & \OCP\Constants::PERMISSION_SHARE
+							&& (int) $row['permissions'] & \OCP\Constants::PERMISSION_SHARE) {
 							$items[$row['id']] = $items[$id];
 							$switchedItems[$id] = $row['id'];
 							unset($items[$id]);
 							$id = $row['id'];
 						}
-						$items[$id]['permissions'] |= (int)$row['permissions'];
+						$items[$id]['permissions'] |= (int) $row['permissions'];
 
 					}
 					continue;
@@ -813,8 +813,8 @@ 
 					$query = \OC_DB::prepare('SELECT `file_target` FROM `*PREFIX*share` WHERE `id` = ?');
 					$parentResult = $query->execute([$row['parent']]);
 					if ($result === false) {
-						\OCP\Util::writeLog('OCP\Share', 'Can\'t select parent: ' .
-							\OC_DB::getErrorMessage() . ', select=' . $select . ' where=' . $where,
+						\OCP\Util::writeLog('OCP\Share', 'Can\'t select parent: '.
+							\OC_DB::getErrorMessage().', select='.$select.' where='.$where,
 							ILogger::ERROR);
 					} else {
 						$parentRow = $parentResult->fetchRow();
@@ -824,7 +824,7 @@ 
 						$subPath = substr($row['path'], $pos);
 						$splitPath = explode('/', $subPath);
 						foreach (array_slice($splitPath, 2) as $pathPart) {
-							$tmpPath = $tmpPath . '/' . $pathPart;
+							$tmpPath = $tmpPath.'/'.$pathPart;
 						}
 						$row['path'] = $tmpPath;
 					}
@@ -843,7 +843,7 @@ 
 				}
 			}
 
-			if($checkExpireDate) {
+			if ($checkExpireDate) {
 				if (self::expireItem($row)) {
 					continue;
 				}
@@ -858,7 +858,7 @@ 
 				$row['share_type'] === self::SHARE_TYPE_USER) {
 				$shareWithUser = \OC::$server->getUserManager()->get($row['share_with']);
 				$row['share_with_displayname'] = $shareWithUser === null ? $row['share_with'] : $shareWithUser->getDisplayName();
-			} else if(isset($row['share_with']) && $row['share_with'] != '' &&
+			} else if (isset($row['share_with']) && $row['share_with'] != '' &&
 				$row['share_type'] === self::SHARE_TYPE_REMOTE) {
 				$addressBookEntries = \OC::$server->getContactsManager()->search($row['share_with'], ['CLOUD']);
 				foreach ($addressBookEntries as $entry) {
@@ -975,7 +975,7 @@ 
 
 			// filter out invalid items, these can appear when subshare entries exist
 			// for a group in which the requested user isn't a member any more
-			$items = array_filter($items, function ($item) {
+			$items = array_filter($items, function($item) {
 				return $item['share_type'] !== self::$shareTypeGroupUserUnique;
 			});
 
@@ -1063,7 +1063,7 @@ 
 		$groupItemTarget = $itemTarget = $fileSource = $parent = 0;
 
 		$result = self::checkReshare('test', $itemSource, self::SHARE_TYPE_USER, $shareWith, $uidOwner, $permissions, null, null);
-		if(!empty($result)) {
+		if (!empty($result)) {
 			$parent = $result['parent'];
 			$itemSource = $result['itemSource'];
 			$fileSource = $result['fileSource'];
@@ -1111,7 +1111,7 @@ 
 				$fileTarget = $sourceExists['file_target'];
 				$itemTarget = $sourceExists['item_target'];
 
-			} elseif(!$sourceExists)  {
+			} elseif (!$sourceExists) {
 
 				$itemTarget = Helper::generateTarget($itemType, $itemSource, $userShareType, $user,
 					$uidOwner, $suggestedItemTarget, $parent);
@@ -1222,8 +1222,8 @@ 
 
 		if ($checkReshare && $checkReshare['uid_owner'] !== \OC_User::getUser()) {
 			// Check if share permissions is granted
-			if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & \OCP\Constants::PERMISSION_SHARE) {
-				if (~(int)$checkReshare['permissions'] & $permissions) {
+			if (self::isResharingAllowed() && (int) $checkReshare['permissions'] & \OCP\Constants::PERMISSION_SHARE) {
+				if (~(int) $checkReshare['permissions'] & $permissions) {
 					$message = 'Sharing %1$s failed, because the permissions exceed permissions granted to %2$s';
 					throw new \Exception(sprintf($message, $itemSourceName, $uidOwner));
 				} else {
@@ -1232,7 +1232,7 @@ 
 
 					$result['expirationDate'] = $expirationDate;
 					// $checkReshare['expiration'] could be null and then is always less than any value
-					if(isset($checkReshare['expiration']) && $checkReshare['expiration'] < $expirationDate) {
+					if (isset($checkReshare['expiration']) && $checkReshare['expiration'] < $expirationDate) {
 						$result['expirationDate'] = $checkReshare['expiration'];
 					}
 
@@ -1312,7 +1312,7 @@ 
 
 		$id = false;
 		if ($result) {
-			$id =  \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share');
+			$id = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share');
 		}
 
 		return $id;
@@ -1414,7 +1414,7 @@ 
 	 * @param array $parameters additional format parameters
 	 * @return array format result
 	 */
-	private static function formatResult($items, $column, $backend, $format = self::FORMAT_NONE , $parameters = null) {
+	private static function formatResult($items, $column, $backend, $format = self::FORMAT_NONE, $parameters = null) {
 		if ($format === self::FORMAT_NONE) {
 			return $items;
 		} else if ($format === self::FORMAT_STATUSES) {
@@ -1471,13 +1471,13 @@ 
 		$try = 0;
 		$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
 		while ($result['success'] === false && $try < 2) {
-			$federationEndpoints = $discoveryService->discover($protocol . $remoteDomain, 'FEDERATED_SHARING');
+			$federationEndpoints = $discoveryService->discover($protocol.$remoteDomain, 'FEDERATED_SHARING');
 			$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
 			$client = \OC::$server->getHTTPClientService()->newClient();
 
 			try {
 				$response = $client->post(
-					$protocol . $remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT,
+					$protocol.$remoteDomain.$endpoint.$urlSuffix.'?format='.self::RESPONSE_FORMAT,
 					[
 						'body' => $fields,
 						'connect_timeout' => 10,
@@ -1518,7 +1518,7 @@ 
 	 * @return int
 	 */
 	public static function getExpireInterval() {
-		return (int)\OC::$server->getConfig()->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+		return (int) \OC::$server->getConfig()->getAppValue('core', 'shareapi_expire_after_n_days', '7');
 	}
 
 	/**

lib/private/URLGenerator.php

Spacing +53 added lines, -53 removed lines

@@ -104,7 +104,7 @@ 
 		}
 
 		$route = substr($route, 7);
-		$route = '/ocs/v2.php' . $route;
+		$route = '/ocs/v2.php'.$route;
 
 		return $this->getAbsoluteURL($route);
 	}
@@ -122,37 +122,37 @@ 
 	public function linkTo(string $app, string $file, array $args = []): string {
 		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
 
-		if($app !== '') {
+		if ($app !== '') {
 			$app_path = \OC_App::getAppPath($app);
 			// Check if the app is in the app folder
-			if ($app_path && file_exists($app_path . '/' . $file)) {
+			if ($app_path && file_exists($app_path.'/'.$file)) {
 				if (substr($file, -3) === 'php') {
 
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $app;
+					$urlLinkTo = \OC::$WEBROOT.'/index.php/apps/'.$app;
 					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $app;
+						$urlLinkTo = \OC::$WEBROOT.'/apps/'.$app;
 					}
-					$urlLinkTo .= ($file !== 'index.php') ? '/' . $file : '';
+					$urlLinkTo .= ($file !== 'index.php') ? '/'.$file : '';
 				} else {
-					$urlLinkTo = \OC_App::getAppWebPath($app) . '/' . $file;
+					$urlLinkTo = \OC_App::getAppWebPath($app).'/'.$file;
 				}
 			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $app . '/' . $file;
+				$urlLinkTo = \OC::$WEBROOT.'/'.$app.'/'.$file;
 			}
 		} else {
-			if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+			if (file_exists(\OC::$SERVERROOT.'/core/'.$file)) {
+				$urlLinkTo = \OC::$WEBROOT.'/core/'.$file;
 			} else {
 				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
+					$urlLinkTo = \OC::$WEBROOT.'/';
 				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
+					$urlLinkTo = \OC::$WEBROOT.'/'.$file;
 				}
 			}
 		}
 
 		if ($args && $query = http_build_query($args, '', '&')) {
-			$urlLinkTo .= '?' . $query;
+			$urlLinkTo .= '?'.$query;
 		}
 
 		return $urlLinkTo;
@@ -170,7 +170,7 @@ 
 	public function imagePath(string $app, string $image): string {
 		$cache = $this->cacheFactory->createDistributed('imagePath-'.md5($this->getBaseUrl()).'-');
 		$cacheKey = $app.'-'.$image;
-		if($key = $cache->get($cacheKey)) {
+		if ($key = $cache->get($cacheKey)) {
 			return $key;
 		}
 
@@ -178,7 +178,7 @@ 
 		$theme = \OC_Util::getTheme();
 
 		//if a theme has a png but not an svg always use the png
-		$basename = substr(basename($image),0,-4);
+		$basename = substr(basename($image), 0, -4);
 
 		$appPath = \OC_App::getAppPath($app);
 
@@ -186,53 +186,53 @@ 
 		$path = '';
 		$themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
 		$themingImagePath = false;
-		if($themingEnabled) {
+		if ($themingEnabled) {
 			$themingDefaults = \OC::$server->getThemingDefaults();
 			if ($themingDefaults instanceof ThemingDefaults) {
 				$themingImagePath = $themingDefaults->replaceImagePath($app, $image);
 			}
 		}
 
-		if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$basename.png";
-		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$image";
-		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$image")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		} elseif($themingEnabled && $themingImagePath) {
+		if (file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$app/img/$image";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$app/img/$basename.png";
+		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$image")) {
+			$path = \OC::$WEBROOT."/themes/$theme/$app/img/$image";
+		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/themes/$theme/$app/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$image")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$image";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
+		} elseif ($themingEnabled && $themingImagePath) {
 			$path = $themingImagePath;
-		} elseif ($appPath && file_exists($appPath . "/img/$image")) {
-			$path =  \OC_App::getAppWebPath($app) . "/img/$image";
-		} elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
-			&& file_exists($appPath . "/img/$basename.png")) {
-			$path =  \OC_App::getAppWebPath($app) . "/img/$basename.png";
-		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/$app/img/$image")) {
-			$path =  \OC::$WEBROOT . "/$app/img/$image";
-		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/$app/img/$basename.svg")
-				&& file_exists(\OC::$SERVERROOT . "/$app/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/$app/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$image")) {
-			$path =  \OC::$WEBROOT . "/core/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+		} elseif ($appPath && file_exists($appPath."/img/$image")) {
+			$path = \OC_App::getAppWebPath($app)."/img/$image";
+		} elseif ($appPath && !file_exists($appPath."/img/$basename.svg")
+			&& file_exists($appPath."/img/$basename.png")) {
+			$path = \OC_App::getAppWebPath($app)."/img/$basename.png";
+		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT."/$app/img/$image")) {
+			$path = \OC::$WEBROOT."/$app/img/$image";
+		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT."/$app/img/$basename.svg")
+				&& file_exists(\OC::$SERVERROOT."/$app/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/$app/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/core/img/$image")) {
+			$path = \OC::$WEBROOT."/core/img/$image";
+		} elseif (!file_exists(\OC::$SERVERROOT."/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
 		}
 
-		if($path !== '') {
+		if ($path !== '') {
 			$cache->set($cacheKey, $path);
 			return $path;
 		}
 
-		throw new RuntimeException('image not found: image:' . $image . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+		throw new RuntimeException('image not found: image:'.$image.' webroot:'.\OC::$WEBROOT.' serverroot:'.\OC::$SERVERROOT);
 	}
 
 
@@ -245,14 +245,14 @@ 
 		$separator = strpos($url, '/') === 0 ? '' : '/';
 
 		if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
-			return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+			return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/').'/'.ltrim($url, '/');
 		}
 		// The ownCloud web root can already be prepended.
-		if(\OC::$WEBROOT !== '' && strpos($url, \OC::$WEBROOT) === 0) {
+		if (\OC::$WEBROOT !== '' && strpos($url, \OC::$WEBROOT) === 0) {
 			$url = substr($url, \strlen(\OC::$WEBROOT));
 		}
 
-		return $this->getBaseUrl() . $separator . $url;
+		return $this->getBaseUrl().$separator.$url;
 	}
 
 	/**
@@ -268,6 +268,6 @@ 
 	 * @return string base url of the current request
 	 */
 	public function getBaseUrl(): string {
-		return $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
+		return $this->request->getServerProtocol().'://'.$this->request->getServerHost().\OC::$WEBROOT;
 	}
 }

lib/private/Search.php

Spacing +5 added lines, -5 removed lines

@@ -51,9 +51,9 @@ 
 	public function searchPaged($query, array $inApps = [], $page = 1, $size = 30) {
 		$this->initProviders();
 		$results = [];
-		foreach($this->providers as $provider) {
+		foreach ($this->providers as $provider) {
 			/** @var $provider Provider */
-			if (! $provider->providesResultsFor($inApps)) {
+			if (!$provider->providesResultsFor($inApps)) {
 				continue;
 			}
 			if ($provider instanceof PagedProvider) {
@@ -88,7 +88,7 @@ 
 	public function removeProvider($provider) {
 		$this->registeredProviders = array_filter(
 			$this->registeredProviders,
-			function ($element) use ($provider) {
+			function($element) use ($provider) {
 				return ($element['class'] != $provider);
 			}
 		);
@@ -109,10 +109,10 @@ 
 	 * Create instances of all the registered search providers
 	 */
 	private function initProviders() {
-		if(! empty($this->providers)) {
+		if (!empty($this->providers)) {
 			return;
 		}
-		foreach($this->registeredProviders as $provider) {
+		foreach ($this->registeredProviders as $provider) {
 			$class = $provider['class'];
 			$options = $provider['options'];
 			$this->providers[] = new $class($options);

lib/private/Group/Database.php

Spacing +10 added lines, -10 removed lines

@@ -113,7 +113,7 @@ 
 				->setValue('gid', $builder->createNamedParameter($gid))
 				->setValue('displayname', $builder->createNamedParameter($gid))
 				->execute();
-		} catch(UniqueConstraintViolationException $e) {
+		} catch (UniqueConstraintViolationException $e) {
 			$result = 0;
 		}
 
@@ -194,14 +194,14 @@ 
 		$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;
 		}
 	}
@@ -250,7 +250,7 @@ 
 			->execute();
 
 		$groups = [];
-		while($row = $cursor->fetch()) {
+		while ($row = $cursor->fetch()) {
 			$groups[] = $row['gid'];
 			$this->groupCache[$row['gid']] = $row['gid'];
 		}
@@ -278,7 +278,7 @@ 
 
 		if ($search !== '') {
 			$query->where($query->expr()->iLike('gid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
+				'%'.$this->dbConn->escapeLikeParameter($search).'%'
 			)));
 		}
 
@@ -342,7 +342,7 @@ 
 
 		if ($search !== '') {
 			$query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
+				'%'.$this->dbConn->escapeLikeParameter($search).'%'
 			)));
 		}
 
@@ -380,7 +380,7 @@ 
 
 		if ($search !== '') {
 			$query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
+				'%'.$this->dbConn->escapeLikeParameter($search).'%'
 			)));
 		}
 
@@ -389,7 +389,7 @@ 
 		$result->closeCursor();
 
 		if ($count !== false) {
-			$count = (int)$count;
+			$count = (int) $count;
 		} else {
 			$count = 0;
 		}
@@ -408,7 +408,7 @@ 
 		$this->fixDI();
 
 		$query = $this->dbConn->getQueryBuilder();
-		$query->select($query->createFunction('COUNT(DISTINCT ' . $query->getColumnName('uid') . ')'))
+		$query->select($query->createFunction('COUNT(DISTINCT '.$query->getColumnName('uid').')'))
 			->from('preferences', 'p')
 			->innerJoin('p', 'group_user', 'g', $query->expr()->eq('p.userid', 'g.uid'))
 			->where($query->expr()->eq('appid', $query->createNamedParameter('core')))
@@ -421,7 +421,7 @@ 
 		$result->closeCursor();
 
 		if ($count !== false) {
-			$count = (int)$count;
+			$count = (int) $count;
 		} else {
 			$count = 0;
 		}

lib/private/Config.php

Spacing +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
 	 * @return mixed the value or $default
 	 */
 	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
+		$envValue = getenv(self::ENV_PREFIX.$key);
 		if ($envValue !== false) {
 			return $envValue;
 		}
@@ -200,7 +200,7 @@ 
 		foreach ($configFiles as $file) {
 			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
 			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
+			if ($file === $this->configFilePath &&
 				$filePointer === false) {
 				// Opening the main config might not be possible, e.g. if the wrong
 				// permissions are set (likely on a new installation)
@@ -208,13 +208,13 @@ 
 			}
 
 			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
+			if (!flock($filePointer, LOCK_SH)) {
 				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
 			}
 
 			unset($CONFIG);
 			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
+			if (isset($CONFIG) && is_array($CONFIG)) {
 				$this->cache = array_merge($this->cache, $CONFIG);
 			}
 
@@ -246,14 +246,14 @@ 
 		chmod($this->configFilePath, 0640);
 
 		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource($filePointer)) {
+		if (!is_resource($filePointer)) {
 			throw new HintException(
 				"Can't write into config directory!",
 				'This can usually be fixed by giving the webserver write access to the config directory.');
 		}
 
 		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
+		if (!flock($filePointer, LOCK_EX)) {
 			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
 		}
 

lib/private/Installer.php

Spacing +49 added lines, -49 removed lines

@@ -106,7 +106,7 @@ 
 	 */
 	public function installApp(string $appId, bool $forceEnable = false): string {
 		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
+		if ($app === false) {
 			throw new \Exception('App not found in any app directory');
 		}
 
@@ -115,7 +115,7 @@ 
 
 		$l = \OC::$server->getL10N('core');
 
-		if(!is_array($info)) {
+		if (!is_array($info)) {
 			throw new \Exception(
 				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
 					[$appId]
@@ -146,7 +146,7 @@ 
 		}
 
 		//install the database
-		if(is_file($basedir.'/appinfo/database.xml')) {
+		if (is_file($basedir.'/appinfo/database.xml')) {
 			if (\OC::$server->getConfig()->getAppValue($info['id'], 'installed_version') === null) {
 				OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
 			} else {
@@ -163,7 +163,7 @@ 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
+		self::includeAppScript($basedir.'/appinfo/install.php');
 
 		$appData = OC_App::getAppInfo($appId);
 		OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
@@ -173,10 +173,10 @@ 
 		\OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
 
 		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
+		foreach ($info['remote'] as $name=>$path) {
 			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path) {
+		foreach ($info['public'] as $name=>$path) {
 			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
@@ -192,7 +192,7 @@ 
 	 * @return bool
 	 */
 	public function updateAppstoreApp($appId) {
-		if($this->isUpdateAvailable($appId)) {
+		if ($this->isUpdateAvailable($appId)) {
 			try {
 				$this->downloadApp($appId);
 			} catch (\Exception $e) {
@@ -219,18 +219,18 @@ 
 		$appId = strtolower($appId);
 
 		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
-			if($app['id'] === $appId) {
+		foreach ($apps as $app) {
+			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+				$certificate->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt'));
 				$loadedCertificate = $certificate->loadX509($app['certificate']);
 
 				// Verify if the certificate has been revoked
 				$crl = new X509();
-				$crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if($crl->validateSignature() !== true) {
+				$crl->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
+				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
 				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
@@ -245,7 +245,7 @@ 
 				}
 
 				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if($certificate->validateSignature() !== true) {
+				if ($certificate->validateSignature() !== true) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
@@ -256,7 +256,7 @@ 
 
 				// Verify if the certificate is issued for the requested app id
 				$certInfo = openssl_x509_parse($app['certificate']);
-				if(!isset($certInfo['subject']['CN'])) {
+				if (!isset($certInfo['subject']['CN'])) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert with no CN',
@@ -264,7 +264,7 @@ 
 						)
 					);
 				}
-				if($certInfo['subject']['CN'] !== $appId) {
+				if ($certInfo['subject']['CN'] !== $appId) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert issued to %s',
@@ -282,15 +282,15 @@ 
 
 				// Check if the signature actually matches the downloaded content
 				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+				$verified = (bool) openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
 				openssl_free_key($certificate);
 
-				if($verified === true) {
+				if ($verified === true) {
 					// Seems to match, let's proceed
 					$extractDir = $this->tempManager->getTemporaryFolder();
 					$archive = new TAR($tempFile);
 
-					if($archive) {
+					if ($archive) {
 						if (!$archive->extract($extractDir)) {
 							throw new \Exception(
 								sprintf(
@@ -303,7 +303,7 @@ 
 						$folders = array_diff($allFiles, ['.', '..']);
 						$folders = array_values($folders);
 
-						if(count($folders) > 1) {
+						if (count($folders) > 1) {
 							throw new \Exception(
 								sprintf(
 									'Extracted app %s has more than 1 folder',
@@ -314,22 +314,22 @@ 
 
 						// Check if appinfo/info.xml has the same app ID as well
 						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+						$xml = simplexml_load_file($extractDir.'/'.$folders[0].'/appinfo/info.xml');
 						libxml_disable_entity_loader($loadEntities);
-						if((string)$xml->id !== $appId) {
+						if ((string) $xml->id !== $appId) {
 							throw new \Exception(
 								sprintf(
 									'App for id %s has a wrong app ID in info.xml: %s',
 									$appId,
-									(string)$xml->id
+									(string) $xml->id
 								)
 							);
 						}
 
 						// Check if the version is lower than before
 						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
-						if(version_compare($currentVersion, $newVersion) === 1) {
+						$newVersion = (string) $xml->version;
+						if (version_compare($currentVersion, $newVersion) === 1) {
 							throw new \Exception(
 								sprintf(
 									'App for id %s has version %s and tried to update to lower version %s',
@@ -340,12 +340,12 @@ 
 							);
 						}
 
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
+						$baseDir = OC_App::getInstallPath().'/'.$appId;
 						// Remove old app with the ID if existent
 						OC_Helper::rmdirr($baseDir);
 						// Move to app folder
-						if(@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
+						if (@mkdir($baseDir)) {
+							$extractDir .= '/'.$folders[0];
 							OC_Helper::copyr($extractDir, $baseDir);
 						}
 						OC_Helper::copyr($extractDir, $baseDir);
@@ -408,8 +408,8 @@ 
 			$this->apps = $this->appFetcher->get();
 		}
 
-		foreach($this->apps as $app) {
-			if($app['id'] === $appId) {
+		foreach ($this->apps as $app) {
+			if ($app['id'] === $appId) {
 				$currentVersion = OC_App::getAppVersion($appId);
 
 				if (!isset($app['releases'][0]['version'])) {
@@ -436,7 +436,7 @@ 
 	 */
 	private function isInstalledFromGit($appId) {
 		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
+		if ($app === false) {
 			return false;
 		}
 		$basedir = $app['path'].'/'.$appId;
@@ -451,7 +451,7 @@ 
 	 * The function will check if the app is already downloaded in the apps repository
 	 */
 	public function isDownloaded($name) {
-		foreach(\OC::$APPSROOTS as $dir) {
+		foreach (\OC::$APPSROOTS as $dir) {
 			$dirToTest  = $dir['path'];
 			$dirToTest .= '/';
 			$dirToTest .= $name;
@@ -479,14 +479,14 @@ 
 	 * this has to be done by the function oc_app_uninstall().
 	 */
 	public function removeApp($appId) {
-		if($this->isDownloaded($appId)) {
+		if ($this->isDownloaded($appId)) {
 			if (\OC::$server->getAppManager()->isShipped($appId)) {
 				return false;
 			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
+			$appDir = OC_App::getInstallPath().'/'.$appId;
 			OC_Helper::rmdirr($appDir);
 			return true;
-		}else{
+		} else {
 			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
 
 			return false;
@@ -502,8 +502,8 @@ 
 	 */
 	public function installAppBundle(Bundle $bundle) {
 		$appIds = $bundle->getAppIdentifiers();
-		foreach($appIds as $appId) {
-			if(!$this->isDownloaded($appId)) {
+		foreach ($appIds as $appId) {
+			if (!$this->isDownloaded($appId)) {
 				$this->downloadApp($appId);
 			}
 			$this->installApp($appId);
@@ -527,13 +527,13 @@ 
 		$appManager = \OC::$server->getAppManager();
 		$config = \OC::$server->getConfig();
 		$errors = [];
-		foreach(\OC::$APPSROOTS as $app_dir) {
-			if($dir = opendir($app_dir['path'])) {
-				while(false !== ($filename = readdir($dir))) {
-					if($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
-						if(file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
-							if($config->getAppValue($filename, "installed_version", null) === null) {
-								$info=OC_App::getAppInfo($filename);
+		foreach (\OC::$APPSROOTS as $app_dir) {
+			if ($dir = opendir($app_dir['path'])) {
+				while (false !== ($filename = readdir($dir))) {
+					if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
+						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
+							if ($config->getAppValue($filename, "installed_version", null) === null) {
+								$info = OC_App::getAppInfo($filename);
 								$enabled = isset($info['default_enable']);
 								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
 									  && $config->getAppValue($filename, 'enabled') !== 'no') {
@@ -573,12 +573,12 @@ 
 		$appPath = OC_App::getAppPath($app);
 		\OC_App::registerAutoloading($app, $appPath);
 
-		if(is_file("$appPath/appinfo/database.xml")) {
+		if (is_file("$appPath/appinfo/database.xml")) {
 			try {
 				OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
 			} catch (TableExistsException $e) {
 				throw new HintException(
-					'Failed to enable app ' . $app,
+					'Failed to enable app '.$app,
 					'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">support channels</a>.',
 					0, $e
 				);
@@ -607,10 +607,10 @@ 
 		}
 
 		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
+		foreach ($info['remote'] as $name=>$path) {
 			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path) {
+		foreach ($info['public'] as $name=>$path) {
 			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
@@ -623,7 +623,7 @@ 
 	 * @param string $script
 	 */
 	private static function includeAppScript($script) {
-		if (file_exists($script)){
+		if (file_exists($script)) {
 			include $script;
 		}
 	}

lib/private/L10N/Factory.php

Spacing +25 added lines, -25 removed lines

@@ -114,11 +114,11 @@ 
 	 * @return \OCP\IL10N
 	 */
 	public function get($app, $lang = null, $locale = null) {
-		return new LazyL10N(function () use ($app, $lang, $locale) {
+		return new LazyL10N(function() use ($app, $lang, $locale) {
 
 			$app = \OC_App::cleanAppId($app);
 			if ($lang !== null) {
-				$lang = str_replace(['\0', '/', '\\', '..'], '', (string)$lang);
+				$lang = str_replace(['\0', '/', '\\', '..'], '', (string) $lang);
 			}
 
 			$forceLang = $this->config->getSystemValue('force_language', false);
@@ -174,7 +174,7 @@ 
 		 * @link https://github.com/owncloud/core/issues/21955
 		 */
 		if ($this->config->getSystemValue('installed', false)) {
-			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() :  null;
+			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() : null;
 			if (!is_null($userId)) {
 				$userLang = $this->config->getUserValue($userId, 'core', 'lang', null);
 			} else {
@@ -224,7 +224,7 @@ 
 		}
 
 		if ($this->config->getSystemValue('installed', false)) {
-			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() :  null;
+			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() : null;
 			$userLocale = null;
 			if (null !== $userId) {
 				$userLocale = $this->config->getUserValue($userId, 'core', 'locale', null);
@@ -305,7 +305,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot));
+			$themeDir = $this->serverRoot.'/themes/'.$theme.substr($dir, strlen($this->serverRoot));
 
 			if (is_dir($themeDir)) {
 				$files = scandir($themeDir);
@@ -331,7 +331,7 @@ 
 			return $this->availableLocales;
 		}
 
-		$localeData = file_get_contents(\OC::$SERVERROOT . '/resources/locales.json');
+		$localeData = file_get_contents(\OC::$SERVERROOT.'/resources/locales.json');
 		$this->availableLocales = \json_decode($localeData, true);
 
 		return $this->availableLocales;
@@ -353,7 +353,7 @@ 
 
 	public function getLanguageIterator(IUser $user = null): ILanguageIterator {
 		$user = $user ?? $this->userSession->getUser();
-		if($user === null) {
+		if ($user === null) {
 			throw new \RuntimeException('Failed to get an IUser instance');
 		}
 		return new LanguageIterator($user, $this->config);
@@ -369,7 +369,7 @@ 
 		}
 
 		$locales = $this->findAvailableLocales();
-		$userLocale = array_filter($locales, function ($value) use ($locale) {
+		$userLocale = array_filter($locales, function($value) use ($locale) {
 			return $locale === $value['code'];
 		});
 
@@ -471,11 +471,11 @@ 
 		$languageFiles = [];
 
 		$i18nDir = $this->findL10nDir($app);
-		$transFile = strip_tags($i18nDir) . strip_tags($lang) . '.json';
+		$transFile = strip_tags($i18nDir).strip_tags($lang).'.json';
 
-		if (($this->isSubDirectory($transFile, $this->serverRoot . '/core/l10n/')
-				|| $this->isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/')
-				|| $this->isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/')
+		if (($this->isSubDirectory($transFile, $this->serverRoot.'/core/l10n/')
+				|| $this->isSubDirectory($transFile, $this->serverRoot.'/lib/l10n/')
+				|| $this->isSubDirectory($transFile, \OC_App::getAppPath($app).'/l10n/')
 			)
 			&& file_exists($transFile)) {
 			// load the translations file
@@ -485,7 +485,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot));
+			$transFile = $this->serverRoot.'/themes/'.$theme.substr($transFile, strlen($this->serverRoot));
 			if (file_exists($transFile)) {
 				$languageFiles[] = $transFile;
 			}
@@ -502,14 +502,14 @@ 
 	 */
 	protected function findL10nDir($app = null) {
 		if (in_array($app, ['core', 'lib'])) {
-			if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) {
-				return $this->serverRoot . '/' . $app . '/l10n/';
+			if (file_exists($this->serverRoot.'/'.$app.'/l10n/')) {
+				return $this->serverRoot.'/'.$app.'/l10n/';
 			}
 		} else if ($app && \OC_App::getAppPath($app) !== false) {
 			// Check if the app is in the app folder
-			return \OC_App::getAppPath($app) . '/l10n/';
+			return \OC_App::getAppPath($app).'/l10n/';
 		}
-		return $this->serverRoot . '/core/l10n/';
+		return $this->serverRoot.'/core/l10n/';
 	}
 
 
@@ -532,9 +532,9 @@ 
 			$plural = preg_replace('#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2]);
 
 			$body = str_replace(
-				[ 'plural', 'n', '$n$plurals', ],
-				[ '$plural', '$n', '$nplurals', ],
-				'nplurals='. $nplurals . '; plural=' . $plural
+				['plural', 'n', '$n$plurals', ],
+				['$plural', '$n', '$nplurals', ],
+				'nplurals='.$nplurals.'; plural='.$plural
 			);
 
 			// add parents
@@ -543,7 +543,7 @@ 
 			$res = '';
 			$p = 0;
 			$length = strlen($body);
-			for($i = 0; $i < $length; $i++) {
+			for ($i = 0; $i < $length; $i++) {
 				$ch = $body[$i];
 				switch ($ch) {
 					case '?':
@@ -554,7 +554,7 @@ 
 						$res .= ') : (';
 						break;
 					case ';':
-						$res .= str_repeat(')', $p) . ';';
+						$res .= str_repeat(')', $p).';';
 						$p = 0;
 						break;
 					default:
@@ -562,7 +562,7 @@ 
 				}
 			}
 
-			$body = $res . 'return ($plural>=$nplurals?$nplurals-1:$plural);';
+			$body = $res.'return ($plural>=$nplurals?$nplurals-1:$plural);';
 			$function = create_function('$n', $body);
 			$this->pluralFunctions[$string] = $function;
 			return $function;
@@ -594,7 +594,7 @@ 
 		$commonLanguages = [];
 		$languages = [];
 
-		foreach($languageCodes as $lang) {
+		foreach ($languageCodes as $lang) {
 			$l = $this->get('lib', $lang);
 			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 			$potentialName = (string) $l->t('__language_name__');
@@ -627,7 +627,7 @@ 
 		ksort($commonLanguages);
 
 		// sort now by displayed language not the iso-code
-		usort($languages, function ($a, $b) {
+		usort($languages, function($a, $b) {
 			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 				// If a doesn't have a name, but b does, list b before a
 				return 1;

remote.php

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
 use Sabre\DAV\Exception\ServiceUnavailable;
@@ -60,7 +60,7 @@ 
 			// we shall not log on RemoteException
 			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
 		}
-		$server->on('beforeMethod:*', function () use ($e) {
+		$server->on('beforeMethod:*', function() use ($e) {
 			if ($e instanceof RemoteException) {
 				switch ($e->getCode()) {
 					case 503:
@@ -108,11 +108,11 @@ 
 		return $services[$service];
 	}
 
-	return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+	return \OC::$server->getConfig()->getAppValue('core', 'remote_'.$service);
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// All resources served via the DAV endpoint should have the strictest possible
 	// policy. Exempted from this is the SabreDAV browser plugin which overwrites
@@ -133,18 +133,18 @@ 
 	if (!$pos = strpos($pathInfo, '/', 1)) {
 		$pos = strlen($pathInfo);
 	}
-	$service=substr($pathInfo, 1, $pos-1);
+	$service = substr($pathInfo, 1, $pos - 1);
 
 	$file = resolveService($service);
 
-	if(is_null($file)) {
+	if (is_null($file)) {
 		throw new RemoteException('Path not found', 404);
 	}
 
-	$file=ltrim($file, '/');
+	$file = ltrim($file, '/');
 
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+	$parts = explode('/', $file, 2);
+	$app = $parts[0];
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
@@ -153,17 +153,17 @@ 
 
 	switch ($app) {
 		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
+			$file = OC::$SERVERROOT.'/'.$file;
 			break;
 		default:
 			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
+				throw new RemoteException('App not installed: '.$app);
 			}
 			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
+			$file = OC_App::getAppPath($app).'/'.$parts[1];
 			break;
 	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	$baseuri = OC::$WEBROOT.'/remote.php/'.$service.'/';
 	require_once $file;
 
 } catch (Exception $ex) {

apps/dav/lib/Comments/CommentNode.php

Spacing +15 added lines, -15 removed lines

@@ -85,14 +85,14 @@ 
 		$this->logger = $logger;
 
 		$methods = get_class_methods($this->comment);
-		$methods = array_filter($methods, function ($name) {
+		$methods = array_filter($methods, function($name) {
 			return strpos($name, 'get') === 0;
 		});
-		foreach($methods as $getter) {
-			if($getter === 'getMentions') {
-				continue;	// special treatment
+		foreach ($methods as $getter) {
+			if ($getter === 'getMentions') {
+				continue; // special treatment
 			}
-			$name = '{'.self::NS_OWNCLOUD.'}' . lcfirst(substr($getter, 3));
+			$name = '{'.self::NS_OWNCLOUD.'}'.lcfirst(substr($getter, 3));
 			$this->properties[$name] = $getter;
 		}
 		$this->userManager = $userManager;
@@ -131,7 +131,7 @@ 
 
 	protected function checkWriteAccessOnComment() {
 		$user = $this->userSession->getUser();
-		if($this->comment->getActorType() !== 'users'
+		if ($this->comment->getActorType() !== 'users'
 			|| is_null($user)
 			|| $this->comment->getActorId() !== $user->getUID()
 		) {
@@ -195,9 +195,9 @@ 
 			return true;
 		} catch (\Exception $e) {
 			$this->logger->logException($e, ['app' => 'dav/comments']);
-			if($e instanceof MessageTooLongException) {
+			if ($e instanceof MessageTooLongException) {
 				$msg = 'Message exceeds allowed character limit of ';
-				throw new BadRequest($msg . IComment::MAX_MESSAGE_LENGTH, 0, $e);
+				throw new BadRequest($msg.IComment::MAX_MESSAGE_LENGTH, 0, $e);
 			}
 			throw $e;
 		}
@@ -239,14 +239,14 @@ 
 		$properties = array_keys($this->properties);
 
 		$result = [];
-		foreach($properties as $property) {
+		foreach ($properties as $property) {
 			$getter = $this->properties[$property];
-			if(method_exists($this->comment, $getter)) {
+			if (method_exists($this->comment, $getter)) {
 				$result[$property] = $this->comment->$getter();
 			}
 		}
 
-		if($this->comment->getActorType() === 'users') {
+		if ($this->comment->getActorType() === 'users') {
 			$user = $this->userManager->get($this->comment->getActorId());
 			$displayName = is_null($user) ? null : $user->getDisplayName();
 			$result[self::PROPERTY_NAME_ACTOR_DISPLAYNAME] = $displayName;
@@ -255,14 +255,14 @@ 
 		$result[self::PROPERTY_NAME_MENTIONS] = $this->composeMentionsPropertyValue();
 
 		$unread = null;
-		$user =  $this->userSession->getUser();
-		if(!is_null($user)) {
+		$user = $this->userSession->getUser();
+		if (!is_null($user)) {
 			$readUntil = $this->commentsManager->getReadMark(
 				$this->comment->getObjectType(),
 				$this->comment->getObjectId(),
 				$user
 			);
-			if(is_null($readUntil)) {
+			if (is_null($readUntil)) {
 				$unread = 'true';
 			} else {
 				$unread = $this->comment->getCreationDateTime() > $readUntil;
@@ -283,7 +283,7 @@ 
 	 * @return array
 	 */
 	protected function composeMentionsPropertyValue() {
-		return array_map(function ($mention) {
+		return array_map(function($mention) {
 			try {
 				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
 			} catch (\OutOfBoundsException $e) {