jenskooij / cloudcontrol

src/templates/documents/document-form-form.php

Indentation +37 added lines, -37 removed lines

@@ -22,11 +22,11 @@ 
 				<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 :
-						$value = '';
-					endif ?>
+                        $fieldSlug = $field->slug;
+                        $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
+                    else :
+                        $value = '';
+                    endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
 						<li class="grid-container">
@@ -54,10 +54,10 @@ 
 							</div>
 						</li>
 						<? if (isset($document)) :
-							$fieldSlug = $field->slug;
-							$iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
-							array_shift($iterable);
-							?>
+                            $fieldSlug = $field->slug;
+                            $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
+                            array_shift($iterable);
+                            ?>
 							<? foreach ($iterable as $value) : ?>
 
 							<li class="grid-container">
@@ -80,10 +80,10 @@ 
 					<a class="btn js-addmultiple">+</a>
 					<? elseif ($field->multiple == true) : ?>
 						<? if (isset($document)) :
-							$fieldSlug = $field->slug;
-							$iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
-							array_shift($iterable);
-							?>
+                            $fieldSlug = $field->slug;
+                            $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
+                            array_shift($iterable);
+                            ?>
 							<? foreach ($iterable as $value) : ?>
 
 							<li>
@@ -118,10 +118,10 @@ 
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
 								<? foreach ($brickArray as $dynamicBrick) : ?>
 									<? foreach ($bricks as $brick) :
-										if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
-											break;
-										}
-									endforeach ?>
+                                        if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
+                                            break;
+                                        }
+                                    endforeach ?>
 									<? if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) : ?>
 									<li class="brick form-element">
 
@@ -142,12 +142,12 @@ 
 						<div class="form-element">
 						<label for="<?=$field->slug?>"><?=$field->title?></label>
 						<? if (isset($document)) :
-							$brickSlug = $brick->slug;
-							$fieldSlug = $field->slug;
-							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
-							$value = '';
-						endif ?>
+                            $brickSlug = $brick->slug;
+                            $fieldSlug = $field->slug;
+                            $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
+                        else :
+                            $value = '';
+                        endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">
 							<li class="grid-container">
@@ -175,11 +175,11 @@ 
 								</div>
 							</li>
 							<? if (isset($document)) :
-								$brickSlug = $brick->slug;
-								$fieldSlug = $field->slug;
-								$iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
-								array_shift($iterable);
-								?>
+                                $brickSlug = $brick->slug;
+                                $fieldSlug = $field->slug;
+                                $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
+                                array_shift($iterable);
+                                ?>
 								<? foreach ($iterable as $value) : ?>
 
 								<li class="grid-container">
@@ -202,11 +202,11 @@ 
 						<a class="btn js-addmultiple">+</a>
 						<? elseif ($field->multiple == true) : ?>
 							<? if (isset($document)) :
-								$brickSlug = $brick->slug;
-								$fieldSlug = $field->slug;
-								$iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
-								array_shift($iterable);
-								?>
+                                $brickSlug = $brick->slug;
+                                $fieldSlug = $field->slug;
+                                $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
+                                array_shift($iterable);
+                                ?>
 								<? foreach ($iterable as $value) : ?>
 
 								<li>
@@ -246,10 +246,10 @@ 
 				<? if (isset($document)) : ?>
 					<? foreach ($document->dynamicBricks as $dynamicBrick) : ?>
 						<? foreach ($bricks as $brick) :
-						if ($brick->slug == $dynamicBrick->type) {
-							break;
-						}
-						endforeach ?>
+                        if ($brick->slug == $dynamicBrick->type) {
+                            break;
+                        }
+                        endforeach ?>
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
 							<?$static = false; ?>

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 ?>
@@ -17,15 +18,19 @@ 
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>" type="text" id="title" name="title" placeholder="Title" />
                 </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">
@@ -135,8 +140,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">
@@ -145,8 +153,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">

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>" type="text" id="title" name="title" placeholder="Title" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix = 'fields'; ?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -73,7 +73,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -93,7 +93,7 @@ 
 								<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 						<? endforeach ?>
 						<? endif ?>
 						</div>
@@ -102,17 +102,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) : ?>
@@ -136,7 +136,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">
@@ -195,7 +195,7 @@ 
 										</div>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 								<? endforeach ?>
 							<? endif ?>
 						</ul>
