jenskooij / cloudcontrol

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/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/components/LanguageComponent.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     /**
      * Detect if the language is switched manually
      *
-     * @param $request
+     * @param Request $request
      */
     private function checkLanguageSwitch($request)
     {

Spacing +2 added lines, -2 removed lines

@@ -99,9 +99,9 @@
         $this->sessionValues = $_SESSION['LanguageComponent'];
 
         if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
+            if (substr($request::$relativeUri, 0, 2) !== $lang) {
                 if ($lang !== $this->defaultLanguage) {
-                    header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+                    header('Location: '.$request::$subfolders.$lang.'/'.$request::$relativeUri);
                     exit;
                 }
             }

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

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js"></script>
 <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
 <script>var smallestImage = '<?=$smallestImage?>';</script>
-<?$copyable=''?>
+<?$copyable = ''?>
 <section class="documents">
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
 	<nav class="actions">
@@ -23,7 +23,7 @@ 
 			</div>
 		</li>
 	</ul>
-	<?include('document-form-form.php');?>
+	<?include('document-form-form.php'); ?>
 </section>
 
 <script>

cloudcontrol/library/cc/Request.php

Spacing +4 added lines, -4 removed lines

@@ -47,21 +47,21 @@
 		{
 			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::$subfolders = str_replace('//', '/', self::$subfolders);
 			if (PHP_SAPI === 'cli') {
 				global $argv;
 				array_shift($argv);
 				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
+				self::$requestUri = self::$subfolders.implode('/', $argv);
 			} else {
 				self::$requestUri = $_SERVER['REQUEST_URI'];
 				self::$queryString = $_SERVER['QUERY_STRING'];
 			}
 			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
 			} else {
-				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);

cloudcontrol/templates/cms/documents/document-form-form.php

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
+<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#'.$formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
     <input type="hidden" name="path" value="<?=$request::$get['path']?>" />
     <? else : ?>
@@ -20,7 +20,7 @@ 
                     <input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix = 'fields'; ?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -44,7 +44,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>
@@ -66,7 +66,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">
@@ -76,7 +76,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -93,10 +93,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>
@@ -105,17 +105,17 @@ 
 					<a class="btn js-addrtemultiple">+</a>
 					<? endif ?>
 				</div>
-				<?$value='';?>
+				<?$value = ''; ?>
 			<? endforeach ?>
 			<hr />
-			<? $static_brick_nr = 0;?>
+			<? $static_brick_nr = 0; ?>
 			<? foreach ($documentType->bricks as $brick) : ?>
 			<div class="brick">
 				<label><?=$brick->title?></label>
 				<? if ($brick->multiple == 'true') : ?>
 					<input type="hidden" value="<?=$brick->brickSlug?>"/>
 					<input type="hidden" value="<?=$brick->slug?>"/>
-					<?$myBrickSlug=$brick->slug;?>
+					<?$myBrickSlug = $brick->slug; ?>
 					<ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable">
 						<? if (isset($document)) : ?>
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
@@ -129,7 +129,7 @@ 
 									<li class="brick form-element">
 										<label><?=$brick->title?></label>
 										<?$static = true; ?>
-										<?include(__DIR__ . '/brick.php')?>
+										<?include(__DIR__.'/brick.php')?>
 									</li>
 									<? endif ?>
 								<? endforeach ?>
@@ -139,7 +139,7 @@ 
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
 				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+					<?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -165,7 +165,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>
@@ -188,7 +188,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">
@@ -198,7 +198,7 @@ 
 										</div>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 								<? endforeach ?>
 							<? endif ?>
 						</ul>
@@ -216,10 +216,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>
@@ -228,12 +228,12 @@ 
 						<a class="btn js-addrtemultiple">+</a>
 						<? endif ?>
 					</div>
-					<?$value='';?>
+					<?$value = ''; ?>
 				<? endforeach ?>
 				<? endif ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 
 
 
@@ -256,7 +256,7 @@ 
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
 							<?$static = false; ?>
-							<?include(__DIR__ . '/brick.php')?>
+							<?include(__DIR__.'/brick.php')?>
 						</li>
 					<? endforeach ?>
 				<? endif ?>

Braces +16 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
     <input type="hidden" name="path" value="<?=$request::$get['path']?>" />
-    <? else : ?>
+    <? else {
+	: ?>
     <input type="hidden" name="formId" value="<?=$formId?>" />
     <a name="<?=$formId?>"></a>
     <? endif ?>
@@ -20,15 +21,19 @@ 
                     <input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix='fields';
+}
+?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
 						$fieldSlug = $field->slug;
 						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
+					else {
+						:
 						$value = '';
+					}
 					endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
@@ -138,8 +143,11 @@ 
 					</ul>
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
-				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+				<? else {
+	: ?>
+					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
+}
+?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -148,8 +156,10 @@ 
 							$brickSlug = $brick->slug;
 							$fieldSlug = $field->slug;
 							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
+						else {
+							:
 							$value = '';
+						}
 						endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">

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

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->getSitemap()->addSitemapItem($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 	}
@@ -73,7 +73,7 @@ 
 		$sitemapItem = $cmsComponent->storage->getSitemap()->getSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->getSitemap()->saveSitemapItem($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_SITEMAP_ITEM, $sitemapItem);
@@ -86,7 +86,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getSitemap()->deleteSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 		exit;
 	}
 }
\ No newline at end of file

cloudcontrol/library/components/FormComponent.php

Spacing +3 added lines, -3 removed lines

@@ -162,7 +162,7 @@ 
 		if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		} else {
-			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
 			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		}
@@ -190,7 +190,7 @@ 
 		$postValues = $request::$post;
 		$postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
 		$postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
-		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+		$postValues['title'] = date('r').' - From: '.$request::$requestUri;
 
 		return $postValues;
 	}
@@ -325,7 +325,7 @@ 
 	private function setFormParameter($form)
 	{
 		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+			$this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage;
 		} else {
 			$this->parameters[$this->formParameterName] = $form;
 		}

Doc Comments +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
 	 * submitting the form
 	 *
 	 * @param $postValues
-	 * @param $storage
+	 * @param Storage $storage
 	 */
 	protected function postSubmit($postValues, $storage)
 	{}
@@ -317,7 +317,7 @@ 
 	}
 
 	/**
-	 * @param $form
+	 * @param string|null $form
 	 */
 	private function setFormParameter($form)
 	{

cloudcontrol/library/components/CmsComponent.php

Spacing +3 added lines, -3 removed lines

@@ -159,7 +159,7 @@ 
 				$whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -175,7 +175,7 @@ 
 				$blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}
@@ -219,7 +219,7 @@ 
 			if ($relativeCmsUri == '/log-off') {
 				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
 				unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+				header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
 				exit;
 			}
 		}