jenskooij / cloudcontrol

cloudcontrol/library/images/ImageResizer.php

Spacing +18 added lines, -18 removed lines

@@ -43,7 +43,7 @@ 
 				}
 				return $returnFileNames;
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 
@@ -54,10 +54,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function resize($imagePath='', $width='',$height='')
+		public function resize($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-r' . $width . 'x' . $height;
-			return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
+			$modifier = '-r'.$width.'x'.$height;
+			return $this->applyMethod('Resize', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -67,10 +67,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function smartcrop($imagePath='', $width='',$height='')
+		public function smartcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-s' . $width . 'x' . $height;
-			return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-s'.$width.'x'.$height;
+			return $this->applyMethod('SmartCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -80,10 +80,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function boxcrop($imagePath='', $width='',$height='')
+		public function boxcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-b' . $width . 'x' . $height;
-			return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-b'.$width.'x'.$height;
+			return $this->applyMethod('BoxCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -92,7 +92,7 @@ 
 		 *
 		 * @return string
 		 */
-		private function modifyName($imagePath, $modifier='')
+		private function modifyName($imagePath, $modifier = '')
 		{
 			$filename = basename($imagePath);
 			$path = dirname($imagePath);
@@ -102,30 +102,30 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+				$filename = $fileNameWithoutExtension.$modifier.'.'.$extension;
 			} else {
 				$filename = slugify($filename);
 			}
 
-			if (file_exists($path . '/' . $filename)) {
+			if (file_exists($path.'/'.$filename)) {
 				$fileParts = explode('.', $filename);
 				if (count($fileParts) > 1) {
 					$extension = end($fileParts);
 					array_pop($fileParts);
 					$fileNameWithoutExtension = implode('-', $fileParts);
 					$fileNameWithoutExtension .= '-copy';
-					$filename = $fileNameWithoutExtension . '.' . $extension;
+					$filename = $fileNameWithoutExtension.'.'.$extension;
 				} else {
 					$filename .= '-copy';
 				}
-				return $this->modifyName($path . '/' . $filename);
+				return $this->modifyName($path.'/'.$filename);
 			}
-			return $path . '/' . $filename;
+			return $path.'/'.$filename;
 		}
 
 		private function applyMethod($method, $imagePath, $width, $height, $modifier)
 		{
-			$method = 'library\\images\\methods\\' . $method;
+			$method = 'library\\images\\methods\\'.$method;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -139,7 +139,7 @@ 
 				$resizedImage->SaveImage($destination, $resizedImage->GetImageMimeType($imagePath), 80);
 				return basename($destination);
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 	}

cloudcontrol/library/components/FormComponent.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
             unset($request::$get['path']);
         }
         if ($this->isFormSubmitted($this->request)) {
-            $this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+            $this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage;
         } else {
             $this->parameters[$this->formParameterName] = $form;
         }
@@ -197,7 +197,7 @@ 
         $postValues = $request::$post;
         $postValues['documentType'] = $this->documentType;
         $postValues['path'] = $this->responseFolder;
-        $postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+        $postValues['title'] = date('r').' - From: '.$request::$requestUri;
     }
 
     /**

Doc Comments +4 added lines, -4 removed lines

@@ -132,7 +132,7 @@ 
 
     /**
      * Sets variables needed for rendering the form template
-     * @param $storage
+     * @param Storage $storage
      */
     private function initialize($storage)
     {
@@ -168,7 +168,7 @@ 
      * submitting the form
      *
      * @param $postValues
-     * @param $storage
+     * @param Storage $storage
      */
     protected function postSubmit($postValues, $storage)
     {}
@@ -191,7 +191,7 @@ 
     /**
      * Checks if this form has been submitted
      *
-     * @param $request
+     * @param \library\cc\Request $request
      * @return bool
      */
     private function isFormSubmitted($request)
@@ -202,7 +202,7 @@ 
     /**
      *
      *
-     * @param $request
+     * @param \library\cc\Request $request
      */
     private function getPostValues($request)
     {

Indentation +244 added lines, -244 removed lines

@@ -7,248 +7,248 @@
 
 class FormComponent Extends BaseComponent
 {
-    /**
-     * @var null|string
-     */
-    protected $documentType = null;
-    /**
-     * @var null|string
-     */
-    protected $responseFolder = null;
-    /**
-     * @var string
-     */
-    protected $subTemplate = 'cms/documents/document-form-form';
-    /**
-     * @var string
-     */
-    protected $formParameterName = 'form';
-    /**
-     * @var string
-     */
-    protected $thankYouMessage = 'Thank you for sending us your response.';
-
-    /**
-     * @var bool
-     */
-    protected $submitOncePerSession = false;
-
-    /**
-     * @var string
-     */
-    private $formId;
-    /**
-     * @var null|string
-     */
-    private $getPathBackup = null;
-
-    /**
-     * @var null|\stdClass
-     */
-    private $userSessionBackup = null;
-
-    /**
-     * @param Storage $storage
-     * @return void
-     * @throws \Exception
-     */
-    public function run(Storage $storage)
-    {
-        parent::run($storage);
-
-        $this->checkParameters();
-
-        if ($this->documentType === null || $this->responseFolder === null) {
-            throw new \Exception('Parameters `documentType` and `responseFolder` are required for usage with this form');
-        }
-
-        $this->setFormId();
-        $this->initialize($storage);
-        $this->checkSubmit($storage);
-    }
-
-    /**
-     * @param null|Application $application
-     * @throws \Exception
-     */
-    public function render($application = null)
-    {
-        $request = $this->request;
-        if (isset($request::$get['path'])) {
-            $this->getPathBackup = $request::$get['path'];
-        }
-        $request::$get['path'] = $this->responseFolder;
-        $form = $this->renderTemplate($this->subTemplate);
-        if ($this->getPathBackup !== null) {
-            $request::$get['path'] = $this->getPathBackup;
-        } else {
-            unset($request::$get['path']);
-        }
-        if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-            $this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
-        } else {
-            $this->parameters[$this->formParameterName] = $form;
-        }
-
-        parent::render($application);
-    }
-
-    /**
-     * Checks if parameters were given in the CMS configuration and
-     * sets them to their respective fields
-     */
-    private function checkParameters()
-    {
-        if (isset($this->parameters['documentType'])) {
-            $this->documentType = $this->parameters['documentType'];
-            unset($this->parameters['documentType']);
-        }
-
-        if (isset($this->parameters['responseFolder'])) {
-            $this->responseFolder = $this->parameters['responseFolder'];
-            unset($this->parameters['responseFolder']);
-        }
-
-        if (isset($this->parameters['subTemplate'])) {
-            $this->subTemplate = $this->parameters['subTemplate'];
-            unset($this->parameters['subTemplate']);
-        }
-
-        if (isset($this->parameters['formParameterName'])) {
-            $this->formParameterName = $this->parameters['formParameterName'];
-            unset($this->parameters['formParameterName']);
-        }
-
-        if (isset($this->parameters['thankYouMessage'])) {
-            $this->thankYouMessage = $this->parameters['thankYouMessage'];
-            unset($this->parameters['thankYouMessage']);
-        }
-
-        if (isset($this->parameters['submitOncePerSession'])) {
-            $this->submitOncePerSession = $this->parameters['submitOncePerSession'] === 'true' ? true : false;
-            unset($this->parameters['submitOncePerSession']);
-        }
-    }
-
-    /**
-     * Sets variables needed for rendering the form template
-     * @param $storage
-     */
-    private function initialize($storage)
-    {
-        $this->parameters['smallestImage'] = $storage->getSmallestImageSet()->slug;
-        $this->parameters['cmsPrefix'] = '';
-
-        $this->parameters['documentType'] = $this->storage->getDocumentTypeBySlug($this->documentType, true);
-        $this->parameters['documentTypes'] = $this->storage->getDocumentTypes();
-        $this->parameters['hideTitleAndState'] = true;
-        $this->parameters['formId'] = $this->formId;
-    }
-
-    /**
-     * If the form has been submitted, save the document
-     * Calls $this->postSubmit() afterwards
-     *
-     * @param Storage $storage
-     */
-    private function checkSubmit($storage)
-    {
-        if ($this->isFormSubmitted($this->request) && $this->isSubmitAllowed()) {
-            $postValues = $this->getPostValues($this->request);
-            $this->setUserSessionBackup();
-            $storage->addDocument($postValues);
-            $this->restoreUserSessionBackup();
-            $this->setSubmitToSession();
-            $this->postSubmit($postValues, $storage);
-        }
-    }
-
-    /**
-     * Hook for derived classes to take actions after
-     * submitting the form
-     *
-     * @param $postValues
-     * @param $storage
-     */
-    protected function postSubmit($postValues, $storage)
-    {}
-
-    /**
-     * Sets a unique id for this particular form, so it can recognize
-     * it when a submit occurs
-     */
-    private function setFormId()
-    {
-        if (isset($_SESSION['FormComponent'][$this->formParameterName]['formId'])) {
-            $this->formId = $_SESSION['FormComponent'][$this->formParameterName]['formId'];
-        } else {
-            $_SESSION['FormComponent'][$this->formParameterName]['formId'] = (string) microtime(true);
-            $_SESSION['FormComponent'][$this->formParameterName]['submitted'] = false;
-            $this->formId = $_SESSION['FormComponent'][$this->formParameterName]['formId'];
-        }
-    }
-
-    /**
-     * Checks if this form has been submitted
-     *
-     * @param $request
-     * @return bool
-     */
-    private function isFormSubmitted($request)
-    {
-        return !empty($request::$post) && isset($request::$post['formId']) && $request::$post['formId'] === $this->formId && isset($_SESSION['FormComponent'][$this->formParameterName]['formId']) && $_SESSION['FormComponent'][$this->formParameterName]['formId'] === $this->formId;
-    }
-
-    /**
-     *
-     *
-     * @param $request
-     */
-    private function getPostValues($request)
-    {
-        $postValues = $request::$post;
-        $postValues['documentType'] = $this->documentType;
-        $postValues['path'] = $this->responseFolder;
-        $postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
-        return $postValues;
-    }
-
-    /**
-     * Temporarily stores the current user session in a backup variable
-     * and sets a fake user instead
-     */
-    private function setUserSessionBackup()
-    {
-        $this->userSessionBackup = isset($_SESSION['cloudcontrol']) ? $_SESSION['cloudcontrol'] : null;
-        $fakeUser = new \stdClass();
-        $fakeUser->username = 'FormComponent';
-        $_SESSION['cloudcontrol'] = $fakeUser;
-    }
-
-    /**
-     * Removes the fake user and restores the existing user
-     * session if it was there
-     */
-    private function restoreUserSessionBackup()
-    {
-        if ($this->userSessionBackup === null) {
-            unset($_SESSION['cloudcontrol']);
-        } else {
-            $_SESSION['cloudcontrol'] = $this->userSessionBackup;
-        }
-    }
-
-    private function setSubmitToSession()
-    {
-        $_SESSION['FormComponent'][$this->formParameterName]['submitted'] = true;
-    }
-
-    private function isSubmitAllowed()
-    {
-        if ($this->submitOncePerSession === true && $_SESSION['FormComponent'][$this->formParameterName]['submitted'] === true) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * @var null|string
+	 */
+	protected $documentType = null;
+	/**
+	 * @var null|string
+	 */
+	protected $responseFolder = null;
+	/**
+	 * @var string
+	 */
+	protected $subTemplate = 'cms/documents/document-form-form';
+	/**
+	 * @var string
+	 */
+	protected $formParameterName = 'form';
+	/**
+	 * @var string
+	 */
+	protected $thankYouMessage = 'Thank you for sending us your response.';
+
+	/**
+	 * @var bool
+	 */
+	protected $submitOncePerSession = false;
+
+	/**
+	 * @var string
+	 */
+	private $formId;
+	/**
+	 * @var null|string
+	 */
+	private $getPathBackup = null;
+
+	/**
+	 * @var null|\stdClass
+	 */
+	private $userSessionBackup = null;
+
+	/**
+	 * @param Storage $storage
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function run(Storage $storage)
+	{
+		parent::run($storage);
+
+		$this->checkParameters();
+
+		if ($this->documentType === null || $this->responseFolder === null) {
+			throw new \Exception('Parameters `documentType` and `responseFolder` are required for usage with this form');
+		}
+
+		$this->setFormId();
+		$this->initialize($storage);
+		$this->checkSubmit($storage);
+	}
+
+	/**
+	 * @param null|Application $application
+	 * @throws \Exception
+	 */
+	public function render($application = null)
+	{
+		$request = $this->request;
+		if (isset($request::$get['path'])) {
+			$this->getPathBackup = $request::$get['path'];
+		}
+		$request::$get['path'] = $this->responseFolder;
+		$form = $this->renderTemplate($this->subTemplate);
+		if ($this->getPathBackup !== null) {
+			$request::$get['path'] = $this->getPathBackup;
+		} else {
+			unset($request::$get['path']);
+		}
+		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
+			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+		} else {
+			$this->parameters[$this->formParameterName] = $form;
+		}
+
+		parent::render($application);
+	}
+
+	/**
+	 * Checks if parameters were given in the CMS configuration and
+	 * sets them to their respective fields
+	 */
+	private function checkParameters()
+	{
+		if (isset($this->parameters['documentType'])) {
+			$this->documentType = $this->parameters['documentType'];
+			unset($this->parameters['documentType']);
+		}
+
+		if (isset($this->parameters['responseFolder'])) {
+			$this->responseFolder = $this->parameters['responseFolder'];
+			unset($this->parameters['responseFolder']);
+		}
+
+		if (isset($this->parameters['subTemplate'])) {
+			$this->subTemplate = $this->parameters['subTemplate'];
+			unset($this->parameters['subTemplate']);
+		}
+
+		if (isset($this->parameters['formParameterName'])) {
+			$this->formParameterName = $this->parameters['formParameterName'];
+			unset($this->parameters['formParameterName']);
+		}
+
+		if (isset($this->parameters['thankYouMessage'])) {
+			$this->thankYouMessage = $this->parameters['thankYouMessage'];
+			unset($this->parameters['thankYouMessage']);
+		}
+
+		if (isset($this->parameters['submitOncePerSession'])) {
+			$this->submitOncePerSession = $this->parameters['submitOncePerSession'] === 'true' ? true : false;
+			unset($this->parameters['submitOncePerSession']);
+		}
+	}
+
+	/**
+	 * Sets variables needed for rendering the form template
+	 * @param $storage
+	 */
+	private function initialize($storage)
+	{
+		$this->parameters['smallestImage'] = $storage->getSmallestImageSet()->slug;
+		$this->parameters['cmsPrefix'] = '';
+
+		$this->parameters['documentType'] = $this->storage->getDocumentTypeBySlug($this->documentType, true);
+		$this->parameters['documentTypes'] = $this->storage->getDocumentTypes();
+		$this->parameters['hideTitleAndState'] = true;
+		$this->parameters['formId'] = $this->formId;
+	}
+
+	/**
+	 * If the form has been submitted, save the document
+	 * Calls $this->postSubmit() afterwards
+	 *
+	 * @param Storage $storage
+	 */
+	private function checkSubmit($storage)
+	{
+		if ($this->isFormSubmitted($this->request) && $this->isSubmitAllowed()) {
+			$postValues = $this->getPostValues($this->request);
+			$this->setUserSessionBackup();
+			$storage->addDocument($postValues);
+			$this->restoreUserSessionBackup();
+			$this->setSubmitToSession();
+			$this->postSubmit($postValues, $storage);
+		}
+	}
+
+	/**
+	 * Hook for derived classes to take actions after
+	 * submitting the form
+	 *
+	 * @param $postValues
+	 * @param $storage
+	 */
+	protected function postSubmit($postValues, $storage)
+	{}
+
+	/**
+	 * Sets a unique id for this particular form, so it can recognize
+	 * it when a submit occurs
+	 */
+	private function setFormId()
+	{
+		if (isset($_SESSION['FormComponent'][$this->formParameterName]['formId'])) {
+			$this->formId = $_SESSION['FormComponent'][$this->formParameterName]['formId'];
+		} else {
+			$_SESSION['FormComponent'][$this->formParameterName]['formId'] = (string) microtime(true);
+			$_SESSION['FormComponent'][$this->formParameterName]['submitted'] = false;
+			$this->formId = $_SESSION['FormComponent'][$this->formParameterName]['formId'];
+		}
+	}
+
+	/**
+	 * Checks if this form has been submitted
+	 *
+	 * @param $request
+	 * @return bool
+	 */
+	private function isFormSubmitted($request)
+	{
+		return !empty($request::$post) && isset($request::$post['formId']) && $request::$post['formId'] === $this->formId && isset($_SESSION['FormComponent'][$this->formParameterName]['formId']) && $_SESSION['FormComponent'][$this->formParameterName]['formId'] === $this->formId;
+	}
+
+	/**
+	 *
+	 *
+	 * @param $request
+	 */
+	private function getPostValues($request)
+	{
+		$postValues = $request::$post;
+		$postValues['documentType'] = $this->documentType;
+		$postValues['path'] = $this->responseFolder;
+		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+		return $postValues;
+	}
+
+	/**
+	 * Temporarily stores the current user session in a backup variable
+	 * and sets a fake user instead
+	 */
+	private function setUserSessionBackup()
+	{
+		$this->userSessionBackup = isset($_SESSION['cloudcontrol']) ? $_SESSION['cloudcontrol'] : null;
+		$fakeUser = new \stdClass();
+		$fakeUser->username = 'FormComponent';
+		$_SESSION['cloudcontrol'] = $fakeUser;
+	}
+
+	/**
+	 * Removes the fake user and restores the existing user
+	 * session if it was there
+	 */
+	private function restoreUserSessionBackup()
+	{
+		if ($this->userSessionBackup === null) {
+			unset($_SESSION['cloudcontrol']);
+		} else {
+			$_SESSION['cloudcontrol'] = $this->userSessionBackup;
+		}
+	}
+
+	private function setSubmitToSession()
+	{
+		$_SESSION['FormComponent'][$this->formParameterName]['submitted'] = true;
+	}
+
+	private function isSubmitAllowed()
+	{
+		if ($this->submitOncePerSession === true && $_SESSION['FormComponent'][$this->formParameterName]['submitted'] === true) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 }
\ No newline at end of file

cloudcontrol/library/cc/errorhandler.php

Braces +4 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
         errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
+    } elseif ($error['type'] == 1) {
         dump($error);
     }
 }
@@ -85,7 +85,9 @@ 
  * @param string $httpHeader
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
-    if (ob_get_contents()) ob_end_clean();
+    if (ob_get_contents()) {
+    	ob_end_clean();
+    }
     header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
     header('X-Error-Message: ' . $message);
     header('X-Error-File: ' . $file);

Doc Comments +5 added lines

@@ -149,6 +149,11 @@
     }
 }
 