@@ -216,7 +216,7 @@ 
 									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 							<? endforeach ?>
 							<? endif ?>
 							</div>
@@ -225,12 +225,12 @@ 
 						<a class="btn js-addrtemultiple">+</a>
 						<? endif ?>
 					</div>
-					<?$value='';?>
+					<?$value = ''; ?>
 				<? endforeach ?>
 				<? endif ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 
 
 

src/cc/Request.php

Indentation +68 added lines, -68 removed lines

@@ -5,79 +5,79 @@
      * Class Request
      * @package CloudControl\Cms\cc
      */
-	class Request {
+    class Request {
 
-		/**
-		 * @var string
-		 */
-		public static $subfolders;
-		/**
-		 * @var string
-		 */
-		public static $requestUri;
-		/**
-		 * @var string
-		 */
-		public static $relativeUri;
-		/**
-		 * @var string
-		 */
-		public static $queryString;
-		/**
-		 * @var array
-		 */
-		public static $requestParameters;
-		/**
-		 * @var array
-		 */
-		public static $post = array();
-		/**
-		 * @var array
-		 */
-		public static $get = array();
-		/**
-		 * @var array
-		 */
-		private $statics = array();
+        /**
+         * @var string
+         */
+        public static $subfolders;
+        /**
+         * @var string
+         */
+        public static $requestUri;
+        /**
+         * @var string
+         */
+        public static $relativeUri;
+        /**
+         * @var string
+         */
+        public static $queryString;
+        /**
+         * @var array
+         */
+        public static $requestParameters;
+        /**
+         * @var array
+         */
+        public static $post = array();
+        /**
+         * @var array
+         */
+        public static $get = array();
+        /**
+         * @var array
+         */
+        private $statics = array();
 
-		/**
-		 * Request constructor.
-		 */
-		public function __construct() 
-		{
+        /**
+         * Request constructor.
+         */
+        public function __construct() 
+        {
             $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
 			
-			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);
-			} else {
-				self::$requestUri = $_SERVER['REQUEST_URI'];
-				self::$queryString = $_SERVER['QUERY_STRING'];
-			}
-			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
-			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
-			}
+            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);
+            } else {
+                self::$requestUri = $_SERVER['REQUEST_URI'];
+                self::$queryString = $_SERVER['QUERY_STRING'];
+            }
+            if (self::$subfolders === '/') {
+                self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+            } else {
+                self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+            }
 
-			self::$requestParameters = explode('/', self::$relativeUri);
+            self::$requestParameters = explode('/', self::$relativeUri);
 			
-			self::$get = $_GET;
-			self::$post = $_POST;
+            self::$get = $_GET;
+            self::$post = $_POST;
 			
-			$this->statics = array(
-				'subfolders' => self::$subfolders,
-				'requestUri' => self::$requestUri,
-				'relativeUri' => self::$relativeUri,
-				'queryString' => self::$queryString,
-				'requestParameters' => self::$requestParameters,
-				'post' => self::$post,
-				'get' => self::$get
-			);
-		}
-	}
+            $this->statics = array(
+                'subfolders' => self::$subfolders,
+                'requestUri' => self::$requestUri,
+                'relativeUri' => self::$relativeUri,
+                'queryString' => self::$queryString,
+                'requestParameters' => self::$requestParameters,
+                'post' => self::$post,
+                'get' => self::$get
+            );
+        }
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 				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));
 			}

src/cc/errortemplates/errorviewcli.php

Indentation +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
 
 <?php
 foreach($lines as $nr => $currentLine) {
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+    echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
 }
 ?>
 
@@ -26,10 +26,10 @@ 
 
 <?php
 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;
