jenskooij / cloudcontrol

cloudcontrol/library/images/Image.php

Braces +10 added lines, -8 removed lines

@@ -59,8 +59,7 @@ 
 				return imagejpeg($imageResource, $path, $quality);
 			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
 				return imagepng($imageResource, $path, (intval($quality / 10) -1));
-			}
-			else {
+			} else {
 				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
 			}
 			return false;
@@ -101,8 +100,9 @@ 
 			//    Load the image into a string 
 			$file    =    fopen($p_sFile,"rb"); 
 			$read    =    fread($file,10); 
-			while(!feof($file)&&($read<>"")) 
-				$read    .=    fread($file,1024); 
+			while(!feof($file)&&($read<>"")) {
+							$read    .=    fread($file,1024);
+			}
 			
 			$temp    =    unpack("H*",$read); 
 			$hex    =    $temp[1]; 
@@ -153,8 +153,9 @@ 
 				{ 
 					//    If padding needed, ignore image-padding 
 					//    Shift i to the ending of the current 32-bit-block 
-					if ($usePadding) 
-						$i    +=    $width%4; 
+					if ($usePadding) {
+											$i    +=    $width%4;
+					}
 					
 					//    Reset horizontal position 
 					$x    =    0; 
@@ -163,8 +164,9 @@ 
 					$y++; 
 					
 					//    Reached the image-height? Break the for-loop 
-					if ($y>$height) 
-						break; 
+					if ($y>$height) {
+											break;
+					}
 				} 
 				
 				//    Calculation of the RGB-pixel (defined as BGR in image-data) 

Doc Comments +1 added lines

@@ -73,6 +73,7 @@
 		 * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
 		 * @param string 	$imagePath
 		 * @param bool 		$getExtension
+		 * @return integer
 		 */
 		public function GetImageMimeType($imagePath, $getExtension = false)
 		{

Spacing +36 added lines, -36 removed lines

@@ -32,10 +32,10 @@ 
 					$imageContent = file_get_contents($imageContainer);
 					$this->_imageResource = imagecreatefromstring($imageContent);
 				}
-			} elseif(is_string($imageContainer)) {
+			} elseif (is_string($imageContainer)) {
 				$this->_imageResource = imagecreatefromstring($imageContainer);
 			} else {
-				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>' . var_export($imageContainer, true) . '</pre>');
+				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>'.var_export($imageContainer, true).'</pre>');
 			}
 		}
 		
