jenskooij / cloudcontrol

cloudcontrol/library/cc/Application.php

Spacing +8 added lines, -8 removed lines

@@ -65,12 +65,12 @@ 
 		 */
 		private function config()
 		{
-			$configPath = __DIR__ . '/../../config.json';
+			$configPath = __DIR__.'/../../config.json';
 			if (realpath($configPath) !== false) {
 				$json = file_get_contents($configPath);
 				$this->config = json_decode($json);
 			} else {
-				throw new \Exception('Couldn\'t find config file in path ' . $configPath);
+				throw new \Exception('Couldn\'t find config file in path '.$configPath);
 			}
 		}
 
@@ -93,7 +93,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -156,17 +156,17 @@ 
 		 * @return mixed
 		 * @throws \Exception
 		 */
-		private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem)
+		private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
 		{
-			$libraryComponentName = '\\library\\components\\' . $class;
-			$userComponentName = '\\components\\' . $class;
+			$libraryComponentName = '\\library\\components\\'.$class;
+			$userComponentName = '\\components\\'.$class;
 			
 			if (\autoLoad($libraryComponentName, false)) {
 				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} elseif (\autoLoad($userComponentName, false)) {
 				$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} else {
-				throw new \Exception('Could not load component ' . $class);
+				throw new \Exception('Could not load component '.$class);
 			}
 			
 			if (!$component instanceof Component) {
@@ -225,7 +225,7 @@ 
 		public function setCachingHeaders()
 		{
 			header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-			header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+			header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
 		}
 
 		/**

cloudcontrol/library/components/BaseComponent.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -67,7 +67,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -93,9 +93,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
-			$templatePath = __DIR__ . '/../../templates/' . $template . '.php';
+			$templatePath = __DIR__.'/../../templates/'.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -112,7 +112,7 @@ 
 				return ob_get_contents();
 			} else {
 				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
+					throw new \Exception('Couldnt find template '.$templatePath);
 				}
 			}
 		}
@@ -127,7 +127,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {

cloudcontrol/library/components/LanguageComponent.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     /**
      * Detect if the language is switched manually
      *
-     * @param $request
+     * @param Request $request
      */
     private function checkLanguageSwitch($request)
     {

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 
         if ($this->forceRedirect === true) {
             if (substr($request::$relativeUri, 0, 2) !== $lang && $lang !== $this->defaultLanguage) { // if default language detected, no redirect
-                header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+                header('Location: '.$request::$subfolders.$lang.'/'.$request::$relativeUri);
                 exit;
             }
         }

Indentation +112 added lines, -112 removed lines

@@ -7,118 +7,118 @@
 
 class LanguageComponent implements Component
 {
-    protected $request;
-    protected $parameters;
-
-    protected $defaultLanguage = 'en';
-    protected $acceptedLanguages = null;
-    protected $languageParameterName = 'language';
-    protected $forceRedirect = false;
-    protected $sessionValues;
-
-    /**
-     * Component constructor.
-     *
-     * @param                     $template
-     * @param Request $request
-     * @param                     $parameters
-     * @param                     $matchedSitemapItem
-     */
-    public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
-    {
-        $this->parameters = (array) $parameters;
-        $this->checkParameters();
-
-        $lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
-        $_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
-
-        $this->checkLanguageSwitch($request);
-
-        if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
-            $this->detectLanguage($lang, $request);
-        }
-
-        $this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
-    }
-
-    /**
-     * Checks to see if any parameters are given from the configuration in the CMS
-     */
-    private function checkParameters()
-    {
-        if (isset($this->parameters['defaultLanguage'])) {
-            $this->defaultLanguage = $this->parameters['defaultLanguage'];
-            unset($this->parameters['defaultLanguage']);
-        }
-        if (isset($this->parameters['acceptedLanguages'])) {
-            $this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
-            unset($this->parameters['acceptedLanguages']);
-        }
-        if (isset($this->parameters['languageParameterName'])) {
-            $this->languageParameterName = $this->parameters['languageParameterName'];
-            unset($this->parameters['languageParameterName']);
-        }
-        if (isset($this->parameters['forceRedirect'])) {
-            $this->forceRedirect = (bool) $this->parameters['forceRedirect'];
-            unset($this->parameters['forceRedirect']);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-
-    /**
-     * Check if the found language is allowed and
-     * if an action is to be taken.
-     *
-     * @param $lang
-     * @param $request
-     */
-    private function detectLanguage($lang, $request)
-    {
-        $_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
-
-        if ($this->acceptedLanguages === null) {
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
-        } else if (in_array($lang, $this->acceptedLanguages)) {
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
-        } else {
-            $lang = $this->defaultLanguage;
-        }
-
-        $this->sessionValues = $_SESSION['LanguageComponent'];
-
-        if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang && $lang !== $this->defaultLanguage) { // if default language detected, no redirect
-                header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
-                exit;
-            }
-        }
-    }
-
-    /**
-     * Detect if the language is switched manually
-     *
-     * @param $request
-     */
-    private function checkLanguageSwitch($request)
-    {
-        if (isset($request::$get['langSwitch'])) {
-            $this->forceRedirect = true;
-            $this->detectLanguage($request::$get['langSwitch'], $request);
-        }
-    }
-
-    /*
+	protected $request;
+	protected $parameters;
+
+	protected $defaultLanguage = 'en';
+	protected $acceptedLanguages = null;
+	protected $languageParameterName = 'language';
+	protected $forceRedirect = false;
+	protected $sessionValues;
+
+	/**
+	 * Component constructor.
+	 *
+	 * @param                     $template
+	 * @param Request $request
+	 * @param                     $parameters
+	 * @param                     $matchedSitemapItem
+	 */
+	public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
+	{
+		$this->parameters = (array) $parameters;
+		$this->checkParameters();
+
+		$lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
+		$_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
+
+		$this->checkLanguageSwitch($request);
+
+		if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
+			$this->detectLanguage($lang, $request);
+		}
+
+		$this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
+	}
+
+	/**
+	 * Checks to see if any parameters are given from the configuration in the CMS
+	 */
+	private function checkParameters()
+	{
+		if (isset($this->parameters['defaultLanguage'])) {
+			$this->defaultLanguage = $this->parameters['defaultLanguage'];
+			unset($this->parameters['defaultLanguage']);
+		}
+		if (isset($this->parameters['acceptedLanguages'])) {
+			$this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
+			unset($this->parameters['acceptedLanguages']);
+		}
+		if (isset($this->parameters['languageParameterName'])) {
+			$this->languageParameterName = $this->parameters['languageParameterName'];
+			unset($this->parameters['languageParameterName']);
+		}
+		if (isset($this->parameters['forceRedirect'])) {
+			$this->forceRedirect = (bool) $this->parameters['forceRedirect'];
+			unset($this->parameters['forceRedirect']);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getParameters()
+	{
+		return $this->parameters;
+	}
+
+
+	/**
+	 * Check if the found language is allowed and
+	 * if an action is to be taken.
+	 *
+	 * @param $lang
+	 * @param $request
+	 */
+	private function detectLanguage($lang, $request)
+	{
+		$_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
+
+		if ($this->acceptedLanguages === null) {
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
+		} else if (in_array($lang, $this->acceptedLanguages)) {
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
+		} else {
+			$lang = $this->defaultLanguage;
+		}
+
+		$this->sessionValues = $_SESSION['LanguageComponent'];
+
+		if ($this->forceRedirect === true) {
+			if (substr($request::$relativeUri, 0, 2) !== $lang && $lang !== $this->defaultLanguage) { // if default language detected, no redirect
+				header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+				exit;
+			}
+		}
+	}
+
+	/**
+	 * Detect if the language is switched manually
+	 *
+	 * @param $request
+	 */
+	private function checkLanguageSwitch($request)
+	{
+		if (isset($request::$get['langSwitch'])) {
+			$this->forceRedirect = true;
+			$this->detectLanguage($request::$get['langSwitch'], $request);
+		}
+	}
+
+	/*
      * These functions are required by the interface, but not for the functionality
      */
-    public function run(Storage $storage) {}
-    public function render() {}
-    public function get() {}
+	public function run(Storage $storage) {}
+	public function render() {}
+	public function get() {}
 }
\ No newline at end of file

cloudcontrol/library/components/DocumentComponent.php

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 			if (isset($this->parameters['document'])) {
 				$this->runByDocumentParameter();
 			} else {
-				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
+				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: '.$this->matchedSitemapItem->title);
 			}
 		}
 
@@ -100,9 +100,9 @@ 
 				$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
 				if (isset($this->parameters['folder'])) {
 					if (substr($this->parameters['folder'], -1) !== '/') {
-						$this->parameters['folder'] = $this->parameters['folder'] . '/';
+						$this->parameters['folder'] = $this->parameters['folder'].'/';
 					}
-					$relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
+					$relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri;
 				}
 
 				$document = $this->storage->getDocumentBySlug($relativeDocumentUri);

cloudcontrol/library/components/CmsComponent.php

Doc Comments +6 added lines, -6 removed lines

@@ -167,7 +167,7 @@ 
 		}
 
 		/**
-		 * @param $request
+		 * @param \library\cc\Request $request
 		 * @return mixed|string
          */
 		private function getRelativeCmsUri($request)
@@ -182,7 +182,7 @@ 
 		}
 
 		/**
-		 * @param $request
+		 * @param \library\cc\Request $request
 		 * @param $relativeCmsUri
          */
 		private function documentsRouting($request, $relativeCmsUri)