+    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;
 }
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -15,8 +15,8 @@ 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($lines as $nr => $currentLine) {
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+foreach ($lines as $nr => $currentLine) {
+	echo ($nr == $line ? '* ' : '  ') . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
 }
 ?>
 
@@ -25,7 +25,7 @@ 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($trace as $row) {
+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"

src/components/SearchComponent.php

Indentation +36 added lines, -36 removed lines

@@ -14,41 +14,41 @@
 
 class SearchComponent extends BaseComponent
 {
-	protected $searchParameterName = 'q';
-	protected $searchResultsParameterName = 'searchResults';
-
-	/**
-	 * @param \CloudControl\Cms\storage\Storage $storage
-	 */
-	public function run(Storage $storage)
-	{
-		parent::run($storage);
-
-		$this->checkParameters();
-
-		$request = $this->request;
-		if (isset($request::$get[$this->searchParameterName])) {
-			$query = $request::$get[$this->searchParameterName];
-			$filteredQuery = new CharacterFilter($query);
-			$tokenizer = new Tokenizer($filteredQuery);
-			$search = new Search($storage);
-			$results = $search->getDocumentsForTokenizer($tokenizer);
-			$this->parameters[$this->searchResultsParameterName] = $results;
-		}
-	}
-
-	/**
-	 * Checks to see if any parameters were defined in the cms and acts according
-	 */
-	private function checkParameters()
-	{
-		if (isset($this->parameters['searchParameterName'])) {
-			$this->searchParameterName = $this->parameters['searchParameterName'];
-		}
-
-		if (isset($this->parameters['searchResultsParameterName'])) {
-			$this->searchParameterName = $this->parameters['searchResultsParameterName'];
-		}
-	}
+    protected $searchParameterName = 'q';
+    protected $searchResultsParameterName = 'searchResults';
+
+    /**
+     * @param \CloudControl\Cms\storage\Storage $storage
+     */
+    public function run(Storage $storage)
+    {
+        parent::run($storage);
+
+        $this->checkParameters();
+
+        $request = $this->request;
+        if (isset($request::$get[$this->searchParameterName])) {
+            $query = $request::$get[$this->searchParameterName];
+            $filteredQuery = new CharacterFilter($query);
+            $tokenizer = new Tokenizer($filteredQuery);
+            $search = new Search($storage);
+            $results = $search->getDocumentsForTokenizer($tokenizer);
+            $this->parameters[$this->searchResultsParameterName] = $results;
+        }
+    }
+
+    /**
+     * Checks to see if any parameters were defined in the cms and acts according
+     */
+    private function checkParameters()
+    {
+        if (isset($this->parameters['searchParameterName'])) {
+            $this->searchParameterName = $this->parameters['searchParameterName'];
+        }
+
+        if (isset($this->parameters['searchResultsParameterName'])) {
+            $this->searchParameterName = $this->parameters['searchResultsParameterName'];
+        }
+    }
 
 }
\ No newline at end of file

src/components/DocumentFolderComponent.php

Indentation +35 added lines, -35 removed lines

@@ -10,39 +10,39 @@
 
 class DocumentFolderComponent extends BaseComponent
 {
-	const PARAMETER_DOCUMENT_FOLDER_PATH = 'documentFolderPath';
-	const PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME = 'documentFolderParameter';
-
-	protected $documentFolderParameterName = 'folder';
-	protected $documentFolderPath;
-
-	/**
-	 * @param Storage $storage
-	 *
-	 * @return mixed|void
-	 * @throws \Exception
-	 */
-	public function run(Storage $storage)
-	{
-		parent::run($storage);
-
-		$this->checkParameters();
-
-		$this->parameters[$this->documentFolderParameterName] = $this->storage->getDocumentFolderBySlug($this->documentFolderPath);
-	}
-
-
-	/**
-	 * Checks to see if any parameters were defined in the cms and acts according
-	 */
-	private function checkParameters()
-	{
-		if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH])) {
-			$this->documentFolderPath = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH];
-		}
-
-		if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME])) {
-			$this->documentFolderParameterName = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME];
-		}
-	}
+    const PARAMETER_DOCUMENT_FOLDER_PATH = 'documentFolderPath';
+    const PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME = 'documentFolderParameter';
+
+    protected $documentFolderParameterName = 'folder';
+    protected $documentFolderPath;
+
+    /**
+     * @param Storage $storage
+     *
+     * @return mixed|void
+     * @throws \Exception
+     */
+    public function run(Storage $storage)
+    {
+        parent::run($storage);
+
+        $this->checkParameters();
+
+        $this->parameters[$this->documentFolderParameterName] = $this->storage->getDocumentFolderBySlug($this->documentFolderPath);
+    }
+
+
+    /**
+     * Checks to see if any parameters were defined in the cms and acts according
+     */
+    private function checkParameters()
+    {
+        if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH])) {
+            $this->documentFolderPath = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PATH];
+        }
+
+        if (isset($this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME])) {
+            $this->documentFolderParameterName = $this->parameters[self::PARAMETER_DOCUMENT_FOLDER_PARAMETER_NAME];
+        }
+    }
 }
