nextcloud / server

lib/private/hooks/publicemitter.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC\Hooks;
 
 class PublicEmitter extends BasicEmitter {
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 */
-	public function emit($scope, $method, array $arguments = array()) {
-		parent::emit($scope, $method, $arguments);
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     */
+    public function emit($scope, $method, array $arguments = array()) {
+        parent::emit($scope, $method, $arguments);
+    }
 }

lib/private/hooks/basicemitter.php

Indentation +1 added lines, -1 removed lines

@@ -24,5 +24,5 @@
 namespace OC\Hooks;
 
 abstract class BasicEmitter implements Emitter {
-	use EmitterTrait;
+    use EmitterTrait;
 }

lib/private/hooks/legacyemitter.php

Indentation +4 added lines, -4 removed lines

@@ -24,8 +24,8 @@
 namespace OC\Hooks;
 
 abstract class LegacyEmitter extends BasicEmitter {
-	protected function emit($scope, $method, array $arguments = array()) {
-		\OC_Hook::emit($scope, $method, $arguments);
-		parent::emit($scope, $method, $arguments);
-	}
+    protected function emit($scope, $method, array $arguments = array()) {
+        \OC_Hook::emit($scope, $method, $arguments);
+        parent::emit($scope, $method, $arguments);
+    }
 }

lib/private/hooks/emitter.php

Indentation +14 added lines, -14 removed lines

@@ -32,19 +32,19 @@
  * @package OC\Hooks
  */
 interface Emitter {
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 * @return void
-	 */
-	public function listen($scope, $method, callable $callback);
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     * @return void
+     */
+    public function listen($scope, $method, callable $callback);
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 * @return void
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null);
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     * @return void
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null);
 }

lib/private/hooks/emittertrait.php

Indentation +72 added lines, -72 removed lines

@@ -24,80 +24,80 @@
 
 trait EmitterTrait {
 
-	/**
-	 * @var (callable[])[] $listeners
-	 */
-	protected $listeners = array();
+    /**
+     * @var (callable[])[] $listeners
+     */
+    protected $listeners = array();
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
-		if (!isset($this->listeners[$eventName])) {
-			$this->listeners[$eventName] = array();
-		}
-		if (array_search($callback, $this->listeners[$eventName], true) === false) {
-			$this->listeners[$eventName][] = $callback;
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $eventName = $scope . '::' . $method;
+        if (!isset($this->listeners[$eventName])) {
+            $this->listeners[$eventName] = array();
+        }
+        if (array_search($callback, $this->listeners[$eventName], true) === false) {
+            $this->listeners[$eventName][] = $callback;
+        }
+    }
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$names = array();
-		$allNames = array_keys($this->listeners);
-		if ($scope and $method) {
-			$name = $scope . '::' . $method;
-			if (isset($this->listeners[$name])) {
-				$names[] = $name;
-			}
-		} elseif ($scope) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[0] == $scope) {
-					$names[] = $name;
-				}
-			}
-		} elseif ($method) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[1] == $method) {
-					$names[] = $name;
-				}
-			}
-		} else {
-			$names = $allNames;
-		}
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $names = array();
+        $allNames = array_keys($this->listeners);
+        if ($scope and $method) {
+            $name = $scope . '::' . $method;
+            if (isset($this->listeners[$name])) {
+                $names[] = $name;
+            }
+        } elseif ($scope) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[0] == $scope) {
+                    $names[] = $name;
+                }
+            }
+        } elseif ($method) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[1] == $method) {
+                    $names[] = $name;
+                }
+            }
+        } else {
+            $names = $allNames;
+        }
 
-		foreach ($names as $name) {
-			if ($callback) {
-				$index = array_search($callback, $this->listeners[$name], true);
-				if ($index !== false) {
-					unset($this->listeners[$name][$index]);
-				}
-			} else {
-				$this->listeners[$name] = array();
-			}
-		}
-	}
+        foreach ($names as $name) {
+            if ($callback) {
+                $index = array_search($callback, $this->listeners[$name], true);
+                if ($index !== false) {
+                    unset($this->listeners[$name][$index]);
+                }
+            } else {
+                $this->listeners[$name] = array();
+            }
+        }
+    }
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 */
-	protected function emit($scope, $method, array $arguments = array()) {
-		$eventName = $scope . '::' . $method;
-		if (isset($this->listeners[$eventName])) {
-			foreach ($this->listeners[$eventName] as $callback) {
-				call_user_func_array($callback, $arguments);
-			}
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     */
+    protected function emit($scope, $method, array $arguments = array()) {
+        $eventName = $scope . '::' . $method;
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $callback) {
+                call_user_func_array($callback, $arguments);
+            }
+        }
+    }
 }

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

