jenskooij / cloudcontrol

cloudcontrol/library/images/methods/Crop.php

Indentation +2 added lines, -2 removed lines

@@ -109,8 +109,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, $this->_destWidth, $this->_destHeight);
 			

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/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/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

cloudcontrol/library/components/cms/DocumentRouting.php

Indentation +45 added lines, -45 removed lines

@@ -12,58 +12,58 @@
 
 class DocumentRouting implements CmsRouting
 {
-    /**
-     * 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])) {
+	/**
+	 * 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])) {
 			$this->documentOverviewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/documents/edit-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/documents/edit-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editDocumentRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/documents/get-brick' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/documents/get-brick' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->getBrickRoute($request, $cmsComponent);
-        } else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteDocumentRoute($request, $cmsComponent);
-        }
-    }
-
-    /**
-     * @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])) {
+		}
+	}
+
+	/**
+	 * @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])) {
 			$this->newFolderRoute($request, $cmsComponent);
-        } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editFolderRoute($request, $cmsComponent);
-        } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteFolderRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	/**
 	 * @param $request

cloudcontrol/library/storage/JsonStorage.php

Indentation +96 added lines, -96 removed lines

@@ -2,19 +2,19 @@ 
 namespace library\storage
 {
 
-    use library\crypt\Crypt;
-    use library\images\ImageResizer;
+	use library\crypt\Crypt;
+	use library\images\ImageResizer;
 
-    /**
+	/**
 	 * Class JsonStorage
 	 * @package library\storage
 	 */
 	class JsonStorage implements Storage
 	{
 		private $storageDir;
-        /**
-         * @var Repository
-         */
+		/**
+		 * @var Repository
+		 */
 		private $repository;
 
 		/**
@@ -76,12 +76,12 @@ 
 			return $return;
 		}
 
-        /**
-         * Get user by slug
-         *
-         * @param $slug
-         * @return array
-         */
+		/**
+		 * Get user by slug
+		 *
+		 * @param $slug
+		 * @return array
+		 */
 		public function getUserBySlug($slug)
 		{
 			$return = array();
@@ -97,23 +97,23 @@ 
 			return $return;
 		}
 
-        /**
-         * Get all users
-         *
-         * @return mixed
-         */
+		/**
+		 * Get all users
+		 *
+		 * @return mixed
+		 */
 		public function getUsers()
 		{
 			return $this->repository->users;
 		}
 
-        /**
-         * Save user
-         *
-         * @param $slug
-         * @param $postValues
-         * @throws \Exception
-         */
+		/**
+		 * Save user
+		 *
+		 * @param $slug
+		 * @param $postValues
+		 * @throws \Exception
+		 */
 		public function saveUser($slug, $postValues)
 		{
 			$userObj = $this->createUserFromPostValues($postValues);
@@ -134,12 +134,12 @@ 
 			$this->save();
 		}
 
-        /**
-         * Add user
-         *
-         * @param $postValues
-         * @throws \Exception
-         */
+		/**
+		 * Add user
+		 *
+		 * @param $postValues
+		 * @throws \Exception
+		 */
 		public function addUser($postValues)
 		{
 			$userObj = $this->createUserFromPostValues($postValues);
@@ -148,17 +148,17 @@ 
 			if (!empty($doesItExist)) {
 				throw new \Exception('Trying to add username that already exists.');
 			}
-            $users = $this->repository->users;
-            $users[] = $userObj;
-            $this->repository->users = $users;
+			$users = $this->repository->users;
+			$users[] = $userObj;
+			$this->repository->users = $users;
 			$this->save();
 		}
 
-        /**
-         * Delete user by slug
-         * @param $slug
-         * @throws \Exception
-         */
+		/**
+		 * Delete user by slug
+		 * @param $slug
+		 * @throws \Exception
+		 */
 		public function deleteUserBySlug($slug)
 		{
 			$userToDelete = $this->getUserBySlug($slug);
@@ -175,12 +175,12 @@ 
 			$this->save();
 		}
 
-        /**
-         * Create user from POST values
-         * @param $postValues
-         * @return \stdClass
-         * @throws \Exception
-         */
+		/**
+		 * Create user from POST values
+		 * @param $postValues
+		 * @return \stdClass
+		 * @throws \Exception
+		 */
 		private function createUserFromPostValues($postValues)
 		{
 			if (isset($postValues['username'])) {
@@ -229,40 +229,40 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
 		public function saveDocument($postValues)
 		{
-            $oldPath = '/' . $postValues['path'];
+			$oldPath = '/' . $postValues['path'];
 
-            $container = $this->getDocumentContainerByPath($oldPath);
-            $documentObject = $this->createDocumentFromPostValues($postValues);
-            if ($container->path === '/') {
-                $newPath = $container->path . $documentObject->slug;
-            } else {
-                $newPath = $container->path . '/' . $documentObject->slug;
-            }
-            $documentObject->path = $newPath;
-            $this->repository->saveDocument($documentObject);
-        }
+			$container = $this->getDocumentContainerByPath($oldPath);
+			$documentObject = $this->createDocumentFromPostValues($postValues);
+			if ($container->path === '/') {
+				$newPath = $container->path . $documentObject->slug;
+			} else {
+				$newPath = $container->path . '/' . $documentObject->slug;
+			}
+			$documentObject->path = $newPath;
+			$this->repository->saveDocument($documentObject);
+		}
 
 		public function addDocument($postValues)
 		{
 			$documentObject = $this->createDocumentFromPostValues($postValues);
-            if ($postValues['path'] === '/') {
-                $documentObject->path = $postValues['path'] . $documentObject->slug;
-            } else {
-                $documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
-            }
+			if ($postValues['path'] === '/') {
+				$documentObject->path = $postValues['path'] . $documentObject->slug;
+			} else {
+				$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+			}
 
-            $this->repository->saveDocument($documentObject);
+			$this->repository->saveDocument($documentObject);
 		}
 
 		public function deleteDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -313,13 +313,13 @@ 
 							$brickArray[] = $brickObj;
 						}
 
-                        $bricks = $documentObj->bricks;
+						$bricks = $documentObj->bricks;
 						$bricks[$brickSlug] = $brickArray;
-                        $documentObj->bricks = $bricks;
+						$documentObj->bricks = $bricks;
 					} else {
-                        $bricks = $documentObj->bricks;
+						$bricks = $documentObj->bricks;
 						$bricks[$brickSlug] = $brick;
-                        $documentObj->bricks = $bricks;
+						$documentObj->bricks = $bricks;
 					}
 				}
 			}