\ No newline at end of file

src/components/cms/CmsRouting.php

Indentation +8 added lines, -8 removed lines

@@ -14,12 +14,12 @@
 
 interface CmsRouting
 {
-	/**
-	 * CmsRouting constructor.
-	 *
-	 * @param Request $request
-	 * @param string $relativeCmsUri
-	 * @param CmsComponent $cmsComponent
-	 */
-	public function __construct($request, $relativeCmsUri, $cmsComponent);
+    /**
+     * CmsRouting constructor.
+     *
+     * @param Request $request
+     * @param string $relativeCmsUri
+     * @param CmsComponent $cmsComponent
+     */
+    public function __construct($request, $relativeCmsUri, $cmsComponent);
 }
\ No newline at end of file

src/components/cms/ConfigurationRouting.php

Indentation +19 added lines, -19 removed lines

@@ -18,24 +18,24 @@
 
 class ConfigurationRouting implements CmsRouting
 {
-	/**
-	 * ConfigurationRouting constructor.
-	 *
-	 * @param Request $request
-	 * @param String $relativeCmsUri
-	 * @param CmsComponent $cmsComponent
-	 */
-	public function __construct($request, $relativeCmsUri, $cmsComponent)
-	{
-		if ($relativeCmsUri == '/configuration') {
-			$cmsComponent->subTemplate = 'configuration';
-			$cmsComponent->setParameter(CmsCOmponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
-		}
+    /**
+     * ConfigurationRouting constructor.
+     *
+     * @param Request $request
+     * @param String $relativeCmsUri
+     * @param CmsComponent $cmsComponent
+     */
+    public function __construct($request, $relativeCmsUri, $cmsComponent)
+    {
+        if ($relativeCmsUri == '/configuration') {
+            $cmsComponent->subTemplate = 'configuration';
+            $cmsComponent->setParameter(CmsCOmponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
+        }
 
-		new UsersRouting($request, $relativeCmsUri, $cmsComponent);
-		new DocumentTypeRouting($request, $relativeCmsUri, $cmsComponent);
-		new BricksRouting($request, $relativeCmsUri, $cmsComponent);
-		new ImageSetRouting($request, $relativeCmsUri, $cmsComponent);
-		new ApplicationComponentRouting($request, $relativeCmsUri, $cmsComponent);
-	}
+        new UsersRouting($request, $relativeCmsUri, $cmsComponent);
+        new DocumentTypeRouting($request, $relativeCmsUri, $cmsComponent);
+        new BricksRouting($request, $relativeCmsUri, $cmsComponent);
+        new ImageSetRouting($request, $relativeCmsUri, $cmsComponent);
+        new ApplicationComponentRouting($request, $relativeCmsUri, $cmsComponent);
+    }
 }
\ No newline at end of file

src/components/cms/DocumentRouting.php

Indentation +202 added lines, -202 removed lines

@@ -27,7 +27,7 @@ 
         }
         $this->documentRouting($request, $relativeCmsUri, $cmsComponent);
         $this->folderRouting($request, $relativeCmsUri, $cmsComponent);
-		$this->valuelistsRouting($request, $relativeCmsUri, $cmsComponent);
+        $this->valuelistsRouting($request, $relativeCmsUri, $cmsComponent);
     }
 
 