Indentation +309 added lines, -309 removed lines

@@ -43,314 +43,314 @@
  * @package OC
  */
 class OCSClient {
-	/** @var IClientService */
-	private $httpClientService;
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IClientService $httpClientService
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(IClientService $httpClientService,
-								IConfig $config,
-								ILogger $logger) {
-		$this->httpClientService = $httpClientService;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Returns whether the AppStore is enabled (i.e. because the AppStore is disabled for EE)
-	 *
-	 * @return bool
-	 */
-	public function isAppStoreEnabled() {
-		// For a regular edition default to true, all others default to false
-		$default = false;
-		if (\OC_Util::getEditionString() === '') {
-			$default = true;
-		}
-
-		return $this->config->getSystemValue('appstoreenabled', $default) === true;
-	}
-
-	/**
-	 * Get the url of the OCS AppStore server.
-	 *
-	 * @return string of the AppStore server
-	 */
-	private function getAppStoreUrl() {
-		return $this->config->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1');
-	}
-
-	/**
-	 * @param string $body
-	 * @param string $action
-	 * @return null|\SimpleXMLElement
-	 */
-	private function loadData($body, $action) {
-		$loadEntities = libxml_disable_entity_loader(true);
-		$data = @simplexml_load_string($body);
-		libxml_disable_entity_loader($loadEntities);
-
-		if($data === false) {
-			libxml_clear_errors();
-			$this->logger->error(
-				sprintf('Could not get %s, content was no valid XML', $action),
-				[
-					'app' => 'core',
-				]
-			);
-			return null;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Get all the categories from the OCS server
-	 *
-	 * @param array $targetVersion The target ownCloud version
-	 * @return array|null an array of category ids or null
-	 * @note returns NULL if config value appstoreenabled is set to false
-	 * This function returns a list of all the application categories on the OCS server
-	 */
-	public function getCategories(array $targetVersion) {
-		if (!$this->isAppStoreEnabled()) {
-			return null;
-		}
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get(
-				$this->getAppStoreUrl() . '/content/categories',
-				[
-					'timeout' => 5,
-					'query' => [
-						'version' => implode('x', $targetVersion),
-					],
-				]
-			);
-		} catch(\Exception $e) {
-			$this->logger->error(
-				sprintf('Could not get categories: %s', $e->getMessage()),
-				[
-					'app' => 'core',
-				]
-			);
-			return null;
-		}
-
-		$data = $this->loadData($response->getBody(), 'categories');
-		if($data === null) {
-			return null;
-		}
-
-		$tmp = $data->data;
-		$cats = [];
-
-		foreach ($tmp->category as $value) {
-			$id = (int)$value->id;
-			$name = (string)$value->name;
-			$cats[$id] = $name;
-		}
-
-		return $cats;
-	}
-
-	/**
-	 * Get all the applications from the OCS server
-	 * @param array $categories
-	 * @param int $page
-	 * @param string $filter
-	 * @param array $targetVersion The target ownCloud version
-	 * @return array An array of application data
-	 */
-	public function getApplications(array $categories, $page, $filter, array $targetVersion) {
-		if (!$this->isAppStoreEnabled()) {
-			return [];
-		}
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get(
-				$this->getAppStoreUrl() . '/content/data',
-				[
-					'timeout' => 5,
-					'query' => [
-						'version' => implode('x', $targetVersion),
-						'filter' => $filter,
-						'categories' => implode('x', $categories),
-						'sortmode' => 'new',
-						'page' => $page,
-						'pagesize' => 100,
-						'approved' => $filter
-					],
-				]
-			);
-		} catch(\Exception $e) {
-			$this->logger->error(
-				sprintf('Could not get applications: %s', $e->getMessage()),
-				[
-					'app' => 'core',
-				]
-			);
-			return [];
-		}
-
-		$data = $this->loadData($response->getBody(), 'applications');
-		if($data === null) {
-			return [];
-		}
-
-		$tmp = $data->data->content;
-		$tmpCount = count($tmp);
-
-		$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['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;
-
-			$apps[] = $app;
-		}
-
-		return $apps;
-	}
-
-
-	/**
-	 * Get an the applications from the OCS server
-	 *
-	 * @param string $id
-	 * @param array $targetVersion The target ownCloud version
-	 * @return array|null an array of application data or null
-	 *
-	 * This function returns an applications from the OCS server
-	 */
-	public function getApplication($id, array $targetVersion) {
-		if (!$this->isAppStoreEnabled()) {
-			return null;
-		}
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get(
-				$this->getAppStoreUrl() . '/content/data/' . urlencode($id),
-				[
-					'timeout' => 5,
-					'query' => [
-						'version' => implode('x', $targetVersion),
-					],
-				]
-			);
-		} catch(\Exception $e) {
-			$this->logger->error(
-				sprintf('Could not get application: %s', $e->getMessage()),
-				[
-					'app' => 'core',
-				]
-			);
-			return null;
-		}
-
-		$data = $this->loadData($response->getBody(), 'application');
-		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);
-			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['changed'] = strtotime($tmp->changed);
-		$app['description'] = (string)$tmp->description;
-		$app['detailpage'] = (string)$tmp->detailpage;
-		$app['score'] = (int)$tmp->score;
-		$app['level'] = (int)$tmp->approved;
-
-		return $app;
-	}
-
-	/**
-	 * Get the download url for an application from the OCS server
-	 * @param string $id
-	 * @param array $targetVersion The target ownCloud version
-	 * @return array|null an array of application data or null
-	 */
-	public function getApplicationDownload($id, array $targetVersion) {
-		if (!$this->isAppStoreEnabled()) {
-			return null;
-		}
-		$url = $this->getAppStoreUrl() . '/content/download/' . urlencode($id) . '/1';
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get(
-				$url,
-				[
-					'timeout' => 5,
-					'query' => [
-						'version' => implode('x', $targetVersion),
-					],
-				]
-			);
-		} catch(\Exception $e) {
-			$this->logger->error(
-				sprintf('Could not get application download URL: %s', $e->getMessage()),
-				[
-					'app' => 'core',
-				]
-			);
-			return null;
-		}
-
-		$data = $this->loadData($response->getBody(), 'application download URL');
-		if($data === null) {
-			return null;
-		}
-
-		$tmp = $data->data->content;
-		$app = [];
-		if (isset($tmp->downloadlink)) {
-			$app['downloadlink'] = (string)$tmp->downloadlink;
-		} else {
-			$app['downloadlink'] = '';
-		}
-		return $app;
-	}
+    /** @var IClientService */
+    private $httpClientService;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IClientService $httpClientService
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(IClientService $httpClientService,
+                                IConfig $config,
+                                ILogger $logger) {
+        $this->httpClientService = $httpClientService;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Returns whether the AppStore is enabled (i.e. because the AppStore is disabled for EE)
+     *
+     * @return bool
+     */
+    public function isAppStoreEnabled() {
+        // For a regular edition default to true, all others default to false
+        $default = false;
+        if (\OC_Util::getEditionString() === '') {
+            $default = true;
+        }
+
+        return $this->config->getSystemValue('appstoreenabled', $default) === true;
+    }
+
+    /**
+     * Get the url of the OCS AppStore server.
+     *
+     * @return string of the AppStore server
+     */
+    private function getAppStoreUrl() {
+        return $this->config->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1');
+    }
+
+    /**
+     * @param string $body
+     * @param string $action
+     * @return null|\SimpleXMLElement
+     */
+    private function loadData($body, $action) {
+        $loadEntities = libxml_disable_entity_loader(true);
+        $data = @simplexml_load_string($body);
+        libxml_disable_entity_loader($loadEntities);
+
+        if($data === false) {
+            libxml_clear_errors();
+            $this->logger->error(
+                sprintf('Could not get %s, content was no valid XML', $action),
+                [
+                    'app' => 'core',
+                ]
+            );
+            return null;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get all the categories from the OCS server
+     *
+     * @param array $targetVersion The target ownCloud version
+     * @return array|null an array of category ids or null
+     * @note returns NULL if config value appstoreenabled is set to false
+     * This function returns a list of all the application categories on the OCS server
+     */
+    public function getCategories(array $targetVersion) {
+        if (!$this->isAppStoreEnabled()) {
+            return null;
+        }
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get(
+                $this->getAppStoreUrl() . '/content/categories',
+                [
+                    'timeout' => 5,
+                    'query' => [
+                        'version' => implode('x', $targetVersion),
+                    ],
+                ]
+            );
+        } catch(\Exception $e) {
+            $this->logger->error(
+                sprintf('Could not get categories: %s', $e->getMessage()),
+                [
+                    'app' => 'core',
+                ]
+            );
+            return null;
+        }
+
+        $data = $this->loadData($response->getBody(), 'categories');
+        if($data === null) {
+            return null;
+        }
+
+        $tmp = $data->data;
+        $cats = [];
+
+        foreach ($tmp->category as $value) {
+            $id = (int)$value->id;
+            $name = (string)$value->name;
+            $cats[$id] = $name;
+        }
+
+        return $cats;
+    }
+
+    /**
+     * Get all the applications from the OCS server
+     * @param array $categories
+     * @param int $page
+     * @param string $filter
+     * @param array $targetVersion The target ownCloud version
+     * @return array An array of application data
+     */
+    public function getApplications(array $categories, $page, $filter, array $targetVersion) {
+        if (!$this->isAppStoreEnabled()) {
+            return [];
+        }
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get(
+                $this->getAppStoreUrl() . '/content/data',
+                [
+                    'timeout' => 5,
+                    'query' => [
+                        'version' => implode('x', $targetVersion),
+                        'filter' => $filter,
+                        'categories' => implode('x', $categories),
+                        'sortmode' => 'new',
+                        'page' => $page,
+                        'pagesize' => 100,
+                        'approved' => $filter
+                    ],
+                ]
+            );
+        } catch(\Exception $e) {
+            $this->logger->error(
+                sprintf('Could not get applications: %s', $e->getMessage()),
+                [
+                    'app' => 'core',
+                ]
+            );
+            return [];
+        }
+
+        $data = $this->loadData($response->getBody(), 'applications');
+        if($data === null) {
+            return [];
+        }
+
+        $tmp = $data->data->content;
+        $tmpCount = count($tmp);
+
+        $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['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;
+
+            $apps[] = $app;
+        }
+
+        return $apps;
+    }
+
+
+    /**
+     * Get an the applications from the OCS server
+     *
+     * @param string $id
+     * @param array $targetVersion The target ownCloud version
+     * @return array|null an array of application data or null
+     *
+     * This function returns an applications from the OCS server
+     */
+    public function getApplication($id, array $targetVersion) {
+        if (!$this->isAppStoreEnabled()) {
+            return null;
+        }
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get(
+                $this->getAppStoreUrl() . '/content/data/' . urlencode($id),
+                [
+                    'timeout' => 5,
+                    'query' => [
+                        'version' => implode('x', $targetVersion),
+                    ],
+                ]
+            );
+        } catch(\Exception $e) {
+            $this->logger->error(
+                sprintf('Could not get application: %s', $e->getMessage()),
+                [
+                    'app' => 'core',
+                ]
+            );
+            return null;
+        }
+
+        $data = $this->loadData($response->getBody(), 'application');
+        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);
+            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['changed'] = strtotime($tmp->changed);
+        $app['description'] = (string)$tmp->description;
+        $app['detailpage'] = (string)$tmp->detailpage;
+        $app['score'] = (int)$tmp->score;
+        $app['level'] = (int)$tmp->approved;
+
+        return $app;
+    }
+
+    /**
+     * Get the download url for an application from the OCS server
+     * @param string $id
+     * @param array $targetVersion The target ownCloud version
+     * @return array|null an array of application data or null
+     */
+    public function getApplicationDownload($id, array $targetVersion) {
+        if (!$this->isAppStoreEnabled()) {
+            return null;
+        }
+        $url = $this->getAppStoreUrl() . '/content/download/' . urlencode($id) . '/1';
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get(
+                $url,
+                [
+                    'timeout' => 5,
+                    'query' => [
+                        'version' => implode('x', $targetVersion),
+                    ],
+                ]
+            );
+        } catch(\Exception $e) {
+            $this->logger->error(
+                sprintf('Could not get application download URL: %s', $e->getMessage()),
+                [
+                    'app' => 'core',
+                ]
+            );
+            return null;
+        }
+
+        $data = $this->loadData($response->getBody(), 'application download URL');
+        if($data === null) {
+            return null;
+        }
+
+        $tmp = $data->data->content;
+        $app = [];
+        if (isset($tmp->downloadlink)) {
+            $app['downloadlink'] = (string)$tmp->downloadlink;
+        } else {
+            $app['downloadlink'] = '';
+        }
+        return $app;
+    }
 
 }

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/appconfig.php