+/**
+ * @param string $message
+ * @param string $file
+ * @param integer $code
+ */
 function renderCliException($message, $file, $line, $code, $trace, $lines)
 {
     echo PHP_EOL;

Indentation +112 added lines, -112 removed lines

@@ -31,11 +31,11 @@ 
  */
 function shutdownHandler () {
 	$error = error_get_last(); 
-    if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
-        dump($error);
-    }
+	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
+		errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+	}elseif ($error['type'] == 1) {
+		dump($error);
+	}
 }
 
 /**
@@ -49,28 +49,28 @@ 
 	$jsonErrorNr = json_last_error();
 	$errstr = '';
 	switch ($jsonErrorNr) {
-        case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
-        break;
-        case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
-        break;
-        case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
-        break;
-        case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
-        break;
-        case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
-        break;
-        case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
-        break;
-        default:
-            $errstr = ' - Unknown error' . PHP_EOL;
-        break;
-    }
+		case JSON_ERROR_NONE:
+			$errstr .= ' - No errors' . PHP_EOL;
+		break;
+		case JSON_ERROR_DEPTH:
+			$errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+		break;
+		case JSON_ERROR_STATE_MISMATCH:
+			$errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+		break;
+		case JSON_ERROR_CTRL_CHAR:
+			$errstr .= ' - Unexpected control character found' . PHP_EOL;
+		break;
+		case JSON_ERROR_SYNTAX:
+			$errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+		break;
+		case JSON_ERROR_UTF8:
+			$errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+		break;
+		default:
+			$errstr = ' - Unknown error' . PHP_EOL;
+		break;
+	}
 	errorHandler ($jsonErrorNr, $errstr, $file, $line);
 }
 
@@ -85,102 +85,102 @@ 
  * @param string $httpHeader
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
-    if (ob_get_contents()) ob_end_clean();
+	if (ob_get_contents()) ob_end_clean();
 
-    if (canShowError()) {
-        $file_lines = file_exists($file) ? file($file) : array();
-        $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
-        $lines = array();
+	if (canShowError()) {
+		$file_lines = file_exists($file) ? file($file) : array();
+		$range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
+		$lines = array();
 
-        foreach ($range as $line_number) {
-            if(isset($file_lines[$line_number-1])) {
-                $lines[$line_number] = $file_lines[$line_number-1];
-            }
-        }
+		foreach ($range as $line_number) {
+			if(isset($file_lines[$line_number-1])) {
+				$lines[$line_number] = $file_lines[$line_number-1];
+			}
+		}
 
-        $error = array(
-            'message' 		=> $message,
-            'file' 			=> $file,
-            'line' 			=> $line,
-            'code' 			=> $code,
-            'lines' 		=> $lines,
-            'trace' 		=> $trace,
-            'httpHeader' 	=> $httpHeader,
-        );
+		$error = array(
+			'message' 		=> $message,
+			'file' 			=> $file,
+			'line' 			=> $line,
+			'code' 			=> $code,
+			'lines' 		=> $lines,
+			'trace' 		=> $trace,
+			'httpHeader' 	=> $httpHeader,
+		);
 
-        if (PHP_SAPI === 'cli') {
-            renderCliException($message, $file, $line, $code, $trace, $lines);
-        }
+		if (PHP_SAPI === 'cli') {
+			renderCliException($message, $file, $line, $code, $trace, $lines);
+		}
 
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
-        } else {
-            header('Content-type: application/json');
-            die(json_encode($error));
-        }
-        exit;
-    } else {
-        header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-        header('X-Error-Message: ' . $message);
-        header('X-Error-File: ' . $file);
-        header('X-Error-Line: ' . $line);
-        if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
-            include(realpath(__DIR__) . '/errorviewcompact.php');
-        } else {
-            header('Content-type: application/json');
-            die(json_encode('An error occured.'));
-        }
-    }
+		if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
+			include(realpath(__DIR__) . '/errorviewdetailed.php');
+		} else {
+			header('Content-type: application/json');
+			die(json_encode($error));
+		}
+		exit;
+	} else {
+		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+		header('X-Error-Message: ' . $message);
+		header('X-Error-File: ' . $file);
+		header('X-Error-Line: ' . $line);
+		if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
+			include(realpath(__DIR__) . '/errorviewcompact.php');
+		} else {
+			header('Content-type: application/json');
+			die(json_encode('An error occured.'));
+		}
+	}
 }
 
 function canShowError()
 {
-    if (PHP_SAPI === 'cli') {
-        return true;
-    }
-    if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
-        $config = file_get_contents('../config.json');
-        $config = json_decode($config);
-        if (isset($config->showErrorsToAll)) {
-            return $config->showErrorsToAll;
-        }
-    } else {
-        return true;
-    }
+	if (PHP_SAPI === 'cli') {
+		return true;
+	}
+	if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
+		$config = file_get_contents('../config.json');
+		$config = json_decode($config);
+		if (isset($config->showErrorsToAll)) {
+			return $config->showErrorsToAll;
+		}
+	} else {
+		return true;
+	}
 }
 
 function renderCliException($message, $file, $line, $code, $trace, $lines)
 {
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    echo '  ' . $message . PHP_EOL;
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    echo '  ' . $file . ':' . $line . PHP_EOL;
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    foreach($lines as $nr => $currentLine) {
-        echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
-    }
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    foreach($trace as $row) {
-        echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-            . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-            . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-            . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-            . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
-    }
-    exit;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	echo '  ' . $message . PHP_EOL;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	echo '  ' . $file . ':' . $line . PHP_EOL;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	foreach($lines as $nr => $currentLine) {
+		echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+	}
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	foreach($trace as $row) {
+		echo (isset($row['file']) ? basename($row['file']) : '') . ':'
+			. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
+			. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
+			. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
+			. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+	}
+	exit;
 }
\ No newline at end of file

Spacing +47 added lines, -47 removed lines

@@ -9,8 +9,8 @@ 
  *
  * @param $e
  */