@@ -39,17 +39,17 @@ 
      */
     private function documentRouting($request, $relativeCmsUri, $cmsComponent)
     {
-		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
-			$this->documentNewRoute($request, $cmsComponent);
-		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
-			switch ($relativeCmsUri) {
-				case '/documents/edit-document': $this->editDocumentRoute($request, $cmsComponent); break;
-				case '/documents/get-brick': $this->getBrickRoute($request, $cmsComponent); break;
-				case '/documents/delete-document': $this->deleteDocumentRoute($request, $cmsComponent); break;
-				case '/documents/publish-document': $this->publishDocumentRoute($request, $cmsComponent); break;
-				case '/documents/unpublish-document': $this->unpublishDocumentRoute($request, $cmsComponent); break;
-			}
-		}
+        if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
+            $this->documentNewRoute($request, $cmsComponent);
+        } elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
+            switch ($relativeCmsUri) {
+                case '/documents/edit-document': $this->editDocumentRoute($request, $cmsComponent); break;
+                case '/documents/get-brick': $this->getBrickRoute($request, $cmsComponent); break;
+                case '/documents/delete-document': $this->deleteDocumentRoute($request, $cmsComponent); break;
+                case '/documents/publish-document': $this->publishDocumentRoute($request, $cmsComponent); break;
+                case '/documents/unpublish-document': $this->unpublishDocumentRoute($request, $cmsComponent); break;
+            }
+        }
     }
 
     /**
@@ -60,218 +60,218 @@ 
     private function folderRouting($request, $relativeCmsUri, $cmsComponent)
     {
         if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
-			$this->newFolderRoute($request, $cmsComponent);
+            $this->newFolderRoute($request, $cmsComponent);
         } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-			$this->editFolderRoute($request, $cmsComponent);
+            $this->editFolderRoute($request, $cmsComponent);
         } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-			$this->deleteFolderRoute($request, $cmsComponent);
+            $this->deleteFolderRoute($request, $cmsComponent);
         }
     }
 
-	private function valuelistsRouting($request, $relativeCmsUri, $cmsComponent)
-	{
-		if ($relativeCmsUri == '/documents/valuelists') {
-			$this->valuelistsRoute($cmsComponent);
-		} elseif ($relativeCmsUri == '/documents/valuelists/new') {
-			$this->newValuelistRoute($request, $cmsComponent);
-		} elseif ($relativeCmsUri == '/documents/valuelists/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-			$this->editValuelistRoute($request, $cmsComponent);
-		} elseif ($relativeCmsUri == '/documents/valuelists/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-			$this->deleteValuelistRoute($request, $cmsComponent);
-		}
-	}
+    private function valuelistsRouting($request, $relativeCmsUri, $cmsComponent)
+    {
+        if ($relativeCmsUri == '/documents/valuelists') {
+            $this->valuelistsRoute($cmsComponent);
+        } elseif ($relativeCmsUri == '/documents/valuelists/new') {
+            $this->newValuelistRoute($request, $cmsComponent);
+        } elseif ($relativeCmsUri == '/documents/valuelists/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+            $this->editValuelistRoute($request, $cmsComponent);
+        } elseif ($relativeCmsUri == '/documents/valuelists/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+            $this->deleteValuelistRoute($request, $cmsComponent);
+        }
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 *
-	 * @throws \Exception
-	 */
-	private function documentNewRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'documents/document-form';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
-		if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
-			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
-				$cmsComponent->storage->getDocuments()->addDocument($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-				exit;
-			}
-			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
-			$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks()->getBricks());
-		} else {
-			$documentTypes = $cmsComponent->storage->getDocumentTypes()->getDocumentTypes();
-			if (count($documentTypes) < 1) {
-				throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
-			}
-			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
-		}
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     *
+     * @throws \Exception
+     */
+    private function documentNewRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'documents/document-form';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
+        if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
+            if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
+                $cmsComponent->storage->getDocuments()->addDocument($request::$post);
+                header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+                exit;
+            }
+            $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
+            $cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks()->getBricks());
+        } else {
+            $documentTypes = $cmsComponent->storage->getDocumentTypes()->getDocumentTypes();
+            if (count($documentTypes) < 1) {
+                throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
+            }
+            $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
+        }
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function editDocumentRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'documents/document-form';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
-		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-			$cmsComponent->storage->getDocuments()->saveDocument($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-			exit;
-		}
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocuments()->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG], 'unpublished'));
-		$request::$get[CmsComponent::GET_PARAMETER_PATH] = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($cmsComponent->getParameter(CmsComponent::PARAMETER_DOCUMENT)->documentTypeSlug, true));
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks()->getBricks());
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function editDocumentRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'documents/document-form';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
+        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+            $cmsComponent->storage->getDocuments()->saveDocument($request::$post);
+            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+            exit;
+        }
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocuments()->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG], 'unpublished'));
+        $request::$get[CmsComponent::GET_PARAMETER_PATH] = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($cmsComponent->getParameter(CmsComponent::PARAMETER_DOCUMENT)->documentTypeSlug, true));
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_BRICKS, $cmsComponent->storage->getBricks()->getBricks());
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function getBrickRoute($request, $cmsComponent)
-	{
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
-		$cmsComponent->subTemplate = 'documents/brick';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $cmsComponent->storage->getBricks()->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_STATIC, $request::$get[CmsComponent::PARAMETER_STATIC] === 'true');
-		if (isset($request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG])) {
-			$cmsComponent->setParameter(CmsComponent::PARAMETER_MY_BRICK_SLUG, $request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG]);
-		}
-		$result = new \stdClass();
-		$result->body = $cmsComponent->renderTemplate('cms/documents/brick');
-		$result->rteList = isset($GLOBALS['rteList']) ? $GLOBALS['rteList'] : array();
-		ob_clean();
-		header(CmsComponent::CONTENT_TYPE_APPLICATION_JSON);
-		die(json_encode($result));
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function getBrickRoute($request, $cmsComponent)
+    {
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
+        $cmsComponent->subTemplate = 'documents/brick';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $cmsComponent->storage->getBricks()->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_STATIC, $request::$get[CmsComponent::PARAMETER_STATIC] === 'true');
+        if (isset($request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG])) {
+            $cmsComponent->setParameter(CmsComponent::PARAMETER_MY_BRICK_SLUG, $request::$get[CmsComponent::PARAMETER_MY_BRICK_SLUG]);
+        }
+        $result = new \stdClass();
+        $result->body = $cmsComponent->renderTemplate('cms/documents/brick');
+        $result->rteList = isset($GLOBALS['rteList']) ? $GLOBALS['rteList'] : array();
+        ob_clean();
+        header(CmsComponent::CONTENT_TYPE_APPLICATION_JSON);
+        die(json_encode($result));
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function deleteDocumentRoute($request, $cmsComponent)
-	{
-		$cmsComponent->storage->getDocuments()->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-		exit;
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function deleteDocumentRoute($request, $cmsComponent)
+    {
+        $cmsComponent->storage->getDocuments()->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+        exit;
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function newFolderRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'documents/folder-form';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
-			$cmsComponent->storage->addDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-			exit;
-		}
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function newFolderRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'documents/folder-form';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
+            $cmsComponent->storage->addDocumentFolder($request::$post);
+            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+            exit;
+        }
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function editFolderRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'documents/folder-form';
-		$folder = $cmsComponent->storage->getDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function editFolderRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'documents/folder-form';
+        $folder = $cmsComponent->storage->getDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 
-		$path = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
-		$path = explode('/', $path);
-		array_pop($path);
-		$path = implode('/', $path);
+        $path = $request::$get[CmsComponent::GET_PARAMETER_SLUG];
+        $path = explode('/', $path);
+        array_pop($path);
+        $path = implode('/', $path);
 
