nextcloud / server

lib/private/console/timestampformatter.php

Spacing +1 added lines, -1 removed lines

@@ -103,6 +103,6 @@
 		$time = new \DateTime('now', $timeZone);
 		$timestampInfo = $time->format($this->config->getSystemValue('logdateformat', 'c'));
 
-		return $timestampInfo . ' ' . $this->formatter->format($message);
+		return $timestampInfo.' '.$this->formatter->format($message);
 	}
 }

lib/private/share20/manager.php

Spacing +12 added lines, -12 removed lines

@@ -280,7 +280,7 @@ 
 
 		if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
 			$expirationDate = new \DateTime();
-			$expirationDate->setTime(0,0,0);
+			$expirationDate->setTime(0, 0, 0);
 			$expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
 		}
 
@@ -292,7 +292,7 @@ 
 
 			$date = new \DateTime();
 			$date->setTime(0, 0, 0);
-			$date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
+			$date->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
 			if ($date < $expirationDate) {
 				$message = $this->l->t('Cannot set expiration date more than %s days in the future', [$this->shareApiLinkDefaultExpireDays()]);
 				throw new GenericShareException($message, $message, 404);
@@ -345,7 +345,7 @@ 
 		 */
 		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_USER);
 		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach($existingShares as $existingShare) {
+		foreach ($existingShares as $existingShare) {
 			// Ignore if it is the same share
 			try {
 				if ($existingShare->getFullId() === $share->getFullId()) {
@@ -400,7 +400,7 @@ 
 		 */
 		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
 		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach($existingShares as $existingShare) {
+		foreach ($existingShares as $existingShare) {
 			try {
 				if ($existingShare->getFullId() === $share->getFullId()) {
 					continue;
@@ -473,7 +473,7 @@ 
 		// Make sure that we do not share a path that contains a shared mountpoint
 		if ($path instanceof \OCP\Files\Folder) {
 			$mounts = $this->mountManager->findIn($path->getPath());
-			foreach($mounts as $mount) {
+			foreach ($mounts as $mount) {
 				if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
 					throw new \InvalidArgumentException('Path contains files shared with you');
 				}
@@ -521,7 +521,7 @@ 
 		$storage = $share->getNode()->getStorage();
 		if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
 			$parent = $share->getNode()->getParent();
-			while($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+			while ($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
 				$parent = $parent->getParent();
 			}
 			$share->setShareOwner($parent->getOwner()->getUID());
@@ -569,7 +569,7 @@ 
 		}
 
 		// Generate the target
-		$target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
+		$target = $this->config->getSystemValue('share_folder', '/').'/'.$share->getNode()->getName();
 		$target = \OC\Files\Filesystem::normalizePath($target);
 		$share->setTarget($target);
 
@@ -824,7 +824,7 @@ 
 	 * @param string $recipientId
 	 */
 	public function deleteFromSelf(\OCP\Share\IShare $share, $recipientId) {
-		list($providerId, ) = $this->splitFullId($share->getId());
+		list($providerId,) = $this->splitFullId($share->getId());
 		$provider = $this->factory->getProvider($providerId);
 
 		$provider->deleteFromSelf($share, $recipientId);
@@ -850,7 +850,7 @@ 
 			}
 		}
 
-		list($providerId, ) = $this->splitFullId($share->getId());
+		list($providerId,) = $this->splitFullId($share->getId());
 		$provider = $this->factory->getProvider($providerId);
 
 		$provider->move($share, $recipientId);
@@ -886,7 +886,7 @@ 
 			$shares2 = [];
 			$today = new \DateTime();
 
-			while(true) {
+			while (true) {
 				$added = 0;
 				foreach ($shares as $share) {
 					// Check if the share is expired and if so delete it
@@ -976,7 +976,7 @@ 
 	 *
 	 * @return Share[]
 	 */
-	public function getSharesByPath(\OCP\Files\Node $path, $page=0, $perPage=50) {
+	public function getSharesByPath(\OCP\Files\Node $path, $page = 0, $perPage = 50) {
 	}
 
 	/**
@@ -1129,7 +1129,7 @@ 
 	 * @return int
 	 */
 	public function shareApiLinkDefaultExpireDays() {
-		return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+		return (int) $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
 	}
 
 	/**

lib/private/share20/share.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 		if ($this->providerId === null || $this->id === null) {
 			throw new \UnexpectedValueException;
 		}
-		return $this->providerId . ':' . $this->id;
+		return $this->providerId.':'.$this->id;
 	}
 
 	/**

lib/private/share20/providerfactory.php

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
+			throw new ProviderException('No provider with id .'.$id.' found.');
 		}
 
 		return $provider;
@@ -146,7 +146,7 @@ 
 		$provider = null;
 
 		//FIXME we should not report type 2
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER  ||
+		if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
 			$shareType === 2 ||
 			$shareType === \OCP\Share::SHARE_TYPE_GROUP ||
 			$shareType === \OCP\Share::SHARE_TYPE_LINK) {
@@ -156,7 +156,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
+			throw new ProviderException('No share provider for share type '.$shareType);
 		}
 
 		return $provider;

lib/private/share20/defaultshareprovider.php

Spacing +15 added lines, -15 removed lines

@@ -282,7 +282,7 @@ 
 			->orderBy('id');
 
 		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$children[] = $this->createShare($data);
 		}
 		$cursor->closeCursor();
@@ -514,7 +514,7 @@ 
 
 		$cursor = $qb->execute();
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShare($data);
 		}
 		$cursor->closeCursor();
@@ -593,7 +593,7 @@ 
 			->execute();
 
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShare($data);
 		}
 		$cursor->closeCursor();
@@ -637,7 +637,7 @@ 
 
 			$cursor = $qb->execute();
 
-			while($data = $cursor->fetch()) {
+			while ($data = $cursor->fetch()) {
 				$shares[] = $this->createShare($data);
 			}
 			$cursor->closeCursor();
@@ -650,7 +650,7 @@ 
 			$shares2 = [];
 
 			$start = 0;
-			while(true) {
+			while (true) {
 				$groups = array_slice($allGroups, $start, 100);
 				$start += 100;
 
@@ -686,7 +686,7 @@ 
 					));
 
 				$cursor = $qb->execute();
-				while($data = $cursor->fetch()) {
+				while ($data = $cursor->fetch()) {
 					if ($offset > 0) {
 						$offset--;
 						continue;
@@ -700,7 +700,7 @@ 
  			 * Resolve all group shares to user specific shares
  			 * TODO: Optmize this!
  			 */
-			foreach($shares2 as $share) {
+			foreach ($shares2 as $share) {
 				$shares[] = $this->resolveGroupShare($share, $userId);
 			}
 		} else {
@@ -755,14 +755,14 @@ 
 	 */
 	private function createShare($data) {
 		$share = new Share($this->rootFolder);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send']);
+			->setMailSend((bool) $data['mail_send']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
@@ -777,7 +777,7 @@ 
 		if ($data['uid_initiator'] === null) {
 			//OLD SHARE
 			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
 
 			$owner = $path->getOwner();
 			$share->setShareOwner($owner->getUID());
@@ -787,7 +787,7 @@ 
 			$share->setShareOwner($data['uid_owner']);
 		}
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		if ($data['expiration'] !== null) {
@@ -851,7 +851,7 @@ 
 		$stmt->closeCursor();
 
 		if ($data !== false) {
-			$share->setPermissions((int)$data['permissions']);
+			$share->setPermissions((int) $data['permissions']);
 			$share->setTarget($data['file_target']);
 		}
 

lib/private/urlgenerator.php

Spacing +46 added lines, -46 removed lines

@@ -91,40 +91,40 @@ 
 	 *
 	 * Returns a url to the given app and file.
 	 */
-	public function linkTo( $app, $file, $args = array() ) {
+	public function linkTo($app, $file, $args = array()) {
 		$frontControllerActive = (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;
@@ -142,7 +142,7 @@ 
 	public function imagePath($app, $image) {
 		$cache = $this->cacheFactory->create('imagePath');
 		$cacheKey = $app.'-'.$image;
-		if($key = $cache->get($cacheKey)) {
+		if ($key = $cache->get($cacheKey)) {
 			return $key;
 		}
 
@@ -150,46 +150,46 @@ 
 		$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);
 
 		// Check if the app is in the app folder
 		$path = '';
-		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 ($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 . "/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 (!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 . "/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 (file_exists(\OC::$SERVERROOT . "/core/img/$image")) {
-			$path =  \OC::$WEBROOT . "/core/img/$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 ($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."/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 (!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."/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 (file_exists(\OC::$SERVERROOT."/core/img/$image")) {
+			$path = \OC::$WEBROOT."/core/img/$image";
 		}
 
-		if($path !== '') {
+		if ($path !== '') {
 			$cache->set($cacheKey, $path);
 			return $path;
 		} else {
-			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);
 		}
 	}
 
@@ -203,7 +203,7 @@ 
 		$separator = $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.
@@ -212,7 +212,7 @@ 
 			: \OC::$WEBROOT;
 
 		$request = \OC::$server->getRequest();
-		return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url;
+		return $request->getServerProtocol().'://'.$request->getServerHost().$webRoot.$separator.$url;
 	}
 
 	/**

lib/private/hooks/emittertrait.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param callable $callback
 	 */
 	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (!isset($this->listeners[$eventName])) {
 			$this->listeners[$eventName] = array();
 		}
@@ -53,7 +53,7 @@ 
 		$names = array();
 		$allNames = array_keys($this->listeners);
 		if ($scope and $method) {
-			$name = $scope . '::' . $method;
+			$name = $scope.'::'.$method;
 			if (isset($this->listeners[$name])) {
 				$names[] = $name;
 			}
@@ -93,7 +93,7 @@ 
 	 * @param array $arguments optional
 	 */
 	protected function emit($scope, $method, array $arguments = array()) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (isset($this->listeners[$eventName])) {
 			foreach ($this->listeners[$eventName] as $callback) {
 				call_user_func_array($callback, $arguments);

lib/private/ocsclient.php

Spacing +49 added lines, -49 removed lines

@@ -97,7 +97,7 @@ 
 		$data = @simplexml_load_string($body);
 		libxml_disable_entity_loader($loadEntities);
 
-		if($data === false) {
+		if ($data === false) {
 			libxml_clear_errors();
 			$this->logger->error(
 				sprintf('Could not get %s, content was no valid XML', $action),
@@ -127,7 +127,7 @@ 
 		$client = $this->httpClientService->newClient();
 		try {
 			$response = $client->get(
-				$this->getAppStoreUrl() . '/content/categories',
+				$this->getAppStoreUrl().'/content/categories',
 				[
 					'timeout' => 5,
 					'query' => [
@@ -135,7 +135,7 @@ 
 					],
 				]
 			);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->logger->error(
 				sprintf('Could not get categories: %s', $e->getMessage()),
 				[
@@ -146,7 +146,7 @@ 
 		}
 
 		$data = $this->loadData($response->getBody(), 'categories');
-		if($data === null) {
+		if ($data === null) {
 			return null;
 		}
 
@@ -154,8 +154,8 @@ 
 		$cats = [];
 
 		foreach ($tmp->category as $value) {
-			$id = (int)$value->id;
-			$name = (string)$value->name;
+			$id = (int) $value->id;
+			$name = (string) $value->name;
 			$cats[$id] = $name;
 		}
 
@@ -178,7 +178,7 @@ 
 		$client = $this->httpClientService->newClient();
 		try {
 			$response = $client->get(
-				$this->getAppStoreUrl() . '/content/data',
+				$this->getAppStoreUrl().'/content/data',
 				[
 					'timeout' => 5,
 					'query' => [
@@ -192,7 +192,7 @@ 
 					],
 				]
 			);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->logger->error(
 				sprintf('Could not get applications: %s', $e->getMessage()),
 				[
@@ -203,7 +203,7 @@ 
 		}
 
 		$data = $this->loadData($response->getBody(), 'applications');
-		if($data === null) {
+		if ($data === null) {
 			return [];
 		}
 
@@ -213,23 +213,23 @@ 
 		$apps = [];
 		for ($i = 0; $i < $tmpCount; $i++) {
 			$app = [];
-			$app['id'] = (string)$tmp[$i]->id;
-			$app['name'] = (string)$tmp[$i]->name;
-			$app['label'] = (string)$tmp[$i]->label;
-			$app['version'] = (string)$tmp[$i]->version;
-			$app['type'] = (string)$tmp[$i]->typeid;
-			$app['typename'] = (string)$tmp[$i]->typename;
-			$app['personid'] = (string)$tmp[$i]->personid;
-			$app['profilepage'] = (string)$tmp[$i]->profilepage;
-			$app['license'] = (string)$tmp[$i]->license;
-			$app['detailpage'] = (string)$tmp[$i]->detailpage;
-			$app['preview'] = (string)$tmp[$i]->smallpreviewpic1;
-			$app['preview-full'] = (string)$tmp[$i]->previewpic1;
+			$app['id'] = (string) $tmp[$i]->id;
+			$app['name'] = (string) $tmp[$i]->name;
+			$app['label'] = (string) $tmp[$i]->label;
+			$app['version'] = (string) $tmp[$i]->version;
+			$app['type'] = (string) $tmp[$i]->typeid;
+			$app['typename'] = (string) $tmp[$i]->typename;
+			$app['personid'] = (string) $tmp[$i]->personid;
+			$app['profilepage'] = (string) $tmp[$i]->profilepage;
+			$app['license'] = (string) $tmp[$i]->license;
+			$app['detailpage'] = (string) $tmp[$i]->detailpage;
+			$app['preview'] = (string) $tmp[$i]->smallpreviewpic1;
+			$app['preview-full'] = (string) $tmp[$i]->previewpic1;
 			$app['changed'] = strtotime($tmp[$i]->changed);
-			$app['description'] = (string)$tmp[$i]->description;
-			$app['score'] = (string)$tmp[$i]->score;
-			$app['downloads'] = (int)$tmp[$i]->downloads;
-			$app['level'] = (int)$tmp[$i]->approved;
+			$app['description'] = (string) $tmp[$i]->description;
+			$app['score'] = (string) $tmp[$i]->score;
+			$app['downloads'] = (int) $tmp[$i]->downloads;
+			$app['level'] = (int) $tmp[$i]->approved;
 
 			$apps[] = $app;
 		}
@@ -255,7 +255,7 @@ 
 		$client = $this->httpClientService->newClient();
 		try {
 			$response = $client->get(
-				$this->getAppStoreUrl() . '/content/data/' . urlencode($id),
+				$this->getAppStoreUrl().'/content/data/'.urlencode($id),
 				[
 					'timeout' => 5,
 					'query' => [
@@ -263,7 +263,7 @@ 
 					],
 				]
 			);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->logger->error(
 				sprintf('Could not get application: %s', $e->getMessage()),
 				[
@@ -274,34 +274,34 @@ 
 		}
 
 		$data = $this->loadData($response->getBody(), 'application');
-		if($data === null) {
+		if ($data === null) {
 			return null;
 		}
 
 		$tmp = $data->data->content;
 		if (is_null($tmp)) {
-			\OCP\Util::writeLog('core', 'No update found at the Nextcloud appstore for app ' . $id, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('core', 'No update found at the Nextcloud appstore for app '.$id, \OCP\Util::DEBUG);
 			return null;
 		}
 
 		$app = [];
-		$app['id'] = (int)$id;
-		$app['name'] = (string)$tmp->name;
-		$app['version'] = (string)$tmp->version;
-		$app['type'] = (string)$tmp->typeid;
-		$app['label'] = (string)$tmp->label;
-		$app['typename'] = (string)$tmp->typename;
-		$app['personid'] = (string)$tmp->personid;
-		$app['profilepage'] = (string)$tmp->profilepage;
-		$app['detailpage'] = (string)$tmp->detailpage;
-		$app['preview1'] = (string)$tmp->smallpreviewpic1;
-		$app['preview2'] = (string)$tmp->smallpreviewpic2;
-		$app['preview3'] = (string)$tmp->smallpreviewpic3;
+		$app['id'] = (int) $id;
+		$app['name'] = (string) $tmp->name;
+		$app['version'] = (string) $tmp->version;
+		$app['type'] = (string) $tmp->typeid;
+		$app['label'] = (string) $tmp->label;
+		$app['typename'] = (string) $tmp->typename;
+		$app['personid'] = (string) $tmp->personid;
+		$app['profilepage'] = (string) $tmp->profilepage;
+		$app['detailpage'] = (string) $tmp->detailpage;
+		$app['preview1'] = (string) $tmp->smallpreviewpic1;
+		$app['preview2'] = (string) $tmp->smallpreviewpic2;
+		$app['preview3'] = (string) $tmp->smallpreviewpic3;
 		$app['changed'] = strtotime($tmp->changed);
-		$app['description'] = (string)$tmp->description;
-		$app['detailpage'] = (string)$tmp->detailpage;
-		$app['score'] = (int)$tmp->score;
-		$app['level'] = (int)$tmp->approved;
+		$app['description'] = (string) $tmp->description;
+		$app['detailpage'] = (string) $tmp->detailpage;
+		$app['score'] = (int) $tmp->score;
+		$app['level'] = (int) $tmp->approved;
 
 		return $app;
 	}
@@ -316,7 +316,7 @@ 
 		if (!$this->isAppStoreEnabled()) {
 			return null;
 		}
-		$url = $this->getAppStoreUrl() . '/content/download/' . urlencode($id) . '/1';
+		$url = $this->getAppStoreUrl().'/content/download/'.urlencode($id).'/1';
 		$client = $this->httpClientService->newClient();
 		try {
 			$response = $client->get(
@@ -328,7 +328,7 @@ 
 					],
 				]
 			);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->logger->error(
 				sprintf('Could not get application download URL: %s', $e->getMessage()),
 				[
@@ -339,14 +339,14 @@ 
 		}
 
 		$data = $this->loadData($response->getBody(), 'application download URL');
-		if($data === null) {
+		if ($data === null) {
 			return null;
 		}
 
 		$tmp = $data->data->content;
 		$app = [];
 		if (isset($tmp->downloadlink)) {
-			$app['downloadlink'] = (string)$tmp->downloadlink;
+			$app['downloadlink'] = (string) $tmp->downloadlink;
 		} else {
 			$app['downloadlink'] = '';
 		}

lib/private/template/resourcenotfoundexception.php

Spacing +1 added lines, -1 removed lines

@@ -41,6 +41,6 @@
 	 * @return string
 	 */
 	public function getResourcePath() {
-		return $this->webPath . '/' . $this->resource;
+		return $this->webPath.'/'.$this->resource;
 	}
 }