-function exceptionHandler ($e) {
-	renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
+function exceptionHandler($e) {
+	renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
 }
 
 /**
@@ -21,18 +21,18 @@ 
  * @param $errfile
  * @param $errline
  */
-function errorHandler ($errno, $errstr, $errfile, $errline) {
-	renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
+function errorHandler($errno, $errstr, $errfile, $errline) {
+	renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
 }
 
 /**
  * When an error occurs that kills the process, still try
  * to show it using a shutdownHandler.
  */
-function shutdownHandler () {
+function shutdownHandler() {
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+        errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
     }elseif ($error['type'] == 1) {
         dump($error);
     }
@@ -50,28 +50,28 @@ 
 	$errstr = '';
 	switch ($jsonErrorNr) {
         case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
+            $errstr .= ' - No errors'.PHP_EOL;
         break;
         case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+            $errstr .= ' - Maximum stack depth exceeded'.PHP_EOL;
         break;
         case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+            $errstr .= ' - Underflow or the modes mismatch'.PHP_EOL;
         break;
         case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
+            $errstr .= ' - Unexpected control character found'.PHP_EOL;
         break;
         case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+            $errstr .= ' - Syntax error, malformed JSON'.PHP_EOL;
         break;
         case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded'.PHP_EOL;
         break;
         default:
-            $errstr = ' - Unknown error' . PHP_EOL;
+            $errstr = ' - Unknown error'.PHP_EOL;
         break;
     }
-	errorHandler ($jsonErrorNr, $errstr, $file, $line);
+	errorHandler($jsonErrorNr, $errstr, $file, $line);
 }
 
 /**
@@ -84,7 +84,7 @@ 
  * @param array  $trace
  * @param string $httpHeader
  */
-function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
+function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
     if (ob_get_contents()) ob_end_clean();
 
     if (canShowError()) {
@@ -93,8 +93,8 @@ 
         $lines = array();
 
         foreach ($range as $line_number) {
-            if(isset($file_lines[$line_number-1])) {
-                $lines[$line_number] = $file_lines[$line_number-1];
+            if (isset($file_lines[$line_number - 1])) {
+                $lines[$line_number] = $file_lines[$line_number - 1];
             }
         }
 
@@ -112,20 +112,20 @@ 
             renderCliException($message, $file, $line, $code, $trace, $lines);
         }
 
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
+        if (file_exists(realpath(__DIR__).'/errorviewdetailed.php')) {
+            include(realpath(__DIR__).'/errorviewdetailed.php');
         } else {
             header('Content-type: application/json');
             die(json_encode($error));
         }
         exit;
     } else {
-        header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-        header('X-Error-Message: ' . $message);
-        header('X-Error-File: ' . $file);
-        header('X-Error-Line: ' . $line);
-        if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
-            include(realpath(__DIR__) . '/errorviewcompact.php');
+        header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+        header('X-Error-Message: '.$message);
+        header('X-Error-File: '.$file);
+        header('X-Error-Line: '.$line);
+        if (file_exists(realpath(__DIR__).'/errorviewcompact.php')) {
+            include(realpath(__DIR__).'/errorviewcompact.php');
         } else {
             header('Content-type: application/json');
             die(json_encode('An error occured.'));
@@ -152,35 +152,35 @@ 
 function renderCliException($message, $file, $line, $code, $trace, $lines)
 {
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
     echo PHP_EOL;
-    echo '  ' . $message . PHP_EOL;
+    echo '  '.$message.PHP_EOL;
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| IN FILE                                                                                                                                      |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
     echo PHP_EOL;
-    echo '  ' . $file . ':' . $line . PHP_EOL;
+    echo '  '.$file.':'.$line.PHP_EOL;
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| CONTENTS OF THE FILE                                                                                                                         |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
     echo PHP_EOL;
-    foreach($lines as $nr => $currentLine) {
-        echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+    foreach ($lines as $nr => $currentLine) {
+        echo ($nr == $line ? '* ' : '  ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine;
     }
     echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    foreach($trace as $row) {
-        echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-            . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-            . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-            . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-            . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    echo '| STACK TRACE                                                                                                                                  |'.PHP_EOL;
+    echo '------------------------------------------------------------------------------------------------------------------------------------------------'.PHP_EOL;
+    foreach ($trace as $row) {
+        echo (isset($row['file']) ? basename($row['file']) : '').':'
+            . (isset($row['line']) ? $row['line'] : '')."\t\t\t"
+            . (isset($row['class']) ? $row['class'] : ' ')."\t\t\t"
+            . (isset($row['type']) ? $row['type'] : ' ')."\t\t\t"
+            . (isset($row['function']) ? $row['function'] : ' ').PHP_EOL;
     }
     exit;
 }
\ No newline at end of file

cloudcontrol/library/cc/Application.php

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
 		 */
 		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);
@@ -94,7 +94,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -157,17 +157,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) {
@@ -226,7 +226,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/cc/Request.php

Spacing +4 added lines, -4 removed lines

@@ -47,21 +47,21 @@
 		{
 			global $rootPath;
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$subfolders = str_replace('//', '/', self::$subfolders);
 			if (PHP_SAPI === 'cli') {
 				global $argv;
 				array_shift($argv);
 				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
+				self::$requestUri = self::$subfolders.implode('/', $argv);
 			} else {
 				self::$requestUri = $_SERVER['REQUEST_URI'];
 				self::$queryString = $_SERVER['QUERY_STRING'];
 			}
 			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
 			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			}
 
 			self::$requestParameters = explode('/', self::$relativeUri);

cloudcontrol/templates/cms/documents/document-form-form.php

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
+<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#'.$formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
     <input type="hidden" name="path" value="<?=$request::$get['path']?>" />
     <? else : ?>
@@ -20,7 +20,7 @@ 
                     <input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix = 'fields'; ?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -44,7 +44,7 @@ 
 								<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 								<div class="form-element">
 					<? endif ?>
-						<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+						<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 								</div>
@@ -66,7 +66,7 @@ 
 							<li class="grid-container">
 								<div class="grid-box-10">
 									<div class="grid-inner form-element">
-										<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+										<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 									</div>
 								</div>
 								<div class="grid-box-2">
@@ -76,7 +76,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -93,10 +93,10 @@ 
 								<a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a>
 								<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 								<div class="form-element">
-								<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+								<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 						<? endforeach ?>
 						<? endif ?>
 						</div>
@@ -105,17 +105,17 @@ 
 					<a class="btn js-addrtemultiple">+</a>
 					<? endif ?>
 				</div>
-				<?$value='';?>
+				<?$value = ''; ?>
 			<? endforeach ?>
 			<hr />
-			<? $static_brick_nr = 0;?>
+			<? $static_brick_nr = 0; ?>
 			<? foreach ($documentType->bricks as $brick) : ?>
 			<div class="brick">
 				<label><?=$brick->title?></label>
 				<? if ($brick->multiple == 'true') : ?>
 					<input type="hidden" value="<?=$brick->brickSlug?>"/>
 					<input type="hidden" value="<?=$brick->slug?>"/>
-					<?$myBrickSlug=$brick->slug;?>
+					<?$myBrickSlug = $brick->slug; ?>
 					<ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable">
 						<? if (isset($document)) : ?>
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
@@ -129,7 +129,7 @@ 
 									<li class="brick form-element">
 										<label><?=$brick->title?></label>
 										<?$static = true; ?>
-										<?include(__DIR__ . '/brick.php')?>
+										<?include(__DIR__.'/brick.php')?>
 									</li>
 									<? endif ?>
 								<? endforeach ?>
@@ -139,7 +139,7 @@ 
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
 				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+					<?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -165,7 +165,7 @@ 
 									<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 									<div class="form-element">
 						<? endif ?>
-							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+							<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 									</div>
@@ -188,7 +188,7 @@ 
 								<li class="grid-container">
 									<div class="grid-box-10">
 										<div class="grid-inner form-element">
-											<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+											<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 										</div>
 									</div>
 									<div class="grid-box-2">
@@ -198,7 +198,7 @@ 
 										</div>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 								<? endforeach ?>
 							<? endif ?>
 						</ul>
@@ -216,10 +216,10 @@ 
 									<a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a>
 									<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 									<div class="form-element">
-									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+									<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 							<? endforeach ?>
 							<? endif ?>
 							</div>
@@ -228,12 +228,12 @@ 
 						<a class="btn js-addrtemultiple">+</a>
 						<? endif ?>
 					</div>
-					<?$value='';?>
+					<?$value = ''; ?>
 				<? endforeach ?>
 				<? endif ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 
 
 
@@ -256,7 +256,7 @@ 
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
 							<?$static = false; ?>
-							<?include(__DIR__ . '/brick.php')?>
+							<?include(__DIR__.'/brick.php')?>
 						</li>
 					<? endforeach ?>
 				<? endif ?>

Braces +16 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
     <input type="hidden" name="path" value="<?=$request::$get['path']?>" />
-    <? else : ?>
+    <? else {
+	: ?>
     <input type="hidden" name="formId" value="<?=$formId?>" />
     <a name="<?=$formId?>"></a>
     <? endif ?>
@@ -20,15 +21,19 @@ 
                     <input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix='fields';
+}
+?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
 						$fieldSlug = $field->slug;
 						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
+					else {
+						:
 						$value = '';
+					}
 					endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
@@ -138,8 +143,11 @@ 
 					</ul>
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
-				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+				<? else {
+	: ?>
+					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
+}
+?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -148,8 +156,10 @@ 
 							$brickSlug = $brick->slug;
 							$fieldSlug = $field->slug;
 							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
+						else {
+							:
 							$value = '';
+						}
 						endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">

cloudcontrol/library/components/cms/DocumentRouting.php

Indentation +112 added lines, -112 removed lines

@@ -12,124 +12,124 @@
 
 class DocumentRouting
 {
-    /**
-     * DocumentRouting constructor.
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/documents') {
-            $cmsComponent->subTemplate = 'cms/documents';
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments());
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-        }
-        $this->documentRouting($request, $relativeCmsUri, $cmsComponent);
-        $this->folderRouting($request, $relativeCmsUri, $cmsComponent);
-    }
+	/**
+	 * DocumentRouting constructor.
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/documents') {
+			$cmsComponent->subTemplate = 'cms/documents';
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments());
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+		}
+		$this->documentRouting($request, $relativeCmsUri, $cmsComponent);
+		$this->folderRouting($request, $relativeCmsUri, $cmsComponent);
+	}
 
 
-    /**
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     * @throws \Exception
-     */
-    private function documentRouting($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
-            $cmsComponent->subTemplate = 'cms/documents/document-form';
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug);
-            if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
-                if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
-                    $cmsComponent->storage->addDocument($request::$post);
-                    header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-                    exit;
-                }
-                $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
-                $cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks());
-            } else {
-                $documentTypes = $cmsComponent->storage->getDocumentTypes();
-                if (count($documentTypes) < 1) {
-                    throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
-                }
-                $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
-            }
-        } elseif ($relativeCmsUri == '/documents/edit-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $cmsComponent->subTemplate = 'cms/documents/document-form';
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug);
-            if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-                $cmsComponent->storage->saveDocument($request::$post);
-                header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-                exit;
-            }
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
-            $request::$get[CmsComponent::GET_PARAMETER_PATH] = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypeBySlug($cmsComponent->getParameter(CmsComponent::PARAMETER_DOCUMENT)->documentTypeSlug, true));
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks());
-        } elseif ($relativeCmsUri == '/documents/get-brick' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug);
-            $cmsComponent->subTemplate = 'cms/documents/brick';
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $cmsComponent->storage->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_STATIC, $request::$get[CmsComponent::PARAMETER_STATIC] === 'true');
-            if (isset($request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG])) {
-                $cmsComponent->setParameter(CmsComponent::PARAMETER_MY_BRICK_SLUG, $request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG]);
-            }
-            $result = new \stdClass();
-            $result->body = $cmsComponent->renderTemplate('cms/documents/brick');
-            $result->rteList = isset($GLOBALS['rteList']) ? $GLOBALS['rteList'] : array();
-            ob_clean();
-            header(CmsComponent::CONTENT_TYPE_APPLICATION_JSON);
-            die(json_encode($result));
-        } else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $cmsComponent->storage->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-            exit;
-        }
-    }
+	/**
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 * @throws \Exception
+	 */
+	private function documentRouting($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
+			$cmsComponent->subTemplate = 'cms/documents/document-form';
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug);
+			if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
+				if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
+					$cmsComponent->storage->addDocument($request::$post);
+					header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+					exit;
+				}
+				$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
+				$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks());
+			} else {
+				$documentTypes = $cmsComponent->storage->getDocumentTypes();
+				if (count($documentTypes) < 1) {
+					throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
+				}
+				$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
+			}
+		} elseif ($relativeCmsUri == '/documents/edit-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$cmsComponent->subTemplate = 'cms/documents/document-form';
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug);
+			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+				$cmsComponent->storage->saveDocument($request::$post);
+				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+				exit;
+			}
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
+			$request::$get[CmsComponent::GET_PARAMETER_PATH] = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypeBySlug($cmsComponent->getParameter(CmsComponent::PARAMETER_DOCUMENT)->documentTypeSlug, true));
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks());
+		} elseif ($relativeCmsUri == '/documents/get-brick' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug);
+			$cmsComponent->subTemplate = 'cms/documents/brick';
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $cmsComponent->storage->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_STATIC, $request::$get[CmsComponent::PARAMETER_STATIC] === 'true');
+			if (isset($request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG])) {
+				$cmsComponent->setParameter(CmsComponent::PARAMETER_MY_BRICK_SLUG, $request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG]);
+			}
+			$result = new \stdClass();
+			$result->body = $cmsComponent->renderTemplate('cms/documents/brick');
+			$result->rteList = isset($GLOBALS['rteList']) ? $GLOBALS['rteList'] : array();
+			ob_clean();
+			header(CmsComponent::CONTENT_TYPE_APPLICATION_JSON);
+			die(json_encode($result));
+		} else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$cmsComponent->storage->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			exit;
+		}
+	}
 
