jenskooij / cloudcontrol

cloudcontrol/library/cc/Request.php

Spacing +2 added lines, -2 removed lines

@@ -47,10 +47,10 @@
 		{
 			global $rootPath;
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$requestUri = $_SERVER['REQUEST_URI'];
 			self::$queryString = $_SERVER['QUERY_STRING'];
-			self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+			self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			self::$requestParameters = explode('/', self::$relativeUri);
 			
 			self::$get = $_GET;

cloudcontrol/library/images/Image.php

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/templates/cms/documents/brick.php

Spacing +8 added lines, -8 removed lines

@@ -3,9 +3,9 @@ 
 	<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 </div>
 <?if ($static == true) {
-	$fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]';
+	$fieldPrefix = 'bricks['.$myBrickSlug.']['.str_replace('.', '', str_replace(' ', '', microtime())).'][fields]';
 } else {
-	$fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']';
+	$fieldPrefix = 'dynamicBricks['.$brick->slug.']['.str_replace('.', '', str_replace(' ', '', microtime())).']';
 }?>
 <? foreach ($brick->fields as $field) : ?>
 			<div class="form-element">
@@ -30,7 +30,7 @@ 
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
 				<? endif ?>
-					<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+					<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 							</div>
@@ -52,7 +52,7 @@ 
 						<li class="grid-container">
 							<div class="grid-box-10">
 								<div class="grid-inner form-element">
-									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+									<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 								</div>
 							</div>
 							<div class="grid-box-2">
@@ -62,7 +62,7 @@ 
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -79,10 +79,10 @@ 
 							<a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a>
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
-							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+							<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 					<? endforeach ?>
 					<? endif ?>
 					</div>
@@ -91,5 +91,5 @@ 
 				<a class="btn js-addrtemultiple">+</a>
 				<? endif ?>
 			</div>
-			<?$value='';?>
+			<?$value = ''; ?>
 		<? endforeach ?>

cloudcontrol/templates/cms/documents/fieldTypes/Rich-Text.php

Spacing +3 added lines, -3 removed lines

@@ -6,12 +6,12 @@ 
 }
 ?>
 <div class="rte">