Indentation +244 added lines, -244 removed lines

@@ -37,252 +37,252 @@
  * database.
  */
 class AppConfig implements IAppConfig {
-	/**
-	 * @var \OCP\IDBConnection $conn
-	 */
-	protected $conn;
-
-	private $cache = array();
-
-	/**
-	 * @param IDBConnection $conn
-	 */
-	public function __construct(IDBConnection $conn) {
-		$this->conn = $conn;
-		$this->configLoaded = false;
-	}
-
-	/**
-	 * @param string $app
-	 * @return array
-	 */
-	private function getAppValues($app) {
-		$this->loadConfigValues();
-
-		if (isset($this->cache[$app])) {
-			return $this->cache[$app];
-		}
-
-		return [];
-	}
-
-	/**
-	 * Get all apps using the config
-	 *
-	 * @return array an array of app ids
-	 *
-	 * This function returns a list of all apps that have at least one
-	 * entry in the appconfig table.
-	 */
-	public function getApps() {
-		$this->loadConfigValues();
-
-		return $this->getSortedKeys($this->cache);
-	}
-
-	/**
-	 * Get the available keys for an app
-	 *
-	 * @param string $app the app we are looking for
-	 * @return array an array of key names
-	 *
-	 * This function gets all keys of an app. Please note that the values are
-	 * not returned.
-	 */
-	public function getKeys($app) {
-		$this->loadConfigValues();
-
-		if (isset($this->cache[$app])) {
-			return $this->getSortedKeys($this->cache[$app]);
-		}
-
-		return [];
-	}
-
-	public function getSortedKeys($data) {
-		$keys = array_keys($data);
-		sort($keys);
-		return $keys;
-	}
-
-	/**
-	 * Gets the config value
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $default = null, default value if the key does not exist
-	 * @return string the value or $default
-	 *
-	 * This function gets a value from the appconfig table. If the key does
-	 * not exist the default value will be returned
-	 */
-	public function getValue($app, $key, $default = null) {
-		$this->loadConfigValues();
-
-		if ($this->hasKey($app, $key)) {
-			return $this->cache[$app][$key];
-		}
-
-		return $default;
-	}
-
-	/**
-	 * check if a key is set in the appconfig
-	 *
-	 * @param string $app
-	 * @param string $key
-	 * @return bool
-	 */
-	public function hasKey($app, $key) {
-		$this->loadConfigValues();
-
-		return isset($this->cache[$app][$key]);
-	}
-
-	/**
-	 * Sets a value. If the key did not exist before it will be created.
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $value value
-	 * @return bool True if the value was inserted or updated, false if the value was the same
-	 */
-	public function setValue($app, $key, $value) {
-		if (!$this->hasKey($app, $key)) {
-			$inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
-				'appid' => $app,
-				'configkey' => $key,
-				'configvalue' => $value,
-			], [
-				'appid',
-				'configkey',
-			]);
-
-			if ($inserted) {
-				if (!isset($this->cache[$app])) {
-					$this->cache[$app] = [];
-				}
-
-				$this->cache[$app][$key] = $value;
-				return true;
-			}
-		}
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->update('appconfig')
-			->set('configvalue', $sql->createParameter('configvalue'))
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->setParameter('configvalue', $value)
-			->setParameter('app', $app)
-			->setParameter('configkey', $key);
-
-		/*
+    /**
+     * @var \OCP\IDBConnection $conn
+     */
+    protected $conn;
+
+    private $cache = array();
+
+    /**
+     * @param IDBConnection $conn
+     */
+    public function __construct(IDBConnection $conn) {
+        $this->conn = $conn;
+        $this->configLoaded = false;
+    }
+
+    /**
+     * @param string $app
+     * @return array
+     */
+    private function getAppValues($app) {
+        $this->loadConfigValues();
+
+        if (isset($this->cache[$app])) {
+            return $this->cache[$app];
+        }
+
+        return [];
+    }
+
+    /**
+     * Get all apps using the config
+     *
+     * @return array an array of app ids
+     *
+     * This function returns a list of all apps that have at least one
+     * entry in the appconfig table.
+     */
+    public function getApps() {
+        $this->loadConfigValues();
+
+        return $this->getSortedKeys($this->cache);
+    }
+
+    /**
+     * Get the available keys for an app
+     *
+     * @param string $app the app we are looking for
+     * @return array an array of key names
+     *
+     * This function gets all keys of an app. Please note that the values are
+     * not returned.
+     */
+    public function getKeys($app) {
+        $this->loadConfigValues();
+
+        if (isset($this->cache[$app])) {
+            return $this->getSortedKeys($this->cache[$app]);
+        }
+
+        return [];
+    }
+
+    public function getSortedKeys($data) {
+        $keys = array_keys($data);
+        sort($keys);
+        return $keys;
+    }
+
+    /**
+     * Gets the config value
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string $default = null, default value if the key does not exist
+     * @return string the value or $default
+     *
+     * This function gets a value from the appconfig table. If the key does
+     * not exist the default value will be returned
+     */
+    public function getValue($app, $key, $default = null) {
+        $this->loadConfigValues();
+
+        if ($this->hasKey($app, $key)) {
+            return $this->cache[$app][$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * check if a key is set in the appconfig
+     *
+     * @param string $app
+     * @param string $key
+     * @return bool
+     */
+    public function hasKey($app, $key) {
+        $this->loadConfigValues();
+
+        return isset($this->cache[$app][$key]);
+    }
+
+    /**
+     * Sets a value. If the key did not exist before it will be created.
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string $value value
+     * @return bool True if the value was inserted or updated, false if the value was the same
+     */
+    public function setValue($app, $key, $value) {
+        if (!$this->hasKey($app, $key)) {
+            $inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
+                'appid' => $app,
+                'configkey' => $key,
+                'configvalue' => $value,
+            ], [
+                'appid',
+                'configkey',
+            ]);
+
+            if ($inserted) {
+                if (!isset($this->cache[$app])) {
+                    $this->cache[$app] = [];
+                }
+
+                $this->cache[$app][$key] = $value;
+                return true;
+            }
+        }
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->update('appconfig')
+            ->set('configvalue', $sql->createParameter('configvalue'))
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+            ->setParameter('configvalue', $value)
+            ->setParameter('app', $app)
+            ->setParameter('configkey', $key);
+
+        /*
 		 * Only limit to the existing value for non-Oracle DBs:
 		 * http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
 		 * > Large objects (LOBs) are not supported in comparison conditions.
 		 */
-		if (!($this->conn instanceof \OC\DB\OracleConnection)) {
-			// Only update the value when it is not the same
-			$sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
-				->setParameter('configvalue', $value);
-		}
-
-		$changedRow = (bool) $sql->execute();
-
-		$this->cache[$app][$key] = $value;
-
-		return $changedRow;
-	}
-
-	/**
-	 * Deletes a key
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @return boolean|null
-	 */
-	public function deleteKey($app, $key) {
-		$this->loadConfigValues();
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->delete('appconfig')
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->setParameter('app', $app)
-			->setParameter('configkey', $key);
-		$sql->execute();
-
-		unset($this->cache[$app][$key]);
-	}
-
-	/**
-	 * Remove app from appconfig
-	 *
-	 * @param string $app app
-	 * @return boolean|null
-	 *
-	 * Removes all keys in appconfig belonging to the app.
-	 */
-	public function deleteApp($app) {
-		$this->loadConfigValues();
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->delete('appconfig')
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->setParameter('app', $app);
-		$sql->execute();
-
-		unset($this->cache[$app]);
-	}
-
-	/**
-	 * get multiple values, either the app or key can be used as wildcard by setting it to false
-	 *
-	 * @param string|false $app
-	 * @param string|false $key
-	 * @return array|false
-	 */
-	public function getValues($app, $key) {
-		if (($app !== false) === ($key !== false)) {
-			return false;
-		}
-
-		if ($key === false) {
-			return $this->getAppValues($app);
-		} else {
-			$appIds = $this->getApps();
-			$values = array_map(function($appId) use ($key) {
-				return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
-			}, $appIds);
-			$result = array_combine($appIds, $values);
-
-			return array_filter($result);
-		}
-	}
-
-	/**
-	 * Load all the app config values
-	 */
-	protected function loadConfigValues() {
-		if ($this->configLoaded) return;
-
-		$this->cache = [];
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->select('*')
-			->from('appconfig');
-		$result = $sql->execute();
-
-		while ($row = $result->fetch()) {
-			if (!isset($this->cache[$row['appid']])) {
-				$this->cache[$row['appid']] = [];
-			}
-
-			$this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
-		}
-		$result->closeCursor();
-
-		$this->configLoaded = true;
-	}
+        if (!($this->conn instanceof \OC\DB\OracleConnection)) {
+            // Only update the value when it is not the same
+            $sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
+                ->setParameter('configvalue', $value);
+        }
+
+        $changedRow = (bool) $sql->execute();
+
+        $this->cache[$app][$key] = $value;
+
+        return $changedRow;
+    }
+
+    /**
+     * Deletes a key
+     *
+     * @param string $app app
+     * @param string $key key
+     * @return boolean|null
+     */
+    public function deleteKey($app, $key) {
+        $this->loadConfigValues();
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->delete('appconfig')
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+            ->setParameter('app', $app)
+            ->setParameter('configkey', $key);
+        $sql->execute();
+
+        unset($this->cache[$app][$key]);
+    }
+
+    /**
+     * Remove app from appconfig
+     *
+     * @param string $app app
+     * @return boolean|null
+     *
+     * Removes all keys in appconfig belonging to the app.
+     */
+    public function deleteApp($app) {
+        $this->loadConfigValues();
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->delete('appconfig')
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->setParameter('app', $app);
+        $sql->execute();
+
+        unset($this->cache[$app]);
+    }
+
+    /**
+     * get multiple values, either the app or key can be used as wildcard by setting it to false
+     *
+     * @param string|false $app
+     * @param string|false $key
+     * @return array|false
+     */
+    public function getValues($app, $key) {
+        if (($app !== false) === ($key !== false)) {
+            return false;
+        }
+
+        if ($key === false) {
+            return $this->getAppValues($app);
+        } else {
+            $appIds = $this->getApps();
+            $values = array_map(function($appId) use ($key) {
+                return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
+            }, $appIds);
+            $result = array_combine($appIds, $values);
+
+            return array_filter($result);
+        }
+    }
+
+    /**
+     * Load all the app config values
+     */
+    protected function loadConfigValues() {
+        if ($this->configLoaded) return;
+
+        $this->cache = [];
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->select('*')
+            ->from('appconfig');
+        $result = $sql->execute();
+
+        while ($row = $result->fetch()) {
+            if (!isset($this->cache[$row['appid']])) {
+                $this->cache[$row['appid']] = [];
+            }
+
+            $this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
+        }
+        $result->closeCursor();
+
+        $this->configLoaded = true;
+    }
 }