@@ -330,9 +330,9 @@ 
 						$brickObj = new \stdClass();
 						$brickObj->type = $brickTypeSlug;
 						$brickObj->fields = $brickContent;
-                        $dynamicBricks = $documentObj->dynamicBricks;
+						$dynamicBricks = $documentObj->dynamicBricks;
 						$dynamicBricks[] = $brickObj;
-                        $documentObj->dynamicBricks = $dynamicBricks;
+						$documentObj->dynamicBricks = $dynamicBricks;
 					}
 				}
 			}
@@ -348,13 +348,13 @@ 
 		 */
 		public function addDocumentFolder($postValues)
 		{
-            $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
-            if ($postValues['path'] === '/') {
-                $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
-            } else {
-                $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
-            }
-            $this->repository->saveDocument($documentFolderObject);
+			$documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
+			if ($postValues['path'] === '/') {
+				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+			} else {
+				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+			}
+			$this->repository->saveDocument($documentFolderObject);
 		}
 
 		/**
@@ -366,7 +366,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -380,7 +380,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
@@ -393,7 +393,7 @@ 
 		 */
 		public function saveDocumentFolder($postValues)
 		{
-            $this->addDocumentFolder($postValues);
+			$this->addDocumentFolder($postValues);
 		}
 
 		/**
@@ -406,7 +406,7 @@ 
 		 */
 		private function getDocumentContainerByPath($path)
 		{
-            return $this->repository->getDocumentContainerByPath($path);
+			return $this->repository->getDocumentContainerByPath($path);
 		}
 
 		/**
@@ -610,9 +610,9 @@ 
 				$imageObject->size = $postValues['size'];
 				$imageObject->set = $fileNames;
 
-                $images = $this->repository->images;
+				$images = $this->repository->images;
 				$images[] = $imageObject;
-                $this->repository->images = $images;
+				$this->repository->images = $images;
 
 				$this->save();
 			} else {
@@ -647,7 +647,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getImageByName($filename)
 		{
 			$images = $this->getImages();
@@ -698,9 +698,9 @@ 
 				$file->type = $postValues['type'];
 				$file->size = $postValues['size'];
 
-                $files = $this->repository->files;
+				$files = $this->repository->files;
 				$files[] = $file;
-                $this->repository->files = $files;
+				$this->repository->files = $files;
 				$this->save();
 			} else {
 				throw new \Exception('Error moving uploaded file');
@@ -739,7 +739,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getFileByName($filename)
 		{
 			$files = $this->getFiles();
@@ -754,7 +754,7 @@ 
 		/**
 		 * @param $filename
 		 * @throws \Exception
-         */
+		 */
 		public function deleteFileByName($filename)
 		{
 			$destinationPath = realpath(__DIR__ . '/../../www/files/');
@@ -799,9 +799,9 @@ 
 		{
 			$documentTypeObject = $this->createDocumentTypeFromPostValues($postValues);
 
-            $documentTypes = $this->repository->documentTypes;
-            $documentTypes[] = $documentTypeObject;
-            $this->repository->documentTypes = $documentTypes;
+			$documentTypes = $this->repository->documentTypes;
+			$documentTypes[] = $documentTypeObject;
+			$this->repository->documentTypes = $documentTypes;
 
 			$this->save();
 		}
@@ -947,9 +947,9 @@ 
 		{
 			$brickObject = $this->createBrickFromPostValues($postValues);
 
-            $bricks = $this->repository->bricks;
-            $bricks[] = $brickObject;
-            $this->repository->bricks = $bricks;
+			$bricks = $this->repository->bricks;
+			$bricks[] = $brickObject;
+			$this->repository->bricks = $bricks;
 
 			$this->save();
 		}
@@ -1154,9 +1154,9 @@ 
 		{
 			$imageSetObject = $this->createImageSetFromPostValues($postValues);
 
-            $imageSet = $this->repository->imageSet;
-            $imageSet[] = $imageSetObject;
-            $this->repository->imageSet = $imageSet;
+			$imageSet = $this->repository->imageSet;
+			$imageSet[] = $imageSetObject;
+			$this->repository->imageSet = $imageSet;
 
 			$this->save();
 		}

cloudcontrol/library/components/LanguageComponent.php

Indentation +118 added lines, -118 removed lines

@@ -6,124 +6,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(JsonStorage $storage) {}
-    public function render() {}
-    public function get() {}
+	public function run(JsonStorage $storage) {}
+	public function render() {}
+	public function get() {}
 }
\ No newline at end of file

cloudcontrol/library/cc/errorhandler.php

Indentation +114 added lines, -114 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,104 +85,104 @@ 
  * @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, $trace, $lines);
-        }
+		if (PHP_SAPI === 'cli') {
+			renderCliException($message, $file, $line, $trace, $lines);
+		}
 
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
-            header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
-        } else {
-            header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-            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')) {
+			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+			include(realpath(__DIR__) . '/errorviewdetailed.php');
+		} else {
+			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+			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, $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