@@ -55,10 +55,10 @@ 
 			
 			if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
 				return imagegif($imageResource, $path);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG)  {
+			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
 				return imagejpeg($imageResource, $path, $quality);
 			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
-				return imagepng($imageResource, $path, (intval($quality / 10) -1));
+				return imagepng($imageResource, $path, (intval($quality / 10) - 1));
 			}
 			else {
 				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
@@ -79,7 +79,7 @@ 
 			if (function_exists('exif_imagetype')) {
 				$exif = exif_imagetype($imagePath);
 			} else {
-				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false ) {
+				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
 					$exif = $type;
 				} else {
 					$exif = false;
@@ -99,86 +99,86 @@ 
 		public function CreateImageFromBmp($p_sFile)
 		{
 			//    Load the image into a string 
-			$file    =    fopen($p_sFile,"rb"); 
-			$read    =    fread($file,10); 
-			while(!feof($file)&&($read<>"")) 
-				$read    .=    fread($file,1024); 
+			$file    = fopen($p_sFile, "rb"); 
+			$read    = fread($file, 10); 
+			while (!feof($file) && ($read <> "")) 
+				$read .= fread($file, 1024); 
 			
-			$temp    =    unpack("H*",$read); 
-			$hex    =    $temp[1]; 
-			$header    =    substr($hex,0,108);
-			$width=null;
-			$height=null;
+			$temp = unpack("H*", $read); 
+			$hex = $temp[1]; 
+			$header = substr($hex, 0, 108);
+			$width = null;
+			$height = null;
 			
 			//    Process the header 
 			//    Structure: http://www.fastgraph.com/help/bmp_header_format.html 
-			if (substr($header,0,4)=="424d") 
+			if (substr($header, 0, 4) == "424d") 
 			{ 
 				//    Cut it in parts of 2 bytes 
-				$header_parts    =    str_split($header,2); 
+				$header_parts = str_split($header, 2); 
 				
 				//    Get the width        4 bytes 
-				$width            =    hexdec($header_parts[19].$header_parts[18]); 
+				$width = hexdec($header_parts[19].$header_parts[18]); 
 				
 				//    Get the height        4 bytes 
-				$height            =    hexdec($header_parts[23].$header_parts[22]); 
+				$height = hexdec($header_parts[23].$header_parts[22]); 
 				
 				//    Unset the header params 
 				unset($header_parts); 
 			} 
 			
 			//    Define starting X and Y 
-			$x                =    0; 
-			$y                =    1; 
+			$x                = 0; 
+			$y                = 1; 
 			
 			//    Create newimage 
-			$image            =    imagecreatetruecolor($width,$height); 
+			$image            = imagecreatetruecolor($width, $height); 
 			
 			//    Grab the body from the image 
-			$body            =    substr($hex,108); 
+			$body = substr($hex, 108); 
 
 			//    Calculate if padding at the end-line is needed 
 			//    Divided by two to keep overview. 
 			//    1 byte = 2 HEX-chars 
-			$body_size        =    (strlen($body)/2); 
-			$header_size    =    ($width*$height); 
+			$body_size = (strlen($body) / 2); 
+			$header_size = ($width * $height); 
 
 			//    Use end-line padding? Only when needed 
-			$usePadding        =    ($body_size>($header_size*3)+4); 
+			$usePadding = ($body_size > ($header_size * 3) + 4); 
 			
 			//    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption 
 			//    Calculate the next DWORD-position in the body 
-			for ($i=0;$i<$body_size;$i+=3) 
+			for ($i = 0; $i < $body_size; $i += 3) 
 			{ 
 				//    Calculate line-ending and padding 
-				if ($x>=$width) 
+				if ($x >= $width) 
 				{ 
 					//    If padding needed, ignore image-padding 
 					//    Shift i to the ending of the current 32-bit-block 
 					if ($usePadding) 
-						$i    +=    $width%4; 
+						$i += $width % 4; 
 					
 					//    Reset horizontal position 
-					$x    =    0; 
+					$x = 0; 
 					
 					//    Raise the height-position (bottom-up) 
 					$y++; 
 					
 					//    Reached the image-height? Break the for-loop 
-					if ($y>$height) 
+					if ($y > $height) 
 						break; 
 				} 
 				
 				//    Calculation of the RGB-pixel (defined as BGR in image-data) 
 				//    Define $i_pos as absolute position in the body 
-				$i_pos    =    $i*2; 
-				$r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]); 
-				$g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]); 
-				$b        =    hexdec($body[$i_pos].$body[$i_pos+1]); 
+				$i_pos    = $i * 2; 
+				$r        = hexdec($body[$i_pos + 4].$body[$i_pos + 5]); 
+				$g        = hexdec($body[$i_pos + 2].$body[$i_pos + 3]); 
+				$b        = hexdec($body[$i_pos].$body[$i_pos + 1]); 
 				
 				//    Calculate and draw the pixel 
-				$color    =    imagecolorallocate($image,$r,$g,$b); 
-				imagesetpixel($image,$x,$height-$y,$color); 
+				$color    = imagecolorallocate($image, $r, $g, $b); 
+				imagesetpixel($image, $x, $height - $y, $color); 
 				
 				//    Raise the horizontal position 
 				$x++; 

cloudcontrol/library/images/methods/Watermark.php

Braces +9 added lines, -3 removed lines