Braces +3 added lines, -1 removed lines

@@ -265,7 +265,9 @@
 	 * Load all the app config values
 	 */
 	protected function loadConfigValues() {
-		if ($this->configLoaded) return;
+		if ($this->configLoaded) {
+		    return;
+		}
 
 		$this->cache = [];
 

lib/private/template/resourcenotfoundexception.php

Indentation +17 added lines, -17 removed lines

@@ -24,23 +24,23 @@
 namespace OC\Template;
 
 class ResourceNotFoundException extends \LogicException {
-	protected $resource;
-	protected $webPath;
+    protected $resource;
+    protected $webPath;
 
-	/**
-	 * @param string $resource
-	 * @param string $webPath
-	 */
-	public function __construct($resource, $webPath) {
-		parent::__construct('Resource not found');
-		$this->resource = $resource;
-		$this->webPath = $webPath;
-	}
+    /**
+     * @param string $resource
+     * @param string $webPath
+     */
+    public function __construct($resource, $webPath) {
+        parent::__construct('Resource not found');
+        $this->resource = $resource;
+        $this->webPath = $webPath;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getResourcePath() {
-		return $this->webPath . '/' . $this->resource;
-	}
+    /**
+     * @return string
+     */
+    public function getResourcePath() {
+        return $this->webPath . '/' . $this->resource;
+    }
 }

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;
 	}
 }