-    /**
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    private function folderRouting($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
-            $cmsComponent->subTemplate = 'cms/documents/folder-form';
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-            if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
-                $cmsComponent->storage->addDocumentFolder($request::$post);
-                header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-                exit;
-            }
-        } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+	/**
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	private function folderRouting($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
+			$cmsComponent->subTemplate = 'cms/documents/folder-form';
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
+				$cmsComponent->storage->addDocumentFolder($request::$post);
+				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+				exit;
+			}
+		} else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 
-            $cmsComponent->subTemplate = 'cms/documents/folder-form';
-            $folder = $cmsComponent->storage->getDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+			$cmsComponent->subTemplate = 'cms/documents/folder-form';
+			$folder = $cmsComponent->storage->getDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 
-            $path = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
-            $path = explode('/', $path);
-            array_pop($path);
-            $path = implode('/', $path);
+			$path = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
+			$path = explode('/', $path);
+			array_pop($path);
+			$path = implode('/', $path);
 
-            $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
+			$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
 
-            if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
-                $cmsComponent->storage->saveDocumentFolder($request::$post);
-                header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-                exit;
-            }
+			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
+				$cmsComponent->storage->saveDocumentFolder($request::$post);
+				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+				exit;
+			}
 
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_FOLDER, $folder);
-        } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-            exit;
-        }
-    }
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_FOLDER, $folder);
+		} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			exit;
+		}
+	}
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
             if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
                 if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
                     $cmsComponent->storage->addDocument($request::$post);
-                    header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+                    header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
                     exit;
                 }
                 $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
@@ -53,7 +53,7 @@ 
             } else {
                 $documentTypes = $cmsComponent->storage->getDocumentTypes();
                 if (count($documentTypes) < 1) {
-                    throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
+                    throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types/new">Please do so first.</a>');
                 }
                 $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
             }
@@ -63,7 +63,7 @@ 
             $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getSmallestImageSet()->slug);
             if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
                 $cmsComponent->storage->saveDocument($request::$post);
-                header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+                header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
                 exit;
             }
             $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
@@ -86,7 +86,7 @@ 
             die(json_encode($result));
         } else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
             $cmsComponent->storage->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+            header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
             exit;
         }
     }
@@ -103,7 +103,7 @@ 
             $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
             if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
                 $cmsComponent->storage->addDocumentFolder($request::$post);
-                header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+                header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
                 exit;
             }
         } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
@@ -116,11 +116,11 @@ 
             array_pop($path);
             $path = implode('/', $path);
 
-            $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
+            $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/'.$path;
 
             if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
                 $cmsComponent->storage->saveDocumentFolder($request::$post);
-                header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+                header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
                 exit;
             }
 
@@ -128,7 +128,7 @@ 
             $cmsComponent->setParameter(CmsComponent::PARAMETER_FOLDER, $folder);
         } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
             $cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+            header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
             exit;
         }
     }

cloudcontrol/library/components/CmsComponent.php

Indentation +582 added lines, -582 removed lines

@@ -1,589 +1,589 @@
 <?php
 namespace library\components {
 
-    use library\components\cms\DocumentRouting;
-    use library\crypt\Crypt;
-    use library\storage\Storage;
+	use library\components\cms\DocumentRouting;
+	use library\crypt\Crypt;
+	use library\storage\Storage;
 
-    class CmsComponent extends BaseComponent
-    {
-        /*
+	class CmsComponent extends BaseComponent
+	{
+		/*
          * var \library\storage\Storage
          */
