jenskooij / cloudcontrol

cloudcontrol/library/images/methods/SmartCrop.php

Indentation +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			

cloudcontrol/library/images/methods/Crop.php

Indentation +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			

cloudcontrol/library/images/methods/BoxCrop.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		/**
 		 * @param resource $imageResource
 		 * @return resource
-         */
+		 */
 		public function Execute($imageResource)
 		{
 			// Define the origial width and height

cloudcontrol/library/storage/JsonStorage.php

Indentation +3 added lines, -3 removed lines

@@ -786,7 +786,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getImageByName($filename)
 		{
 			$images = $this->getImages();
@@ -876,7 +876,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getFileByName($filename)
 		{
 			$files = $this->getFiles();
@@ -891,7 +891,7 @@ 
 		/**
 		 * @param $filename
 		 * @throws \Exception
-         */
+		 */
 		public function deleteFileByName($filename)
 		{
 			$destinationPath = realpath(__DIR__ . '/../../www/files/');

cloudcontrol/library/cc/errorhandler.php

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

cloudcontrol/library/components/LanguageComponent.php

Indentation +118 added lines, -118 removed lines

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

cloudcontrol/library/components/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

cloudcontrol/library/components/cms/SitemapRouting.php

Indentation +14 added lines, -14 removed lines

@@ -14,24 +14,24 @@
 class SitemapRouting implements CmsRouting
 {
 
-    /**
-     * SitemapRouting constructor.
-     * @param \library\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/sitemap') {
+	/**
+	 * SitemapRouting constructor.
+	 * @param \library\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/sitemap') {
 			$this->overviewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/new') {
+		} elseif ($relativeCmsUri == '/sitemap/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	/**
 	 * @param $request

cloudcontrol/library/components/cms/ImagesRouting.php

Indentation +15 added lines, -15 removed lines

@@ -13,26 +13,26 @@
 class ImagesRouting implements CmsRouting
 {
 
-    /**
-     * ImagesRouting constructor.
-     * @param \library\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/images') {
+	/**
+	 * ImagesRouting constructor.
+	 * @param \library\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/images') {
 			$this->overviewRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/images.json') {
+		} elseif ($relativeCmsUri == '/images.json') {
 			$this->jsonRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/images/new') {
+		} elseif ($relativeCmsUri == '/images/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+		} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
 			$this->deleteRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+		} elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
 			$this->showRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	/**
 	 * @param $cmsComponent