@@ -61,7 +61,9 @@ 
 		 */
 		protected function calculateX($imageResource)
 		{
-			if (intval($this->_x) === $this->_x) return $this->_x;
+			if (intval($this->_x) === $this->_x) {
+				return $this->_x;
+			}
 			
 			$x = strtolower($this->_x);
 			
@@ -86,7 +88,9 @@ 
 		 */
 		public function calculateY($imageResource)
 		{
-			if (intval($this->_y) === $this->_y) return $this->_y;
+			if (intval($this->_y) === $this->_y) {
+				return $this->_y;
+			}
 		
 			$y = strtolower($this->_y);
 			
@@ -123,7 +127,9 @@ 
 		 */
 		public function GetWatermark()
 		{
-			if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
+			if ($this->_watermark == null) {
+				throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
+			}
 			return $this->_watermark;
 		}
 		

Doc Comments +4 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 		 * Use build-in logic to position the x of watermark
 		 *
 		 * @param 	string $imageResource
-		 * @return 	self
+		 * @return 	integer
 		 */
 		protected function calculateX($imageResource)
 		{
@@ -82,7 +82,7 @@ 
 		 * Use build-in logic to position the y of watermark
 		 *
 		 * @param 	string $imageResource
-		 * @return 	self
+		 * @return 	integer
 		 */
 		public function calculateY($imageResource)
 		{
@@ -131,6 +131,7 @@ 
 		 * Set the x
 		 *
 		 * @param  int | string $x
+		 * @param string $x
 		 * @return self
 		 */
 		public function SetX($x)
@@ -143,6 +144,7 @@ 
 		 * Set the y
 		 *
 		 * @param  int | string $y
+		 * @param string $y
 		 * @return self
 		 */
 		public function SetY($y)

cloudcontrol/library/images/methods/Resize.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 			
 			// Define the ratio and adjust the width and height
 			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+				$ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight);
 				$this->_width = $originalWidth * $ratio;
 				$this->_height = $originalHeight * $ratio;
 			}

cloudcontrol/library/images/methods/BoxCrop.php

Spacing +2 added lines, -2 removed lines

@@ -26,14 +26,14 @@
 			
 			// Define which ratio will be used, depending on which is the smallest side
 			$ratio = min($hRatio, $wRatio);
-			if($ratio > 1) $ratio = 1;
+			if ($ratio > 1) $ratio = 1;
 			
 			// Define sizes
 			$this->_destWidth = floor($originalWidth * $ratio);
 			$this->_destHeight = floor($originalHeight * $ratio);
 			
 			// Define margins
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
+			$this->_destX = floor(($this->_width - $this->_destWidth) / 2);
 			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
 			
 			// Execute the Crop method with the given parameters

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 			
 			// Define which ratio will be used, depending on which is the smallest side
 			$ratio = min($hRatio, $wRatio);
-			if($ratio > 1) $ratio = 1;
+			if($ratio > 1) {
+				$ratio = 1;
+			}
 			
 			// Define sizes
 			$this->_destWidth = floor($originalWidth * $ratio);

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);
 			

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
 			
 			// Define which ratio will be used, depending on which is the biggest side
 			$ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
-			if ($ratio < 1) $ratio = 1;
+			if ($ratio < 1) {
+				$ratio = 1;
+			}
 			
 			// Calculate the destination width, height, x and y
 			$this->_destWidth = $originalWidth / $ratio;

cloudcontrol/library/crypt/Crypt.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 				$output = '';
 				for ($i = 0; $i < $count; $i += 16) {
 					$random_state =
-						md5(microtime() . $random_state);
+						md5(microtime().$random_state);
 					$output .=
 						pack('H*', md5($random_state));
 				}

cloudcontrol/library/components/DocumentComponent.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
 			$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
 			if (isset($this->parameters['folder'])) {
-				$relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
+				$relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri;
 			}
 
 			$document = $storage->getDocumentBySlug($relativeDocumentUri);

cloudcontrol/library/components/BaseComponent.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -86,9 +86,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='')
+		public function renderTemplate($template = '')
 		{
-			$templatePath = __DIR__ . '/../../templates/' . $template . '.php';
+			$templatePath = __DIR__.'/../../templates/'.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				ob_clean();
 				$this->parameters['request'] = $this->request;
@@ -96,7 +96,7 @@ 
 				include($templatePath);
 				return ob_get_contents();
 			} else {
-				throw new \Exception('Couldnt find template ' . $templatePath);
+				throw new \Exception('Couldnt find template '.$templatePath);
 			}
 		}
 	}

cloudcontrol/library/components/CmsComponent.php

Spacing +36 added lines, -36 removed lines