lib/private/template/resourcelocator.php

Indentation +95 added lines, -95 removed lines

@@ -27,110 +27,110 @@
 namespace OC\Template;
 
 abstract class ResourceLocator {
-	protected $theme;
+    protected $theme;
 
-	protected $mapping;
-	protected $serverroot;
-	protected $thirdpartyroot;
-	protected $webroot;
+    protected $mapping;
+    protected $serverroot;
+    protected $thirdpartyroot;
+    protected $webroot;
 
-	protected $resources = array();
+    protected $resources = array();
 
-	/** @var \OCP\ILogger */
-	protected $logger;
+    /** @var \OCP\ILogger */
+    protected $logger;
 
-	/**
-	 * @param \OCP\ILogger $logger
-	 * @param string $theme
-	 * @param array $core_map
-	 * @param array $party_map
-	 */
-	public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map) {
-		$this->logger = $logger;
-		$this->theme = $theme;
-		$this->mapping = $core_map + $party_map;
-		$this->serverroot = key($core_map);
-		$this->thirdpartyroot = key($party_map);
-		$this->webroot = $this->mapping[$this->serverroot];
-	}
+    /**
+     * @param \OCP\ILogger $logger
+     * @param string $theme
+     * @param array $core_map
+     * @param array $party_map
+     */
+    public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map) {
+        $this->logger = $logger;
+        $this->theme = $theme;
+        $this->mapping = $core_map + $party_map;
+        $this->serverroot = key($core_map);
+        $this->thirdpartyroot = key($party_map);
+        $this->webroot = $this->mapping[$this->serverroot];
+    }
 