-        public $storage;
-
-        const INVALID_CREDENTIALS_MESSAGE = 'Invalid username / password combination';
-
-        const MAIN_NAV_CLASS = 'default';
-
-        const PARAMETER_BLACKLIST_IPS = 'blacklistIps';
-        const PARAMETER_BODY = 'body';
-        const PARAMETER_BRICK = 'brick';
-        const PARAMETER_BRICKS = 'bricks';
-        const PARAMETER_CMS_PREFIX = 'cmsPrefix';
-        const PARAMETER_DOCUMENT = 'document';
-        const PARAMETER_DOCUMENTS = 'documents';
-        const PARAMETER_DOCUMENT_TYPE = 'documentType';
-        const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
-        const PARAMETER_ERROR_MESSAGE = 'errorMsg';
-        const PARAMETER_FILES = 'files';
-        const PARAMETER_FOLDER = 'folder';
-        const PARAMETER_IMAGE = 'image';
-        const PARAMETER_IMAGES = 'images';
-        const PARAMETER_IMAGE_SET = 'imageSet';
-        const PARAMETER_MAIN_NAV_CLASS = 'mainNavClass';
-        const PARAMETER_MY_BRICK_SLUG = 'myBrickSlug';
-        const PARAMETER_SITEMAP = 'sitemap';
-        const PARAMETER_SITEMAP_ITEM = 'sitemapItem';
-        const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
-        const PARAMETER_STATIC = 'static';
-        const PARAMETER_USER = 'user';
-        const PARAMETER_USERS = 'users';
-        const PARAMETER_USER_RIGHTS = 'userRights';
-        const PARAMETER_WHITELIST_IPS = 'whitelistIps';
-
-        const POST_PARAMETER_COMPONENT = 'component';
-        const POST_PARAMETER_PASSWORD = 'password';
-        const POST_PARAMETER_SAVE = 'save';
-        const POST_PARAMETER_TEMPLATE = 'template';
-        const POST_PARAMETER_TITLE = 'title';
-        const POST_PARAMETER_USERNAME = 'username';
-
-        const GET_PARAMETER_PATH = 'path';
-        const GET_PARAMETER_SLUG = 'slug';
-
-        const FILES_PARAMETER_FILE = 'file';
-
-        const SESSION_PARAMETER_CLOUD_CONTROL = 'cloudcontrol';
-
-        const LOGIN_TEMPLATE_PATH = 'cms/login';
-
-        const CONTENT_TYPE_APPLICATION_JSON = 'Content-type:application/json';
-
-        public $subTemplate = null;
-
-
-        /**
-         * @param \library\storage\Storage $storage
-         *
-         * @return void
-         */
-        public function run(Storage $storage)
-        {
-            $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::MAIN_NAV_CLASS;
-            $this->storage = $storage;
-
-            $remoteAddress = $_SERVER['REMOTE_ADDR'];
-            $this->checkWhiteList($remoteAddress);
-            $this->checkBlackList($remoteAddress);
-
-            $this->checkLogin();
-
-            $this->parameters[self::PARAMETER_USER_RIGHTS] = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
-
-            $this->routing();
-        }
-
-        /**
-         * See if a user is logged or wants to log in and
-         * takes appropriate actions.
-         *
-         * @throws \Exception
-         */
-        protected function checkLogin()
-        {
-            $request = $this->request;
-
-            if (!isset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL])) {
-                if (isset($request::$post[self::POST_PARAMETER_USERNAME], $request::$post[self::POST_PARAMETER_PASSWORD])) {
-                    $user = $this->storage->getUserByUsername($request::$post[self::POST_PARAMETER_USERNAME]);
-                    $crypt = new Crypt();
-                    if (empty($user)) {
-                        $crypt->encrypt($request::$post[self::POST_PARAMETER_PASSWORD], 16); // Buy time, to avoid brute forcing
-                        $this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
-                        $this->showLogin();
-                    } else {
-                        $salt = $user->salt;
-                        $password = $user->password;
-
-                        $passwordCorrect = $crypt->compare($request::$post[self::POST_PARAMETER_PASSWORD], $password, $salt);
-
-                        if ($passwordCorrect) {
-                            $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = $user;
-                        } else {
-                            $this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
-                            $this->showLogin();
-                        }
-                    }
-                } else {
-                    $this->showLogin();
-                }
-            }
-        }
-
-        /**
-         * Overrides normal behaviour and only renders the
-         * login screen
-         *
-         * @throws \Exception
-         */
-        protected function showLogin()
-        {
-            $loginTemplatePath = self::LOGIN_TEMPLATE_PATH;
-            $this->renderTemplate($loginTemplatePath);
-            ob_end_flush();
-            exit;
-        }
-
-        /**
-         * As an exception, to keep the initial file structure simple
-         * the cms implements it's own routing, apart from the regular sitemap functionality
-         *
-         * @throws \Exception
-         */
-        protected function routing()
-        {
-            $relativeCmsUri = $this->getRelativeCmsUri($this->request);
-
-            $userRights = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
-
-            if ($relativeCmsUri == '' || $relativeCmsUri == '/') {
-                $this->subTemplate = 'cms/dashboard';
-            }
-
-            $this->logOffRouting($this->request, $relativeCmsUri);
-
-            $this->apiRouting($relativeCmsUri);
-
-            if (in_array(self::PARAMETER_DOCUMENTS, $userRights)) {
-                new DocumentRouting($this->request, $relativeCmsUri, $this);
-            }
-
-            if (in_array(self::PARAMETER_SITEMAP, $userRights)) {
-                $this->sitemapRouting($this->request, $relativeCmsUri);
-            }
-
-            if (in_array(self::PARAMETER_IMAGES, $userRights)) {
-                $this->imagesRouting($this->request, $relativeCmsUri);
-            }
-
-            if (in_array(self::PARAMETER_FILES, $userRights)) {
-                $this->filesRouting($this->request, $relativeCmsUri);
-            }
-
-            if (in_array('configuration', $userRights)) {
-                $this->configurationRouting($this->request, $relativeCmsUri);
-            }
-
-            if ($this->subTemplate !== null) {
-                $this->parameters[self::PARAMETER_BODY] = $this->renderTemplate($this->subTemplate);
-            }
-        }
-
-        /**
-         * @param $remoteAddress
-         * @throws \Exception
-         */
-        private function checkWhiteList($remoteAddress)
-        {
-            if (isset($this->parameters[self::PARAMETER_WHITELIST_IPS])) {
-                $whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
-                $whitelistIps = array_map("trim", $whitelistIps);
-                if (!in_array($remoteAddress, $whitelistIps)) {
-                    throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
-                }
-            }
-        }
-
-        /**
-         * @param $remoteAddress
-         * @throws \Exception
-         */
-        private function checkBlackList($remoteAddress)
-        {
-            if (isset($this->parameters[self::PARAMETER_BLACKLIST_IPS])) {
-                $blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
-                $blacklistIps = array_map("trim", $blacklistIps);
-                if (in_array($remoteAddress, $blacklistIps)) {
-                    throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
-                }
-            }
-        }
-
-        /**
-         * @param $request
-         * @return mixed|string
-         */
-        private function getRelativeCmsUri($request)
-        {
-            // TODO Use regex match parameter instead of calculating relative uri
-            $pos = strpos($request::$relativeUri, $this->parameters[self::PARAMETER_CMS_PREFIX]);
-            $relativeCmsUri = '/';
-            if ($pos !== false) {
-                $relativeCmsUri = substr_replace($request::$relativeUri, '', $pos, strlen($this->parameters[self::PARAMETER_CMS_PREFIX]));
-            }
-            return $relativeCmsUri;
-        }
-
-        /**
-         * @param \library\cc\Request $request
-         * @param $relativeCmsUri
-         */
-        private function sitemapRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/sitemap') {
-                $this->subTemplate = 'cms/sitemap';
-                if (isset($request::$post[self::POST_PARAMETER_SAVE])) {
-                    $this->storage->saveSitemap($request::$post);
-                }
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
-                $this->parameters[self::PARAMETER_SITEMAP] = $this->storage->getSitemap();
-            } elseif ($relativeCmsUri == '/sitemap/new') {
-                $this->subTemplate = 'cms/sitemap/form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
-                if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
-                    $this->storage->addSitemapItem($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
-                    exit;
-                }
-            } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->subTemplate = 'cms/sitemap/form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
-                $sitemapItem = $this->storage->getSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
-                    $this->storage->saveSitemapItem($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
-                    exit;
-                }
-                $this->parameters[self::PARAMETER_SITEMAP_ITEM] = $sitemapItem;
-            } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->storage->deleteSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
-                exit;
-            }
-        }
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function imagesRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/images') {
-                $this->subTemplate = 'cms/images';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
-                $this->parameters[self::PARAMETER_IMAGES] = $this->storage->getImages();
-                $this->parameters[self::PARAMETER_SMALLEST_IMAGE] = $this->storage->getSmallestImageSet()->slug;
-            } elseif ($relativeCmsUri == '/images.json') {
-                header(self::CONTENT_TYPE_APPLICATION_JSON);
-                die(json_encode($this->storage->getImages()));
-            } elseif ($relativeCmsUri == '/images/new') {
-                $this->subTemplate = 'cms/images/form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
-                if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
-                    $this->storage->addImage($_FILES[self::FILES_PARAMETER_FILE]);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
-                    exit;
-                }
-            } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
-                $this->storage->deleteImageByName($request::$get[self::FILES_PARAMETER_FILE]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
-                exit;
-            } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
-                $this->subTemplate = 'cms/images/show';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
-                $this->parameters[self::PARAMETER_IMAGE] = $this->storage->getImageByName($request::$get[self::FILES_PARAMETER_FILE]);
-            }
-        }
-
-        /**
-         * @param $relativeCmsUri
-         */
-        private function apiRouting($relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/images.json') {
-                header(self::CONTENT_TYPE_APPLICATION_JSON);
-                die(json_encode($this->storage->getImages()));
-            } elseif ($relativeCmsUri == '/files.json') {
-                header(self::CONTENT_TYPE_APPLICATION_JSON);
-                die(json_encode($this->storage->getFiles()));
-            } elseif ($relativeCmsUri == '/documents.json') {
-                header(self::CONTENT_TYPE_APPLICATION_JSON);
-                die(json_encode($this->storage->getDocuments()));
-            }
-        }
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function filesRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/files') {
-                $this->subTemplate = 'cms/files';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_FILES;
-                $this->parameters[self::PARAMETER_FILES] = $this->storage->getFiles();
-            } elseif ($relativeCmsUri == '/files/new') {
-                $this->subTemplate = 'cms/files/form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_FILES;
-                if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
-                    $this->storage->addFile($_FILES[self::FILES_PARAMETER_FILE]);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
-                    exit;
-                }
-            } elseif ($relativeCmsUri == '/files/get' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
-                $this->downloadFile($request::$get[self::FILES_PARAMETER_FILE]);
-            } elseif ($relativeCmsUri == '/files/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
-                $this->storage->deleteFileByName($request::$get[self::FILES_PARAMETER_FILE]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
-                exit;
-            }
-        }
-
-        /**
-         * @param $slug
-         */
-        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);
-
-            header('Content-Description: File Transfer');
-            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);
-
-            readfile($path . '/' . $file->file);
-            exit;
-        }
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function configurationRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/configuration') {
-                $this->subTemplate = 'cms/configuration';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-            }
-
-            $this->usersRouting($request, $relativeCmsUri);
-            $this->documentTypesRouting($request, $relativeCmsUri);
-            $this->bricksRouting($request, $relativeCmsUri);
-            $this->imageSetRouting($request, $relativeCmsUri);
-            $this->applicationComponentRouting($request, $relativeCmsUri);
-        }
-
-
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function usersRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/configuration/users') {
-                $this->subTemplate = 'cms/configuration/users';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $this->parameters[self::PARAMETER_USERS] = $this->storage->getUsers();
-            } elseif ($relativeCmsUri == '/configuration/users/new') {
-                $this->subTemplate = 'cms/configuration/users-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
-                    $this->storage->addUser($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
-                    exit;
-                }
-            } elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->storage->deleteUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
-                exit;
-            } elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->subTemplate = 'cms/configuration/users-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $this->parameters[self::PARAMETER_USER] = $this->storage->getUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
-                    $this->storage->saveUser($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
-                    exit;
-                }
-            }
-        }
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function documentTypesRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/configuration/document-types') {
-                $this->subTemplate = 'cms/configuration/document-types';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $this->parameters[self::PARAMETER_DOCUMENT_TYPES] = $this->storage->getDocumentTypes();
-            } elseif ($relativeCmsUri == '/configuration/document-types/new') {
-                $this->subTemplate = 'cms/configuration/document-types-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $bricks = $this->storage->getBricks();
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->addDocumentType($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
-                    exit;
-                }
-                $this->parameters[self::PARAMETER_BRICKS] = $bricks;
-            } elseif ($relativeCmsUri == '/configuration/document-types/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->subTemplate = 'cms/configuration/document-types-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $documentType = $this->storage->getDocumentTypeBySlug($request::$get[self::GET_PARAMETER_SLUG], false);
-                $bricks = $this->storage->getBricks();
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->saveDocumentType($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
-                    exit;
-                }
-                $this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $documentType;
-                $this->parameters[self::PARAMETER_BRICKS] = $bricks;
-            } elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->storage->deleteDocumentTypeBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
-                exit;
-            }
-        }
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function bricksRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/configuration/bricks') {
-                $this->subTemplate = 'cms/configuration/bricks';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $this->parameters[self::PARAMETER_BRICKS] = $this->storage->getBricks();
-            } elseif ($relativeCmsUri == '/configuration/bricks/new') {
-                $this->subTemplate = 'cms/configuration/bricks-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->addBrick($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
-                    exit;
-                }
-            } elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->subTemplate = 'cms/configuration/bricks-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $brick = $this->storage->getBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->saveBrick($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
-                    exit;
-                }
-                $this->parameters[self::PARAMETER_BRICK] = $brick;
-            } elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->storage->deleteBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
-                exit;
-            } elseif ($relativeCmsUri == '/configuration/image-set') {
-                $this->subTemplate = 'cms/configuration/image-set';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $this->parameters[self::PARAMETER_IMAGE_SET] = $this->storage->getImageSet();
-            }
-        }
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function imageSetRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/configuration/image-set') {
-                $this->subTemplate = 'cms/configuration/image-set';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $this->parameters[self::PARAMETER_IMAGE_SET] = $this->storage->getImageSet();
-            } elseif ($relativeCmsUri == '/configuration/image-set/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->subTemplate = 'cms/configuration/image-set-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $imageSet = $this->storage->getImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->saveImageSet($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
-                    exit;
-                }
-                $this->parameters[self::PARAMETER_IMAGE_SET] = $imageSet;
-            } elseif ($relativeCmsUri == '/configuration/image-set/new') {
-                $this->subTemplate = 'cms/configuration/image-set-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->addImageSet($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
-                    exit;
-                }
-            } elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->storage->deleteImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
-                exit;
-            }
-        }
-
-        /**
-         * @param $request
-         * @param $relativeCmsUri
-         */
-        private function applicationComponentRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/configuration/application-components') {
-                $this->subTemplate = 'cms/configuration/application-components';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $this->parameters['applicationComponents'] = $this->storage->getApplicationComponents();
-            } elseif ($relativeCmsUri == '/configuration/application-components/new') {
-                $this->subTemplate = 'cms/configuration/application-components-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->addApplicationComponent($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
-                    exit;
-                }
-            } elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->subTemplate = 'cms/configuration/application-components-form';
-                $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
-                $applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
-                    $this->storage->saveApplicationComponent($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
-                    exit;
-                }
-                $this->parameters['applicationComponent'] = $applicationComponent;
-            } elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
-                $this->storage->deleteApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
-                exit;
-            }
-        }
-
-        private function logOffRouting($request, $relativeCmsUri)
-        {
-            if ($relativeCmsUri == '/log-off') {
-                $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
-                unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
-                exit;
-            }
-        }
-
-        public function setParameter($parameterName, $parameterValue)
-        {
-            $this->parameters[$parameterName] = $parameterValue;
-        }
-
-        public function getParameter($parameterName)
-        {
-            return $this->parameters[$parameterName];
-        }
-    }
+		public $storage;
+
+		const INVALID_CREDENTIALS_MESSAGE = 'Invalid username / password combination';
+
+		const MAIN_NAV_CLASS = 'default';
+
+		const PARAMETER_BLACKLIST_IPS = 'blacklistIps';
+		const PARAMETER_BODY = 'body';
+		const PARAMETER_BRICK = 'brick';
+		const PARAMETER_BRICKS = 'bricks';
+		const PARAMETER_CMS_PREFIX = 'cmsPrefix';
+		const PARAMETER_DOCUMENT = 'document';
+		const PARAMETER_DOCUMENTS = 'documents';
+		const PARAMETER_DOCUMENT_TYPE = 'documentType';
+		const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
+		const PARAMETER_ERROR_MESSAGE = 'errorMsg';
+		const PARAMETER_FILES = 'files';
+		const PARAMETER_FOLDER = 'folder';
+		const PARAMETER_IMAGE = 'image';
+		const PARAMETER_IMAGES = 'images';
+		const PARAMETER_IMAGE_SET = 'imageSet';
+		const PARAMETER_MAIN_NAV_CLASS = 'mainNavClass';
+		const PARAMETER_MY_BRICK_SLUG = 'myBrickSlug';
+		const PARAMETER_SITEMAP = 'sitemap';
+		const PARAMETER_SITEMAP_ITEM = 'sitemapItem';
+		const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
+		const PARAMETER_STATIC = 'static';
+		const PARAMETER_USER = 'user';
+		const PARAMETER_USERS = 'users';
+		const PARAMETER_USER_RIGHTS = 'userRights';
+		const PARAMETER_WHITELIST_IPS = 'whitelistIps';
+
+		const POST_PARAMETER_COMPONENT = 'component';
+		const POST_PARAMETER_PASSWORD = 'password';
+		const POST_PARAMETER_SAVE = 'save';
+		const POST_PARAMETER_TEMPLATE = 'template';
+		const POST_PARAMETER_TITLE = 'title';
+		const POST_PARAMETER_USERNAME = 'username';
+
+		const GET_PARAMETER_PATH = 'path';
+		const GET_PARAMETER_SLUG = 'slug';
+
+		const FILES_PARAMETER_FILE = 'file';
+
+		const SESSION_PARAMETER_CLOUD_CONTROL = 'cloudcontrol';
+
+		const LOGIN_TEMPLATE_PATH = 'cms/login';
+
+		const CONTENT_TYPE_APPLICATION_JSON = 'Content-type:application/json';
+
+		public $subTemplate = null;
+
+
+		/**
+		 * @param \library\storage\Storage $storage
+		 *
+		 * @return void
+		 */
+		public function run(Storage $storage)
+		{
+			$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::MAIN_NAV_CLASS;
+			$this->storage = $storage;
+
+			$remoteAddress = $_SERVER['REMOTE_ADDR'];
+			$this->checkWhiteList($remoteAddress);
+			$this->checkBlackList($remoteAddress);
+
+			$this->checkLogin();
+
+			$this->parameters[self::PARAMETER_USER_RIGHTS] = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
+
+			$this->routing();
+		}
+
+		/**
+		 * See if a user is logged or wants to log in and
+		 * takes appropriate actions.
+		 *
+		 * @throws \Exception
+		 */
+		protected function checkLogin()
+		{
+			$request = $this->request;
+
+			if (!isset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL])) {
+				if (isset($request::$post[self::POST_PARAMETER_USERNAME], $request::$post[self::POST_PARAMETER_PASSWORD])) {
+					$user = $this->storage->getUserByUsername($request::$post[self::POST_PARAMETER_USERNAME]);
+					$crypt = new Crypt();
+					if (empty($user)) {
+						$crypt->encrypt($request::$post[self::POST_PARAMETER_PASSWORD], 16); // Buy time, to avoid brute forcing
+						$this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
+						$this->showLogin();
+					} else {
+						$salt = $user->salt;
+						$password = $user->password;
+
+						$passwordCorrect = $crypt->compare($request::$post[self::POST_PARAMETER_PASSWORD], $password, $salt);
+
+						if ($passwordCorrect) {
+							$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = $user;
+						} else {
+							$this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
+							$this->showLogin();
+						}
+					}
+				} else {
+					$this->showLogin();
+				}
+			}
+		}
+
+		/**
+		 * Overrides normal behaviour and only renders the
+		 * login screen
+		 *
+		 * @throws \Exception
+		 */
+		protected function showLogin()
+		{
+			$loginTemplatePath = self::LOGIN_TEMPLATE_PATH;
+			$this->renderTemplate($loginTemplatePath);
+			ob_end_flush();
+			exit;
+		}
+
+		/**
+		 * As an exception, to keep the initial file structure simple
+		 * the cms implements it's own routing, apart from the regular sitemap functionality
+		 *
+		 * @throws \Exception
+		 */
+		protected function routing()
+		{
+			$relativeCmsUri = $this->getRelativeCmsUri($this->request);
+
+			$userRights = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
+
+			if ($relativeCmsUri == '' || $relativeCmsUri == '/') {
+				$this->subTemplate = 'cms/dashboard';
+			}
+
+			$this->logOffRouting($this->request, $relativeCmsUri);
+
+			$this->apiRouting($relativeCmsUri);
+
+			if (in_array(self::PARAMETER_DOCUMENTS, $userRights)) {
+				new DocumentRouting($this->request, $relativeCmsUri, $this);
+			}
+
+			if (in_array(self::PARAMETER_SITEMAP, $userRights)) {
+				$this->sitemapRouting($this->request, $relativeCmsUri);
+			}
+
+			if (in_array(self::PARAMETER_IMAGES, $userRights)) {
+				$this->imagesRouting($this->request, $relativeCmsUri);
+			}
+
+			if (in_array(self::PARAMETER_FILES, $userRights)) {
+				$this->filesRouting($this->request, $relativeCmsUri);
+			}
+
+			if (in_array('configuration', $userRights)) {
+				$this->configurationRouting($this->request, $relativeCmsUri);
+			}
+
+			if ($this->subTemplate !== null) {
+				$this->parameters[self::PARAMETER_BODY] = $this->renderTemplate($this->subTemplate);
+			}
+		}
+
+		/**
+		 * @param $remoteAddress
+		 * @throws \Exception
+		 */
+		private function checkWhiteList($remoteAddress)
+		{
+			if (isset($this->parameters[self::PARAMETER_WHITELIST_IPS])) {
+				$whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
+				$whitelistIps = array_map("trim", $whitelistIps);
+				if (!in_array($remoteAddress, $whitelistIps)) {
+					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+				}
+			}
+		}
+
+		/**
+		 * @param $remoteAddress
+		 * @throws \Exception
+		 */
+		private function checkBlackList($remoteAddress)
+		{
+			if (isset($this->parameters[self::PARAMETER_BLACKLIST_IPS])) {
+				$blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
+				$blacklistIps = array_map("trim", $blacklistIps);
+				if (in_array($remoteAddress, $blacklistIps)) {
+					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+				}
+			}
+		}
+
+		/**
+		 * @param $request
+		 * @return mixed|string
+		 */
+		private function getRelativeCmsUri($request)
+		{
+			// TODO Use regex match parameter instead of calculating relative uri
+			$pos = strpos($request::$relativeUri, $this->parameters[self::PARAMETER_CMS_PREFIX]);
+			$relativeCmsUri = '/';
+			if ($pos !== false) {
+				$relativeCmsUri = substr_replace($request::$relativeUri, '', $pos, strlen($this->parameters[self::PARAMETER_CMS_PREFIX]));
+			}
+			return $relativeCmsUri;
+		}
+
+		/**
+		 * @param \library\cc\Request $request
+		 * @param $relativeCmsUri
+		 */
+		private function sitemapRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/sitemap') {
+				$this->subTemplate = 'cms/sitemap';
+				if (isset($request::$post[self::POST_PARAMETER_SAVE])) {
+					$this->storage->saveSitemap($request::$post);
+				}
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
+				$this->parameters[self::PARAMETER_SITEMAP] = $this->storage->getSitemap();
+			} elseif ($relativeCmsUri == '/sitemap/new') {
+				$this->subTemplate = 'cms/sitemap/form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
+				if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
+					$this->storage->addSitemapItem($request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+					exit;
+				}
+			} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->subTemplate = 'cms/sitemap/form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
+				$sitemapItem = $this->storage->getSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
+					$this->storage->saveSitemapItem($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+					exit;
+				}
+				$this->parameters[self::PARAMETER_SITEMAP_ITEM] = $sitemapItem;
+			} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->storage->deleteSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+				exit;
+			}
+		}
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function imagesRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/images') {
+				$this->subTemplate = 'cms/images';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
+				$this->parameters[self::PARAMETER_IMAGES] = $this->storage->getImages();
+				$this->parameters[self::PARAMETER_SMALLEST_IMAGE] = $this->storage->getSmallestImageSet()->slug;
+			} elseif ($relativeCmsUri == '/images.json') {
+				header(self::CONTENT_TYPE_APPLICATION_JSON);
+				die(json_encode($this->storage->getImages()));
+			} elseif ($relativeCmsUri == '/images/new') {
+				$this->subTemplate = 'cms/images/form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
+				if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
+					$this->storage->addImage($_FILES[self::FILES_PARAMETER_FILE]);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
+					exit;
+				}
+			} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
+				$this->storage->deleteImageByName($request::$get[self::FILES_PARAMETER_FILE]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
+				exit;
+			} elseif ($relativeCmsUri == '/images/show' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
+				$this->subTemplate = 'cms/images/show';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
+				$this->parameters[self::PARAMETER_IMAGE] = $this->storage->getImageByName($request::$get[self::FILES_PARAMETER_FILE]);
+			}
+		}
+
+		/**
+		 * @param $relativeCmsUri
+		 */
+		private function apiRouting($relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/images.json') {
+				header(self::CONTENT_TYPE_APPLICATION_JSON);
+				die(json_encode($this->storage->getImages()));
+			} elseif ($relativeCmsUri == '/files.json') {
+				header(self::CONTENT_TYPE_APPLICATION_JSON);
+				die(json_encode($this->storage->getFiles()));
+			} elseif ($relativeCmsUri == '/documents.json') {
+				header(self::CONTENT_TYPE_APPLICATION_JSON);
+				die(json_encode($this->storage->getDocuments()));
+			}
+		}
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function filesRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/files') {
+				$this->subTemplate = 'cms/files';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_FILES;
+				$this->parameters[self::PARAMETER_FILES] = $this->storage->getFiles();
+			} elseif ($relativeCmsUri == '/files/new') {
+				$this->subTemplate = 'cms/files/form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_FILES;
+				if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
+					$this->storage->addFile($_FILES[self::FILES_PARAMETER_FILE]);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
+					exit;
+				}
+			} elseif ($relativeCmsUri == '/files/get' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
+				$this->downloadFile($request::$get[self::FILES_PARAMETER_FILE]);
+			} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
+				$this->storage->deleteFileByName($request::$get[self::FILES_PARAMETER_FILE]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
+				exit;
+			}
+		}
+
+		/**
+		 * @param $slug
+		 */
+		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);
+
+			header('Content-Description: File Transfer');
+			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);
+
+			readfile($path . '/' . $file->file);
+			exit;
+		}
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function configurationRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/configuration') {
+				$this->subTemplate = 'cms/configuration';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+			}
+
+			$this->usersRouting($request, $relativeCmsUri);
+			$this->documentTypesRouting($request, $relativeCmsUri);
+			$this->bricksRouting($request, $relativeCmsUri);
+			$this->imageSetRouting($request, $relativeCmsUri);
+			$this->applicationComponentRouting($request, $relativeCmsUri);
+		}
+
+
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function usersRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/configuration/users') {
+				$this->subTemplate = 'cms/configuration/users';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$this->parameters[self::PARAMETER_USERS] = $this->storage->getUsers();
+			} elseif ($relativeCmsUri == '/configuration/users/new') {
+				$this->subTemplate = 'cms/configuration/users-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
+					$this->storage->addUser($request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+					exit;
+				}
+			} elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->storage->deleteUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+				exit;
+			} elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->subTemplate = 'cms/configuration/users-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$this->parameters[self::PARAMETER_USER] = $this->storage->getUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
+					$this->storage->saveUser($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+					exit;
+				}
+			}
+		}
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function documentTypesRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/configuration/document-types') {
+				$this->subTemplate = 'cms/configuration/document-types';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$this->parameters[self::PARAMETER_DOCUMENT_TYPES] = $this->storage->getDocumentTypes();
+			} elseif ($relativeCmsUri == '/configuration/document-types/new') {
+				$this->subTemplate = 'cms/configuration/document-types-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$bricks = $this->storage->getBricks();
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->addDocumentType($request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+					exit;
+				}
+				$this->parameters[self::PARAMETER_BRICKS] = $bricks;
+			} elseif ($relativeCmsUri == '/configuration/document-types/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->subTemplate = 'cms/configuration/document-types-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$documentType = $this->storage->getDocumentTypeBySlug($request::$get[self::GET_PARAMETER_SLUG], false);
+				$bricks = $this->storage->getBricks();
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->saveDocumentType($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+					exit;
+				}
+				$this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $documentType;
+				$this->parameters[self::PARAMETER_BRICKS] = $bricks;
+			} elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->storage->deleteDocumentTypeBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+				exit;
+			}
+		}
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function bricksRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/configuration/bricks') {
+				$this->subTemplate = 'cms/configuration/bricks';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$this->parameters[self::PARAMETER_BRICKS] = $this->storage->getBricks();
+			} elseif ($relativeCmsUri == '/configuration/bricks/new') {
+				$this->subTemplate = 'cms/configuration/bricks-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->addBrick($request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+					exit;
+				}
+			} elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->subTemplate = 'cms/configuration/bricks-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$brick = $this->storage->getBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->saveBrick($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+					exit;
+				}
+				$this->parameters[self::PARAMETER_BRICK] = $brick;
+			} elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->storage->deleteBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+				exit;
+			} elseif ($relativeCmsUri == '/configuration/image-set') {
+				$this->subTemplate = 'cms/configuration/image-set';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$this->parameters[self::PARAMETER_IMAGE_SET] = $this->storage->getImageSet();
+			}
+		}
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function imageSetRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/configuration/image-set') {
+				$this->subTemplate = 'cms/configuration/image-set';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$this->parameters[self::PARAMETER_IMAGE_SET] = $this->storage->getImageSet();
+			} elseif ($relativeCmsUri == '/configuration/image-set/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->subTemplate = 'cms/configuration/image-set-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$imageSet = $this->storage->getImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->saveImageSet($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+					exit;
+				}
+				$this->parameters[self::PARAMETER_IMAGE_SET] = $imageSet;
+			} elseif ($relativeCmsUri == '/configuration/image-set/new') {
+				$this->subTemplate = 'cms/configuration/image-set-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->addImageSet($request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+					exit;
+				}
+			} elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->storage->deleteImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+				exit;
+			}
+		}
+
+		/**
+		 * @param $request
+		 * @param $relativeCmsUri
+		 */
+		private function applicationComponentRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/configuration/application-components') {
+				$this->subTemplate = 'cms/configuration/application-components';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$this->parameters['applicationComponents'] = $this->storage->getApplicationComponents();
+			} elseif ($relativeCmsUri == '/configuration/application-components/new') {
+				$this->subTemplate = 'cms/configuration/application-components-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->addApplicationComponent($request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+					exit;
+				}
+			} elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->subTemplate = 'cms/configuration/application-components-form';
+				$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
+				$applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
+					$this->storage->saveApplicationComponent($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
+					header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+					exit;
+				}
+				$this->parameters['applicationComponent'] = $applicationComponent;
+			} elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
+				$this->storage->deleteApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+				exit;
+			}
+		}
+
+		private function logOffRouting($request, $relativeCmsUri)
+		{
+			if ($relativeCmsUri == '/log-off') {
+				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
+				unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
+				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+				exit;
+			}
+		}
+
+		public function setParameter($parameterName, $parameterValue)
+		{
+			$this->parameters[$parameterName] = $parameterValue;
+		}
+
+		public function getParameter($parameterName)
+		{
+			return $this->parameters[$parameterName];
+		}
+	}
 }