-		$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
+        $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
 
-		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
-			$cmsComponent->storage->saveDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-			exit;
-		}
+        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
+            $cmsComponent->storage->saveDocumentFolder($request::$post);
+            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+            exit;
+        }
 
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_FOLDER, $folder);
-	}
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_FOLDER, $folder);
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function deleteFolderRoute($request, $cmsComponent)
-	{
-		$cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-		exit;
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function deleteFolderRoute($request, $cmsComponent)
+    {
+        $cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+        exit;
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function publishDocumentRoute($request, $cmsComponent)
-	{
-		$cmsComponent->storage->publishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-		exit;
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function publishDocumentRoute($request, $cmsComponent)
+    {
+        $cmsComponent->storage->publishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+        exit;
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function unpublishDocumentRoute($request, $cmsComponent)
-	{
-		$cmsComponent->storage->unpublishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
-		exit;
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function unpublishDocumentRoute($request, $cmsComponent)
+    {
+        $cmsComponent->storage->unpublishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+        exit;
+    }
 
-	private function valuelistsRoute($cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'documents/valuelists';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_VALUELISTS, $cmsComponent->storage->getValuelists()->getValuelists());
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-	}
+    private function valuelistsRoute($cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'documents/valuelists';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_VALUELISTS, $cmsComponent->storage->getValuelists()->getValuelists());
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+    }
 
-	private function newValuelistRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'documents/valuelist-form';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
-			$cmsComponent->storage->getValuelists()->addValuelist($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
-			exit;
-		}
-	}
+    private function newValuelistRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'documents/valuelist-form';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
+            $cmsComponent->storage->getValuelists()->addValuelist($request::$post);
+            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+            exit;
+        }
+    }
 