-	/**
-	 * @param string $resource
-	 */
-	abstract public function doFind($resource);
+    /**
+     * @param string $resource
+     */
+    abstract public function doFind($resource);
 
-	/**
-	 * @param string $resource
-	 */
-	abstract public function doFindTheme($resource);
+    /**
+     * @param string $resource
+     */
+    abstract public function doFindTheme($resource);
 
-	/**
-	 * Finds the resources and adds them to the list
-	 *
-	 * @param array $resources
-	 */
-	public function find($resources) {
-		foreach ($resources as $resource) {
-			try {
-				$this->doFind($resource);
-			} catch (ResourceNotFoundException $e) {
-				$resourceApp = substr($resource, 0, strpos($resource, '/'));
-				$this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
-			}
-		}
-		if (!empty($this->theme)) {
-			foreach ($resources as $resource) {
-				try {
-					$this->doFindTheme($resource);
-				} catch (ResourceNotFoundException $e) {
-					$resourceApp = substr($resource, 0, strpos($resource, '/'));
-					$this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
-				}
-			}
-		}
-	}
+    /**
+     * Finds the resources and adds them to the list
+     *
+     * @param array $resources
+     */
+    public function find($resources) {
+        foreach ($resources as $resource) {
+            try {
+                $this->doFind($resource);
+            } catch (ResourceNotFoundException $e) {
+                $resourceApp = substr($resource, 0, strpos($resource, '/'));
+                $this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+            }
+        }
+        if (!empty($this->theme)) {
+            foreach ($resources as $resource) {
+                try {
+                    $this->doFindTheme($resource);
+                } catch (ResourceNotFoundException $e) {
+                    $resourceApp = substr($resource, 0, strpos($resource, '/'));
+                    $this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+                }
+            }
+        }
+    }
 