\ No newline at end of file

Spacing +32 added lines, -32 removed lines

@@ -190,7 +190,7 @@ 
                 $whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
                 $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');
                 }
             }
         }
@@ -205,7 +205,7 @@ 
                 $blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
                 $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');
                 }
             }
         }
@@ -243,7 +243,7 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_SITEMAP;
                 if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
                     $this->storage->addSitemapItem($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/sitemap');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -252,13 +252,13 @@ 
                 $sitemapItem = $this->storage->getSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE], $request::$post[self::POST_PARAMETER_TEMPLATE], $request::$post[self::POST_PARAMETER_COMPONENT])) {
                     $this->storage->saveSitemapItem($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/sitemap');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_SITEMAP_ITEM] = $sitemapItem;
             } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteSitemapItemBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/sitemap');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/sitemap');
                 exit;
             }
         }
@@ -282,12 +282,12 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_IMAGES;
                 if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
                     $this->storage->addImage($_FILES[self::FILES_PARAMETER_FILE]);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/images');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->storage->deleteImageByName($request::$get[self::FILES_PARAMETER_FILE]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/images');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/images');
                 exit;
             } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->subTemplate = 'cms/images/show';
@@ -328,14 +328,14 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::PARAMETER_FILES;
                 if (isset($_FILES[self::FILES_PARAMETER_FILE])) {
                     $this->storage->addFile($_FILES[self::FILES_PARAMETER_FILE]);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/files');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/files/get' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->downloadFile($request::$get[self::FILES_PARAMETER_FILE]);
             } elseif ($relativeCmsUri == '/files/delete' && isset($request::$get[self::FILES_PARAMETER_FILE])) {
                 $this->storage->deleteFileByName($request::$get[self::FILES_PARAMETER_FILE]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/files');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/files');
                 exit;
             }
         }
