jenskooij / cloudcontrol

cloudcontrol/library/components/cms/configuration/BricksRouting.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->addBrick($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 				exit;
 			}
 		} elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
@@ -42,13 +42,13 @@ 
 			$brick = $cmsComponent->storage->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->saveBrick($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 				exit;
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $brick);
 		} elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->deleteBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 			exit;
 		} elseif ($relativeCmsUri == '/configuration/image-set') {
 			$cmsComponent->subTemplate = 'cms/configuration/image-set';

cloudcontrol/library/components/cms/configuration/ImageSetRouting.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 			$imageSet = $cmsComponent->storage->getImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->saveImageSet($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 				exit;
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_IMAGE_SET, $imageSet);
@@ -43,12 +43,12 @@ 
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->addImageSet($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 				exit;
 			}
 		} elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->deleteImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 			exit;
 		}
 	}

cloudcontrol/library/components/cms/configuration/ApplicationComponentRouting.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->addApplicationComponent($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 				exit;
 			}
 		} elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
@@ -42,14 +42,14 @@ 
 			$applicationComponent = $cmsComponent->storage->getApplicationComponentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->saveApplicationComponent($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 				exit;
 			}
 
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_APPLICATION_COMPONENT, $applicationComponent);
 		} elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->deleteApplicationComponentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/application-components');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/application-components');
 			exit;
 		}
 	}

cloudcontrol/library/components/cms/configuration/DocumentTypeRouting.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 			$bricks = $cmsComponent->storage->getBricks();
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->addDocumentType($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 				exit;
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $bricks);
@@ -45,14 +45,14 @@ 
 			$bricks = $cmsComponent->storage->getBricks();
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 				$cmsComponent->storage->saveDocumentType($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 				exit;
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $documentType);
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $bricks);
 		} elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->deleteDocumentTypeBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types');
 			exit;
 		}
 	}

cloudcontrol/library/components/cms/configuration/UsersRouting.php

Spacing +3 added lines, -3 removed lines

@@ -34,12 +34,12 @@ 
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_USERNAME])) {
 				$cmsComponent->storage->addUser($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 				exit;
 			}
 		} elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->deleteUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 			exit;
 		} elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->subTemplate = 'cms/configuration/users-form';
@@ -47,7 +47,7 @@ 
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_USER, $cmsComponent->storage->getUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
 			if (isset($_POST[CmsComponent::POST_PARAMETER_USERNAME])) {
 				$cmsComponent->storage->saveUser($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 				exit;
 			}
 		}

cloudcontrol/library/components/CmsComponent.php

Indentation +253 added lines, -253 removed lines

@@ -5,270 +5,270 @@
 	use library\components\cms\DocumentRouting;
 	use library\components\cms\FilesRouting;
 	use library\components\cms\ImagesRouting;
-    use library\components\cms\SitemapRouting;
-    use library\crypt\Crypt;
-    use library\storage\Storage;
+	use library\components\cms\SitemapRouting;
+	use library\crypt\Crypt;
+	use library\storage\Storage;
 
 	class CmsComponent extends BaseComponent
-    {
-        /*
+	{
+		/*
          * var \library\storage\Storage
          */
 
 
 		public $storage;
 
-        const INVALID_CREDENTIALS_MESSAGE = 'Invalid username / password combination';
+		const INVALID_CREDENTIALS_MESSAGE = 'Invalid username / password combination';
 
-        const MAIN_NAV_CLASS = 'default';
+		const MAIN_NAV_CLASS = 'default';
 
 		const PARAMETER_APPLICATION_COMPONENT = 'applicationComponent';
 		const PARAMETER_APPLICATION_COMPONENTS = 'applicationComponents';
-        const PARAMETER_BLACKLIST_IPS = 'blacklistIps';
-        const PARAMETER_BODY = 'body';
-        const PARAMETER_BRICK = 'brick';
-        const PARAMETER_BRICKS = 'bricks';
-        const PARAMETER_CMS_PREFIX = 'cmsPrefix';
+		const PARAMETER_BLACKLIST_IPS = 'blacklistIps';
+		const PARAMETER_BODY = 'body';
+		const PARAMETER_BRICK = 'brick';
+		const PARAMETER_BRICKS = 'bricks';
+		const PARAMETER_CMS_PREFIX = 'cmsPrefix';
 		const PARAMETER_CONFIGURATION = 'configuration';
-        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)) {
-                new SitemapRouting($this->request, $relativeCmsUri, $this);
-            }
-
-            if (in_array(self::PARAMETER_IMAGES, $userRights)) {
-                new ImagesRouting($this->request, $relativeCmsUri, $this);
-            }
-
-            if (in_array(self::PARAMETER_FILES, $userRights)) {
-                new FilesRouting($this->request, $relativeCmsUri, $this);
-            }
-
-            if (in_array('configuration', $userRights)) {
-                new ConfigurationRouting($this->request, $relativeCmsUri, $this);
-            }
-
-            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 $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()));
-            }
-        }
-
-        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];
-        }
-    }
+		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)) {
+				new SitemapRouting($this->request, $relativeCmsUri, $this);
+			}
+
+			if (in_array(self::PARAMETER_IMAGES, $userRights)) {
+				new ImagesRouting($this->request, $relativeCmsUri, $this);
+			}
+
+			if (in_array(self::PARAMETER_FILES, $userRights)) {
+				new FilesRouting($this->request, $relativeCmsUri, $this);
+			}
+
+			if (in_array('configuration', $userRights)) {
+				new ConfigurationRouting($this->request, $relativeCmsUri, $this);
+			}
+
+			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 $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()));
+			}
+		}
+
+		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 +3 added lines, -3 removed lines

@@ -199,7 +199,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');
                 }
             }
         }
@@ -214,7 +214,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');
                 }
             }
         }
@@ -256,7 +256,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;
             }
         }