@@ -125,7 +125,7 @@ 
 				$this->parameters['mainNavClass'] = 'documents';
 				if (isset($request::$post['title'], $request::$post['path'])) {
 					$this->storage->addDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/documents/new-document' && isset($request::$get['path']) && in_array('documents', $userRights)) {
@@ -135,7 +135,7 @@ 
 				if (isset($request::$get['documentType'])) {
 					if (isset($request::$post['title'], $request::$get['documentType'], $request::$get['path'])) {
 						$this->storage->addDocument($request::$post);
-						header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+						header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 						exit;
 					}
 					$this->parameters['documentType'] = $this->storage->getDocumentTypeBySlug($request::$get['documentType'], true);
@@ -149,7 +149,7 @@ 
 				$this->parameters['smallestImage'] = $this->storage->getSmallestImageSet()->slug;
 				if (isset($request::$post['title'], $request::$get['slug'])) {
 					$this->storage->saveDocument($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 				$this->parameters['document'] = $this->storage->getDocumentBySlug($request::$get['slug']);
@@ -170,11 +170,11 @@ 
 				array_pop($path);
 				$path = implode('/', $path);
 
-				$request::$get['path'] = '/' . $path;
+				$request::$get['path'] = '/'.$path;
 
 				if (isset($request::$post['title'], $request::$post['content'])) {
 					$this->storage->saveDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 
@@ -182,11 +182,11 @@ 
 				$this->parameters['folder'] = $folder;
 			} else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get['slug']) && in_array('documents', $userRights)) {
 				$this->storage->deleteDocumentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get['slug']) && in_array('documents', $userRights)) {
 				$this->storage->deleteDocumentFolderBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			} elseif ($relativeCmsUri == '/sitemap' && in_array('sitemap', $userRights)) {
 				$template = 'cms/sitemap';
@@ -200,7 +200,7 @@ 
 				$this->parameters['mainNavClass'] = 'sitemap';
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->addSitemapItem($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get['slug']) && in_array('sitemap', $userRights)) {
@@ -209,13 +209,13 @@ 
 				$sitemapItem = $this->storage->getSitemapItemBySlug($request::$get['slug']);
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->saveSitemapItem($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 				$this->parameters['sitemapItem'] = $sitemapItem;
 			} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get['slug']) && in_array('sitemap', $userRights)) {
 				$this->storage->deleteSitemapItemBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 				exit;
 			} elseif ($relativeCmsUri == '/images' && in_array('images', $userRights)) {
 				$template = 'cms/images';
@@ -231,12 +231,12 @@ 
 				$this->parameters['mainNavClass'] = 'images';
 				if (isset($_FILES['file'])) {
 					$this->storage->addImage($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get['file']) && in_array('images', $userRights)) {
 				$this->storage->deleteImageByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 				exit;
 			} elseif ($relativeCmsUri == '/images/show' && isset($request::$get['file']) && in_array('images', $userRights)) {
 				$template = 'cms/images/show';
@@ -255,30 +255,30 @@ 
 				$this->parameters['mainNavClass'] = 'files';
 				if (isset($_FILES['file'])) {
 					$this->storage->addFile($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/files/get' && isset($request::$get['file']) && in_array('files', $userRights)) {
 				$file = $this->storage->getFileByName($request::$get['file']);
-				$path = realpath(__DIR__ . '/../../www/files/');
-				$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-				$size   = filesize($path . '/' . $file->file);
+				$path = realpath(__DIR__.'/../../www/files/');
+				$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+				$size   = filesize($path.'/'.$file->file);
 
 				header('Content-Description: File Transfer');
-				header('Content-Type: ' . $file->type);
-				header('Content-Disposition: attachment; filename=' . $quoted);
+				header('Content-Type: '.$file->type);
+				header('Content-Disposition: attachment; filename='.$quoted);
 				header('Content-Transfer-Encoding: binary');
 				header('Connection: Keep-Alive');
 				header('Expires: 0');
 				header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 				header('Pragma: public');
-				header('Content-Length: ' . $size);
+				header('Content-Length: '.$size);
 
-				readfile($path . '/' . $file->file);
+				readfile($path.'/'.$file->file);
 				exit;
 			} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get['file']) && in_array('files', $userRights)) {
 				$this->storage->deleteFileByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration' && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration';
@@ -292,12 +292,12 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($_POST['username'])) {
 					$this->storage->addUser($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteUserBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration/users-form';
@@ -305,7 +305,7 @@ 
 				$this->parameters['user'] = $this->storage->getUserBySlug($request::$get['slug']);
 				if (isset($_POST['username'])) {
 					$this->storage->saveUser($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/document-types' && in_array('configuration', $userRights)) {
@@ -318,7 +318,7 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->addDocumentType($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['bricks'] = $bricks;
@@ -329,14 +329,14 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->saveDocumentType($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['documentType'] = $documentType;
 				$this->parameters['bricks'] = $bricks;
 			} elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteDocumentTypeBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/bricks' && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration/bricks';
@@ -347,7 +347,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addBrick($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
@@ -356,13 +356,13 @@ 
 				$brick = $this->storage->getBrickBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveBrick($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 				$this->parameters['brick'] = $brick;
 			} elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteBrickBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/image-set' && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration/image-set';
@@ -374,7 +374,7 @@ 
 				$imageSet = $this->storage->getImageSetBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveImageSet($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 				$this->parameters['imageSet'] = $imageSet;
@@ -383,17 +383,17 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addImageSet($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteImageSetBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 				exit;
 			} elseif ($relativeCmsUri == '/log-off') {
 				$_SESSION['cloudcontrol'] = null;
 				unset($_SESSION['cloudcontrol']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix']);
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix']);
 				exit;
 			}
 
@@ -408,7 +408,7 @@ 
 				$whitelistIps = explode(',', $this->parameters['whitelistIps']);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -419,7 +419,7 @@ 
 				$blacklistIps = explode(',', $this->parameters['blacklistIps']);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}