@@ -346,21 +346,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;
         }
 
@@ -399,12 +399,12 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
                     $this->storage->addUser($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
                 exit;
             } elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->subTemplate = 'cms/configuration/users-form';
@@ -412,7 +412,7 @@ 
                 $this->parameters[self::PARAMETER_USER] = $this->storage->getUserBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($_POST[self::POST_PARAMETER_USERNAME])) {
                     $this->storage->saveUser($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/users');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/users');
                     exit;
                 }
             }
@@ -434,7 +434,7 @@ 
                 $bricks = $this->storage->getBricks();
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addDocumentType($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_BRICKS] = $bricks;
@@ -445,14 +445,14 @@ 
                 $bricks = $this->storage->getBricks();
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveDocumentType($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $documentType;
                 $this->parameters[self::PARAMETER_BRICKS] = $bricks;
             } elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteDocumentTypeBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/document-types');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/document-types');
                 exit;
             }
         }
@@ -472,7 +472,7 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addBrick($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -481,13 +481,13 @@ 
                 $brick = $this->storage->getBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveBrick($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_BRICK] = $brick;
             } elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteBrickBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/bricks');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/bricks');
                 exit;
             } elseif ($relativeCmsUri == '/configuration/image-set') {
                 $this->subTemplate = 'cms/configuration/image-set';
@@ -512,7 +512,7 @@ 
                 $imageSet = $this->storage->getImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveImageSet($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
                     exit;
                 }
                 $this->parameters[self::PARAMETER_IMAGE_SET] = $imageSet;
@@ -521,12 +521,12 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addImageSet($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteImageSetBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/image-set');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/image-set');
                 exit;
             }
         }
@@ -546,7 +546,7 @@ 
                 $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = 'configuration';
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->addApplicationComponent($request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
                     exit;
                 }
             } elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
@@ -555,13 +555,13 @@ 
                 $applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
                 if (isset($request::$post[self::POST_PARAMETER_TITLE])) {
                     $this->storage->saveApplicationComponent($request::$get[self::GET_PARAMETER_SLUG], $request::$post);
-                    header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+                    header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
                     exit;
                 }
                 $this->parameters['applicationComponent'] = $applicationComponent;
             } elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get[self::GET_PARAMETER_SLUG])) {
                 $this->storage->deleteApplicationComponentBySlug($request::$get[self::GET_PARAMETER_SLUG]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX] . '/configuration/application-components');
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX].'/configuration/application-components');
                 exit;
             }
         }
@@ -571,7 +571,7 @@ 
             if ($relativeCmsUri == '/log-off') {
                 $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
                 unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+                header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
                 exit;
             }
         }