-	private function editValuelistRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'documents/valuelist-form';
-		$folder = $cmsComponent->storage->getValuelists()->getValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+    private function editValuelistRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'documents/valuelist-form';
+        $folder = $cmsComponent->storage->getValuelists()->getValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 
-		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-			$cmsComponent->storage->getValuelists()->saveValuelist($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
-			exit;
-		}
+        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+            $cmsComponent->storage->getValuelists()->saveValuelist($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
+            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+            exit;
+        }
 
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_VALUELIST, $folder);
-	}
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_VALUELIST, $folder);
+    }
 
-	private function deleteValuelistRoute($request, $cmsComponent)
-	{
-		$cmsComponent->storage->getValuelists()->deleteValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
-		exit;
-	}
+    private function deleteValuelistRoute($request, $cmsComponent)
+    {
+        $cmsComponent->storage->getValuelists()->deleteValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+        exit;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     {
 		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->documentNewRoute($request, $cmsComponent);
-		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
+		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			switch ($relativeCmsUri) {
 				case '/documents/edit-document': $this->editDocumentRoute($request, $cmsComponent); break;
 				case '/documents/get-brick': $this->getBrickRoute($request, $cmsComponent); break;

src/components/cms/SearchRouting.php

Indentation +79 added lines, -79 removed lines

@@ -15,88 +15,88 @@
 class SearchRouting implements CmsRouting
 {
 
-	/**
-	 * SearchRouting constructor.
-	 *
-	 * @param \CloudControl\Cms\cc\Request              $request
-	 * @param                                  $relativeCmsUri
-	 * @param \CloudControl\Cms\components\CmsComponent $cmsComponent
-	 */
-	public function __construct($request, $relativeCmsUri, $cmsComponent)
-	{
-		switch ($relativeCmsUri) {
-			case '/search': $this->overviewRoute($cmsComponent); break;
-			case '/search/update-index' : $this->updateIndexRoute($cmsComponent); break;
-			case '/search/ajax-update-index': $this->ajaxUpdateIndexRoute($request, $cmsComponent); break;
-			case '/search/manual-update-index' :
-				$indexer = new Indexer($cmsComponent->storage);
-				$indexer->updateIndex();
-				break;
-		}
-	}
+    /**
+     * SearchRouting constructor.
+     *
+     * @param \CloudControl\Cms\cc\Request              $request
+     * @param                                  $relativeCmsUri
+     * @param \CloudControl\Cms\components\CmsComponent $cmsComponent
+     */
+    public function __construct($request, $relativeCmsUri, $cmsComponent)
+    {
+        switch ($relativeCmsUri) {
+            case '/search': $this->overviewRoute($cmsComponent); break;
+            case '/search/update-index' : $this->updateIndexRoute($cmsComponent); break;
+            case '/search/ajax-update-index': $this->ajaxUpdateIndexRoute($request, $cmsComponent); break;
+            case '/search/manual-update-index' :
+                $indexer = new Indexer($cmsComponent->storage);
+                $indexer->updateIndex();
+                break;
+        }
+    }
 
-	/**
-	 * @param \CloudControl\Cms\components\CmsComponent $cmsComponent
-	 */
-	private function overviewRoute($cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'search';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SEARCH);
-		$documentCount = $cmsComponent->storage->getDocuments()->getTotalDocumentCount();
-		$indexer = new Search($cmsComponent->storage);
-		$indexedDocuments = $indexer->getIndexedDocuments();
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_SEARCH_NEEDS_UPDATE, $documentCount !== $indexedDocuments);
-	}
+    /**
+     * @param \CloudControl\Cms\components\CmsComponent $cmsComponent
+     */
+    private function overviewRoute($cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'search';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SEARCH);
+        $documentCount = $cmsComponent->storage->getDocuments()->getTotalDocumentCount();
+        $indexer = new Search($cmsComponent->storage);
+        $indexedDocuments = $indexer->getIndexedDocuments();
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_SEARCH_NEEDS_UPDATE, $documentCount !== $indexedDocuments);
+    }
 