@@ -197,7 +197,7 @@ 
 		}
 
 		/**
-		 * @param $request
+		 * @param \library\cc\Request $request
 		 * @param $relativeCmsUri
          */
 		private function sitemapRouting($request, $relativeCmsUri)
@@ -235,7 +235,7 @@ 
 		}
 
 		/**
-		 * @param $request
+		 * @param \library\cc\Request $request
 		 * @param $relativeCmsUri
          */
 		private function imagesRouting($request, $relativeCmsUri)
@@ -285,7 +285,7 @@ 
 		}
 
 		/**
-		 * @param $request
+		 * @param \library\cc\Request $request
 		 * @param $relativeCmsUri
          */
 		private function filesRouting($request, $relativeCmsUri)
@@ -336,7 +336,7 @@ 
 		}
 
 		/**
-		 * @param $request
+		 * @param \library\cc\Request $request
 		 * @param $relativeCmsUri
          */
 		private function configurationRouting($request, $relativeCmsUri)

Indentation +18 added lines, -18 removed lines

@@ -18,7 +18,7 @@ 
 
 		/**
 		 * @var null
-         */
+		 */
 		protected $subTemplate = null;
 
 		/**
@@ -139,7 +139,7 @@ 
 		/**
 		 * @param $remoteAddress
 		 * @throws \Exception
-         */
+		 */
 		private function checkWhiteList($remoteAddress)
 		{
 			if (isset($this->parameters['whitelistIps'])) {
@@ -154,7 +154,7 @@ 
 		/**
 		 * @param $remoteAddress
 		 * @throws \Exception
-         */
+		 */
 		private function checkBlackList($remoteAddress)
 		{
 			if (isset($this->parameters['blacklistIps'])) {
@@ -169,7 +169,7 @@ 
 		/**
 		 * @param $request
 		 * @return mixed|string
-         */
+		 */
 		private function getRelativeCmsUri($request)
 		{
 			// TODO Use regex match parameter instead of calculating relative uri
@@ -184,7 +184,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function documentsRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/documents') {
@@ -199,7 +199,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function sitemapRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/sitemap') {
@@ -237,7 +237,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function imagesRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/images') {
@@ -269,7 +269,7 @@ 
 
 		/**
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function apiRouting($relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/images.json') {
@@ -287,7 +287,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function filesRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/files') {
@@ -313,7 +313,7 @@ 
 
 		/**
 		 * @param $slug
-         */
+		 */
 		private function downloadFile($slug)
 		{
 			$file = $this->storage->getFileByName($slug);
@@ -338,7 +338,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function configurationRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration') {
@@ -357,7 +357,7 @@ 
 		 * @param $request
 		 * @param $relativeCmsUri
 		 * @throws \Exception
-         */
+		 */
 		private function documentRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/documents/new-document' && isset($request::$get['path'])) {
@@ -412,7 +412,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function folderRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get['path'])) {
@@ -453,7 +453,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function usersRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/users') {
@@ -487,7 +487,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function documentTypesRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/document-types') {
@@ -526,7 +526,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function bricksRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/bricks') {
@@ -565,7 +565,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function imageSetRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/image-set') {
@@ -600,7 +600,7 @@ 
 		/**
 		 * @param $request
 		 * @param $relativeCmsUri
-         */
+		 */
 		private function applicationComponentRouting($request, $relativeCmsUri)
 		{
 			if ($relativeCmsUri == '/configuration/application-components') {

Spacing +38 added lines, -38 removed lines

@@ -146,7 +146,7 @@ 
 				$whitelistIps = explode(',', $this->parameters['whitelistIps']);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -161,7 +161,7 @@ 
 				$blacklistIps = explode(',', $this->parameters['blacklistIps']);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}
@@ -214,7 +214,7 @@ 
 				$this->parameters['mainNavClass'] = 'sitemap';
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->addSitemapItem($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get['slug'])) {
@@ -223,13 +223,13 @@ 
 				$sitemapItem = $this->storage->getSitemapItemBySlug($request::$get['slug']);
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->saveSitemapItem($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 				$this->parameters['sitemapItem'] = $sitemapItem;
 			} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteSitemapItemBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 				exit;
 			}
 		}
@@ -253,12 +253,12 @@ 
 				$this->parameters['mainNavClass'] = 'images';
 				if (isset($_FILES['file'])) {
 					$this->storage->addImage($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get['file'])) {
 				$this->storage->deleteImageByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 				exit;
 			} elseif ($relativeCmsUri == '/images/show' && isset($request::$get['file'])) {
 				$this->subTemplate = 'cms/images/show';
@@ -299,14 +299,14 @@ 
 				$this->parameters['mainNavClass'] = 'files';
 				if (isset($_FILES['file'])) {
 					$this->storage->addFile($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/files/get' && isset($request::$get['file'])) {
 				$this->downloadFile($request::$get['file']);
 			} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get['file'])) {
 				$this->storage->deleteFileByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 				exit;
 			}
 		}
@@ -317,21 +317,21 @@ 
 		private function downloadFile($slug)
 		{
 			$file = $this->storage->getFileByName($slug);
-			$path = realpath(__DIR__ . '/../../www/files/');
-			$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-			$size   = filesize($path . '/' . $file->file);
+			$path = realpath(__DIR__.'/../../www/files/');
+			$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+			$size   = filesize($path.'/'.$file->file);
 
 			header('Content-Description: File Transfer');
-			header('Content-Type: ' . $file->type);
-			header('Content-Disposition: attachment; filename=' . $quoted);
+			header('Content-Type: '.$file->type);
+			header('Content-Disposition: attachment; filename='.$quoted);
 			header('Content-Transfer-Encoding: binary');
 			header('Connection: Keep-Alive');
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header('Pragma: public');
-			header('Content-Length: ' . $size);
+			header('Content-Length: '.$size);
 
-			readfile($path . '/' . $file->file);
+			readfile($path.'/'.$file->file);
 			exit;
 		}
 
@@ -367,7 +367,7 @@ 
 				if (isset($request::$get['documentType'])) {
 					if (isset($request::$post['title'], $request::$get['documentType'], $request::$get['path'])) {
 						$this->storage->addDocument($request::$post);
-						header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+						header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 						exit;
 					}
 					$this->parameters['documentType'] = $this->storage->getDocumentTypeBySlug($request::$get['documentType'], true);
@@ -381,7 +381,7 @@ 
 				$this->parameters['smallestImage'] = $this->storage->getSmallestImageSet()->slug;
 				if (isset($request::$post['title'], $request::$get['slug'])) {
 					$this->storage->saveDocument($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 				$this->parameters['document'] = $this->storage->getDocumentBySlug($request::$get['slug']);
@@ -404,7 +404,7 @@ 
 				die(json_encode($result));
 			} else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			}
 		}
@@ -420,7 +420,7 @@ 
 				$this->parameters['mainNavClass'] = 'documents';
 				if (isset($request::$post['title'], $request::$post['path'])) {
 					$this->storage->addDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 			} else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get['slug'])) {
@@ -433,11 +433,11 @@ 
 				array_pop($path);
 				$path = implode('/', $path);
 
-				$request::$get['path'] = '/' . $path;
+				$request::$get['path'] = '/'.$path;
 
 				if (isset($request::$post['title'], $request::$post['content'])) {
 					$this->storage->saveDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 
@@ -445,7 +445,7 @@ 
 				$this->parameters['folder'] = $folder;
 			} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentFolderBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			}
 		}