-	<div id="summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div>
+	<div id="summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div>
 </div>
 <textarea style="display:none;" id="summernote_<?=$field->slug?>_container_<?=$summernoteInstances?>" name="<?=$fieldPrefix?>[<?=$field->slug?>][]"></textarea>
 <script>
 	$(document).ready(function () {
-		$('#summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>').summernote({
+		$('#summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>').summernote({
 			height: 300,
 			toolbar: [
 				//[groupname, [button list]]
@@ -29,4 +29,4 @@ 
 if (!isset($GLOBALS['rteList'])) {
 	$GLOBALS['rteList'] = array();
 }
-$GLOBALS['rteList'][] = 'summernote_' . str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug . '_rte_' . $summernoteInstances ?>
+$GLOBALS['rteList'][] = 'summernote_'.str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug.'_rte_'.$summernoteInstances ?>

cloudcontrol/library/cc/Application.php

Spacing +8 added lines, -8 removed lines

@@ -65,12 +65,12 @@ 
 		 */
 		private function config()
 		{
-			$configPath = __DIR__ . '/../../config.json';
+			$configPath = __DIR__.'/../../config.json';
 			if (realpath($configPath) !== false) {
 				$json = file_get_contents($configPath);
 				$this->config = json_decode($json);
 			} else {
-				throw new \Exception('Couldn\'t find config file in path ' . $configPath);
+				throw new \Exception('Couldn\'t find config file in path '.$configPath);
 			}
 		}
 
@@ -93,7 +93,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -156,17 +156,17 @@ 
 		 * @return mixed
 		 * @throws \Exception
 		 */
-		private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem)
+		private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
 		{
-			$libraryComponentName = '\\library\\components\\' . $class;
-			$userComponentName = '\\components\\' . $class;
+			$libraryComponentName = '\\library\\components\\'.$class;
+			$userComponentName = '\\components\\'.$class;
 			
 			if (\autoLoad($libraryComponentName, false)) {
 				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} elseif (\autoLoad($userComponentName, false)) {
 				$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} else {
-				throw new \Exception('Could not load component ' . $class);
+				throw new \Exception('Could not load component '.$class);
 			}
 			
 			if (!$component instanceof Component) {
@@ -225,7 +225,7 @@ 
 		public function setCachingHeaders()
 		{
 			header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-			header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+			header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
 		}
 
 		/**

cloudcontrol/library/components/BaseComponent.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,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;
@@ -67,7 +67,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -93,9 +93,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
-			$templatePath = __DIR__ . '/../../templates/' . $template . '.php';
+			$templatePath = __DIR__.'/../../templates/'.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -112,7 +112,7 @@ 
 				return ob_get_contents();
 			} else {
 				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
+					throw new \Exception('Couldnt find template '.$templatePath);
 				}
 			}
 		}
@@ -127,7 +127,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {

cloudcontrol/library/components/LanguageComponent.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 
         if ($this->forceRedirect === true) {
             if (substr($request::$relativeUri, 0, 2) !== $lang && $lang !== $this->defaultLanguage) { // if default language detected, no redirect
-                header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+                header('Location: '.$request::$subfolders.$lang.'/'.$request::$relativeUri);
                 exit;
             }
         }

cloudcontrol/library/components/DocumentComponent.php

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 			if (isset($this->parameters['document'])) {
 				$this->runByDocumentParameter();
 			} else {
-				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
+				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: '.$this->matchedSitemapItem->title);
 			}
 		}
 
@@ -100,9 +100,9 @@ 
 				$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
 				if (isset($this->parameters['folder'])) {
 					if (substr($this->parameters['folder'], -1) !== '/') {
-						$this->parameters['folder'] = $this->parameters['folder'] . '/';
+						$this->parameters['folder'] = $this->parameters['folder'].'/';
 					}
-					$relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
+					$relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri;
 				}
 
 				$document = $this->storage->getDocumentBySlug($relativeDocumentUri);

cloudcontrol/library/components/CmsComponent.php

Spacing +39 added lines, -39 removed lines

@@ -148,7 +148,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');
 				}
 			}
 		}
@@ -163,7 +163,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');
 				}
 			}
 		}
@@ -216,7 +216,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'])) {
@@ -225,13 +225,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'])) {
 				$this->storage->deleteSitemapItemBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 				exit;
 			}
 		}
@@ -255,12 +255,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'])) {
 				$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'])) {
 				$this->subTemplate = 'cms/images/show';
@@ -301,14 +301,14 @@ 
 				$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'])) {
 				$this->downloadFile($request::$get['file']);
 			} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get['file'])) {
 				$this->storage->deleteFileByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 				exit;
 			}
 		}
@@ -319,21 +319,21 @@ 
 		private function downloadFile($slug)
 		{
 			$file = $this->storage->getFileByName($slug);
-			$path = realpath(__DIR__ . '/../../www/files/');
-			$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-			$size   = filesize($path . '/' . $file->file);
+			$path = realpath(__DIR__.'/../../www/files/');
+			$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+			$size   = filesize($path.'/'.$file->file);
 
 			header('Content-Description: File Transfer');
-			header('Content-Type: ' . $file->type);
-			header('Content-Disposition: attachment; filename=' . $quoted);
+			header('Content-Type: '.$file->type);
+			header('Content-Disposition: attachment; filename='.$quoted);
 			header('Content-Transfer-Encoding: binary');
 			header('Connection: Keep-Alive');
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header('Pragma: public');
-			header('Content-Length: ' . $size);
+			header('Content-Length: '.$size);
 
-			readfile($path . '/' . $file->file);
+			readfile($path.'/'.$file->file);
 			exit;
 		}
 
@@ -369,7 +369,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);
@@ -383,7 +383,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']);
@@ -406,7 +406,7 @@ 
 				die(json_encode($result));
 			} else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			}
 		}
@@ -422,7 +422,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;
 				}
 			} else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get['slug'])) {
@@ -435,11 +435,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;
 				}
 
@@ -447,7 +447,7 @@ 
 				$this->parameters['folder'] = $folder;
 			} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentFolderBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			}
 		}
@@ -467,12 +467,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'])) {
 				$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'])) {
 				$this->subTemplate = 'cms/configuration/users-form';
@@ -480,7 +480,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;
 				}
 			}
@@ -502,7 +502,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;
@@ -513,14 +513,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'])) {
 				$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;
 			}
 		}
@@ -540,7 +540,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'])) {
@@ -549,13 +549,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'])) {
 				$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') {
 				$this->subTemplate = 'cms/configuration/image-set';
@@ -580,7 +580,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;
@@ -589,12 +589,12 @@ 
 				$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'])) {
 				$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;
 			}
 		}
@@ -614,7 +614,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addApplicationComponent($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/application-components/edit' && isset($request::$get['slug'])) {
@@ -623,13 +623,13 @@ 
 				$applicationComponent = $this->storage->getApplicationComponentBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveApplicationComponent($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 					exit;
 				}
 				$this->parameters['applicationComponent'] = $applicationComponent;
 			} elseif ($relativeCmsUri == '/configuration/application-components/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteApplicationComponentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/application-components');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/application-components');
 				exit;
 			}
 		}
@@ -639,7 +639,7 @@ 
 			if ($relativeCmsUri == '/log-off') {
 				$_SESSION['cloudcontrol'] = null;
 				unset($_SESSION['cloudcontrol']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix']);
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix']);
 				exit;
 			}
 		}