-	/**
-	 * append the $file resource if exist at $root
-	 *
-	 * @param string $root path to check
-	 * @param string $file the filename
-	 * @param string|null $webRoot base for path, default map $root to $webRoot
-	 * @return bool True if the resource was found, false otherwise
-	 */
-	protected function appendIfExist($root, $file, $webRoot = null) {
-		if (is_file($root.'/'.$file)) {
-			$this->append($root, $file, $webRoot, false);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * append the $file resource if exist at $root
+     *
+     * @param string $root path to check
+     * @param string $file the filename
+     * @param string|null $webRoot base for path, default map $root to $webRoot
+     * @return bool True if the resource was found, false otherwise
+     */
+    protected function appendIfExist($root, $file, $webRoot = null) {
+        if (is_file($root.'/'.$file)) {
+            $this->append($root, $file, $webRoot, false);
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * append the $file resource at $root
-	 *
-	 * @param string $root path to check
-	 * @param string $file the filename
-	 * @param string|null $webRoot base for path, default map $root to $webRoot
-	 * @param bool $throw Throw an exception, when the route does not exist
-	 * @throws ResourceNotFoundException Only thrown when $throw is true and the resource is missing
-	 */
-	protected function append($root, $file, $webRoot = null, $throw = true) {
-		if (!$webRoot) {
-			$webRoot = $this->mapping[$root];
-		}
-		$this->resources[] = array($root, $webRoot, $file);
+    /**
+     * append the $file resource at $root
+     *
+     * @param string $root path to check
+     * @param string $file the filename
+     * @param string|null $webRoot base for path, default map $root to $webRoot
+     * @param bool $throw Throw an exception, when the route does not exist
+     * @throws ResourceNotFoundException Only thrown when $throw is true and the resource is missing
+     */
+    protected function append($root, $file, $webRoot = null, $throw = true) {
+        if (!$webRoot) {
+            $webRoot = $this->mapping[$root];
+        }
+        $this->resources[] = array($root, $webRoot, $file);
 
-		if ($throw && !is_file($root . '/' . $file)) {
-			throw new ResourceNotFoundException($file, $webRoot);
-		}
-	}
+        if ($throw && !is_file($root . '/' . $file)) {
+            throw new ResourceNotFoundException($file, $webRoot);
+        }
+    }
 
-	/**
-	 * Returns the list of all resources that should be loaded
-	 * @return array
-	 */
-	public function getResources() {
-		return $this->resources;
-	}
+    /**
+     * Returns the list of all resources that should be loaded
+     * @return array
+     */
+    public function getResources() {
+        return $this->resources;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 				$this->doFind($resource);
 			} catch (ResourceNotFoundException $e) {
 				$resourceApp = substr($resource, 0, strpos($resource, '/'));
-				$this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+				$this->logger->error('Could not find resource file "'.$e->getResourcePath().'"', ['app' => $resourceApp]);
 			}
 		}
 		if (!empty($this->theme)) {
@@ -84,7 +84,7 @@ 
 					$this->doFindTheme($resource);
 				} catch (ResourceNotFoundException $e) {
 					$resourceApp = substr($resource, 0, strpos($resource, '/'));
-					$this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+					$this->logger->error('Could not find resource file "'.$e->getResourcePath().'"', ['app' => $resourceApp]);
 				}
 			}
 		}
@@ -121,7 +121,7 @@ 
 		}
 		$this->resources[] = array($root, $webRoot, $file);
 
-		if ($throw && !is_file($root . '/' . $file)) {
+		if ($throw && !is_file($root.'/'.$file)) {
 			throw new ResourceNotFoundException($file, $webRoot);
 		}
 	}