-	/**
-	 * @param \CloudControl\Cms\components\CmsComponent $cmsComponent
-	 */
-	private function updateIndexRoute($cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'search/update-index';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SEARCH);
-	}
+    /**
+     * @param \CloudControl\Cms\components\CmsComponent $cmsComponent
+     */
+    private function updateIndexRoute($cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'search/update-index';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SEARCH);
+    }
 
-	private function ajaxUpdateIndexRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'search/update-index';
-		if (isset($request::$get['step'])) {
-			\set_time_limit(0); // Set max excecution time infinite
-			\session_write_close(); // Close the session, so it doesnt create a lock on the sessionstorage, block other requests.
-			$indexer = new Indexer($cmsComponent->storage);
-			$step = $request::$get['step'];
-			$this->stepRouting($step, $cmsComponent, $indexer);
-		} else {
-			$this->showJson('No step defined.', 'HTTP/1.0 500 Internal Server Error');
-		}
-	}
+    private function ajaxUpdateIndexRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'search/update-index';
+        if (isset($request::$get['step'])) {
+            \set_time_limit(0); // Set max excecution time infinite
+            \session_write_close(); // Close the session, so it doesnt create a lock on the sessionstorage, block other requests.
+            $indexer = new Indexer($cmsComponent->storage);
+            $step = $request::$get['step'];
+            $this->stepRouting($step, $cmsComponent, $indexer);
+        } else {
+            $this->showJson('No step defined.', 'HTTP/1.0 500 Internal Server Error');
+        }
+    }
 
-	private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-		header('Content-type: application/json');
-		die(json_encode($obj));
-	}
+    private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
+        header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+        header('Content-type: application/json');
+        die(json_encode($obj));
+    }
 
-	/**
-	 * @param CmsComponent $cmsComponent
-	 * @param string $step
-	 * @param Indexer $indexer
-	 */
-	private function stepRouting($step, $cmsComponent, $indexer)
-	{
-		switch($step) {
-			case 'resetIndex': $indexer->resetIndex(); break;
-			case 'cleanPublishedDeletedDocuments': $cmsComponent->storage->getDocuments()->cleanPublishedDeletedDocuments(); break;
-			case 'createDocumentTermCount':
-				$documents = $cmsComponent->storage->getDocuments()->getPublishedDocumentsNoFolders();
-				$indexer->createDocumentTermCount($documents);
-				break;
-			case 'createDocumentTermFrequency': $indexer->createDocumentTermFrequency(); break;
-			case 'createTermFieldLengthNorm': $indexer->createTermFieldLengthNorm(); break;
-			case 'createInverseDocumentFrequency': $indexer->createInverseDocumentFrequency(); break;
-			case 'replaceOldIndex': $indexer->replaceOldIndex(); break;
-			default : $this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error'); break;
-		}
-		$this->showJson('done');
-	}
+    /**
+     * @param CmsComponent $cmsComponent
+     * @param string $step
+     * @param Indexer $indexer
+     */
+    private function stepRouting($step, $cmsComponent, $indexer)
+    {
+        switch($step) {
+            case 'resetIndex': $indexer->resetIndex(); break;
+            case 'cleanPublishedDeletedDocuments': $cmsComponent->storage->getDocuments()->cleanPublishedDeletedDocuments(); break;
+            case 'createDocumentTermCount':
+                $documents = $cmsComponent->storage->getDocuments()->getPublishedDocumentsNoFolders();
+                $indexer->createDocumentTermCount($documents);
+                break;
+            case 'createDocumentTermFrequency': $indexer->createDocumentTermFrequency(); break;
+            case 'createTermFieldLengthNorm': $indexer->createTermFieldLengthNorm(); break;
+            case 'createInverseDocumentFrequency': $indexer->createInverseDocumentFrequency(); break;
+            case 'replaceOldIndex': $indexer->replaceOldIndex(); break;
+            default : $this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error'); break;
+        }
+        $this->showJson('done');
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	private function stepRouting($step, $cmsComponent, $indexer)
 	{
-		switch($step) {
+		switch ($step) {
 			case 'resetIndex': $indexer->resetIndex(); break;
 			case 'cleanPublishedDeletedDocuments': $cmsComponent->storage->getDocuments()->cleanPublishedDeletedDocuments(); break;
 			case 'createDocumentTermCount':