@@ -465,12 +465,12 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($_POST['username'])) {
 					$this->storage->addUser($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteUserBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get['slug'])) {
 				$this->subTemplate = 'cms/configuration/users-form';
@@ -478,7 +478,7 @@ 
 				$this->parameters['user'] = $this->storage->getUserBySlug($request::$get['slug']);
 				if (isset($_POST['username'])) {
 					$this->storage->saveUser($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			}
@@ -500,7 +500,7 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->addDocumentType($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['bricks'] = $bricks;
@@ -511,14 +511,14 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->saveDocumentType($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['documentType'] = $documentType;
 				$this->parameters['bricks'] = $bricks;
 			} elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentTypeBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 				exit;
 			}
 		}
@@ -538,7 +538,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addBrick($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get['slug'])) {
@@ -547,13 +547,13 @@ 
 				$brick = $this->storage->getBrickBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveBrick($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 				$this->parameters['brick'] = $brick;
 			} elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteBrickBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/image-set') {
 				$this->subTemplate = 'cms/configuration/image-set';
@@ -578,7 +578,7 @@ 
 				$imageSet = $this->storage->getImageSetBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveImageSet($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 				$this->parameters['imageSet'] = $imageSet;
@@ -587,12 +587,12 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addImageSet($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteImageSetBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 				exit;
 			}
 		}
@@ -612,7 +612,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addApplicationComponent($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get['slug'])) {
@@ -621,13 +621,13 @@ 
 				$applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveApplicationComponent($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 					exit;
 				}
 				$this->parameters['applicationComponent'] = $applicationComponent;
 			} elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteApplicationComponentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 				exit;
 			}
 		}