jenskooij / cloudcontrol

src/templates/documents/function.renderDocument.php

Indentation +13 added lines, -13 removed lines

@@ -31,26 +31,26 @@
   <div class="documentActions grid-box-2">
       <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
           <? renderAction('Publish',
-              'publish',
-              $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
-              'check'); ?>
+                'publish',
+                $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
+                'check'); ?>
       <? endif ?>
       <? if ($document->state == 'published') : ?>
           <? renderAction('Unpublish',
-              'unpublish',
-              $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
-              'times'); ?>
+                'unpublish',
+                $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
+                'times'); ?>
       <? endif ?>
       <? renderAction('Edit',
-          '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
-          'pencil'); ?>
+            '',
+            $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
+            'pencil'); ?>
       <? if ($document->state == 'unpublished') : ?>
           <? renderAction('Delete',
-              'error',
-              $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
-              'trash',
-              'return confirm(\'Are you sure you want to delete this document?\');'); ?>
+                'error',
+                $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
+                'trash',
+                'return confirm(\'Are you sure you want to delete this document?\');'); ?>
       <? endif ?>
   </div>
 <? } ?>

src/templates/documents/function.renderFolder.php

Indentation +7 added lines, -7 removed lines

@@ -17,14 +17,14 @@
   </div>
   <div class="documentActions grid-box-4">
       <? renderAction('Edit',
-          '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
-          'pencil'); ?>
+            '',
+            $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
+            'pencil'); ?>
       <? renderAction('Delete',
-          'error',
-          $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
-          'trash',
-          'return confirm(\'Are you sure you want to delete this document?\');'); ?>
+            'error',
+            $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
+            'trash',
+            'return confirm(\'Are you sure you want to delete this document?\');'); ?>
   </div>
   <ul class="documents grid-wrapper nested<?= $root ? ' root' : '' ?>">
       <? foreach ($document->getContent() as $subDocument) : ?>

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

src/cc/StringUtil.php

Indentation +119 added lines, -119 removed lines

@@ -8,123 +8,123 @@
 
 class StringUtil
 {
-	/**
-	 * Convert a string to url friendly slug
-	 *
-	 * @param string $str
-	 * @param array  $replace
-	 * @param string $delimiter
-	 *
-	 * @return mixed|string
-	 */
-	public static function slugify($str, $replace = array(), $delimiter = '-')
-	{
-		if (!empty($replace)) {
-			$str = str_replace((array)$replace, ' ', $str);
-		}
-
-		$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
-		$clean = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $clean);
-		$clean = strtolower(trim($clean, '-'));
-		$clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean);
-
-		return $clean;
-	}
-
-	/**
-	 * Selects the right font-awesome icon for each filetype
-	 *
-	 * @param $fileType
-	 *
-	 * @return string
-	 */
-	public static function iconByFileType($fileType)
-	{
-		$fileTypeIcons = array(
-			'image'                                                                   => 'file-image-o',
-			'pdf'                                                                     => 'file-pdf-o',
-			'audio'                                                                   => 'file-audio-o',
-			'x-msdownload'                                                            => 'windows',
-			'application/vnd.ms-excel'                                                => 'file-excel-o',
-			'application/msexcel'                                                     => 'file-excel-o',
-			'application/xls'                                                         => 'file-excel-o',
-			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'       => 'file-excel-o',
-			'application/vnd.google-apps.spreadsheet'                                 => 'file-excel-o',
-			'application/msword'                                                      => 'file-word-o',
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'file-word-o',
-			'application/x-rar-compressed'                                            => 'file-archive-o',
-			'application/x-zip-compressed'                                            => 'file-archive-o',
-			'application/zip'                                                         => 'file-archive-o',
-			'text'                                                                    => 'file-text-o',
-		);
-
-		foreach ($fileTypeIcons as $needle => $icon) {
-			if (strpos($fileType, $needle) !== false) {
-				return $icon;
-			}
-		}
-
-		return 'file-o';
-	}
-
-	/**
-	 * Converts an amount of bytes to a human readable
-	 * format
-	 *
-	 * @param        $size
-	 * @param string $unit
-	 *
-	 * @return string
-	 */
-	public static function humanFileSize($size, $unit = "")
-	{
-		if ((!$unit && $size >= 1 << 30) || $unit == "GB")
-			return number_format($size / (1 << 30), 2) . "GB";
-		if ((!$unit && $size >= 1 << 20) || $unit == "MB")
-			return number_format($size / (1 << 20), 2) . "MB";
-		if ((!$unit && $size >= 1 << 10) || $unit == "KB")
-			return number_format($size / (1 << 10), 2) . "KB";
-
-		return number_format($size) . " bytes";
-	}
-
-	/**
-	 * @param $ptime
-	 *
-	 * @return string
-	 */
-	public static function timeElapsedString($ptime)
-	{
-		$etime = time() - $ptime;
-
-		if ($etime < 1) {
-			return '0 seconds';
-		}
-
-		$a = array(365 * 24 * 60 * 60 => 'year',
-				   30 * 24 * 60 * 60  => 'month',
-				   24 * 60 * 60       => 'day',
-				   60 * 60            => 'hour',
-				   60                 => 'minute',
-				   1                  => 'second'
-		);
-		$a_plural = array('year'   => 'years',
-						  'month'  => 'months',
-						  'day'    => 'days',
-						  'hour'   => 'hours',
-						  'minute' => 'minutes',
-						  'second' => 'seconds'
-		);
-
-		foreach ($a as $secs => $str) {
-			$d = $etime / $secs;
-			if ($d >= 1) {
-				$r = round($d);
-
-				return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
-			}
-		}
-
-		return 0;
-	}
+    /**
+     * Convert a string to url friendly slug
+     *
+     * @param string $str
+     * @param array  $replace
+     * @param string $delimiter
+     *
+     * @return mixed|string
+     */
+    public static function slugify($str, $replace = array(), $delimiter = '-')
+    {
+        if (!empty($replace)) {
+            $str = str_replace((array)$replace, ' ', $str);
+        }
+
+        $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
+        $clean = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $clean);
+        $clean = strtolower(trim($clean, '-'));
+        $clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean);
+
+        return $clean;
+    }
+
+    /**
+     * Selects the right font-awesome icon for each filetype
+     *
+     * @param $fileType
+     *
+     * @return string
+     */
+    public static function iconByFileType($fileType)
+    {
+        $fileTypeIcons = array(
+            'image'                                                                   => 'file-image-o',
+            'pdf'                                                                     => 'file-pdf-o',
+            'audio'                                                                   => 'file-audio-o',
+            'x-msdownload'                                                            => 'windows',
+            'application/vnd.ms-excel'                                                => 'file-excel-o',
+            'application/msexcel'                                                     => 'file-excel-o',
+            'application/xls'                                                         => 'file-excel-o',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'       => 'file-excel-o',
+            'application/vnd.google-apps.spreadsheet'                                 => 'file-excel-o',
+            'application/msword'                                                      => 'file-word-o',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'file-word-o',
+            'application/x-rar-compressed'                                            => 'file-archive-o',
+            'application/x-zip-compressed'                                            => 'file-archive-o',
+            'application/zip'                                                         => 'file-archive-o',
+            'text'                                                                    => 'file-text-o',
+        );
+
+        foreach ($fileTypeIcons as $needle => $icon) {
+            if (strpos($fileType, $needle) !== false) {
+                return $icon;
+            }
+        }
+
+        return 'file-o';
+    }
+
+    /**
+     * Converts an amount of bytes to a human readable
+     * format
+     *
+     * @param        $size
+     * @param string $unit
+     *
+     * @return string
+     */
+    public static function humanFileSize($size, $unit = "")
+    {
+        if ((!$unit && $size >= 1 << 30) || $unit == "GB")
+            return number_format($size / (1 << 30), 2) . "GB";
+        if ((!$unit && $size >= 1 << 20) || $unit == "MB")
+            return number_format($size / (1 << 20), 2) . "MB";
+        if ((!$unit && $size >= 1 << 10) || $unit == "KB")
+            return number_format($size / (1 << 10), 2) . "KB";
+
+        return number_format($size) . " bytes";
+    }
+
+    /**
+     * @param $ptime
+     *
+     * @return string
+     */
+    public static function timeElapsedString($ptime)
+    {
+        $etime = time() - $ptime;
+
+        if ($etime < 1) {
+            return '0 seconds';
+        }
+
+        $a = array(365 * 24 * 60 * 60 => 'year',
+                    30 * 24 * 60 * 60  => 'month',
+                    24 * 60 * 60       => 'day',
+                    60 * 60            => 'hour',
+                    60                 => 'minute',
+                    1                  => 'second'
+        );
+        $a_plural = array('year'   => 'years',
+                            'month'  => 'months',
+                            'day'    => 'days',
+                            'hour'   => 'hours',
+                            'minute' => 'minutes',
+                            'second' => 'seconds'
+        );
+
+        foreach ($a as $secs => $str) {
+            $d = $etime / $secs;
+            if ($d >= 1) {
+                $r = round($d);
+
+                return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+            }
+        }
+
+        return 0;
+    }
 }
\ No newline at end of file

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

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

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/FormComponent.php

Indentation +320 added lines, -320 removed lines

@@ -7,324 +7,324 @@
 
 class FormComponent Extends BaseComponent
 {
-	const GET_PARAMETER_PATH = 'path';
-
-	const PARAMETER_CMS_PREFIX = 'cmsPrefix';
-	const PARAMETER_DOCUMENT_TYPE = 'documentType';
-	const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
-	const PARAMETER_FORM_ID = 'formId';
-	const PARAMETER_FORM_PARAMETER_NAME = 'formParameterName';
-	const PARAMETER_HIDE_TITLE_AND_STATE = 'hideTitleAndState';
-	const PARAMETER_RESPONSE_FOLDER = 'responseFolder';
-	const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
-	const PARAMETER_SUBMIT_ONCE_PER_SESSION = 'submitOncePerSession';
-	const PARAMETER_SUB_TEMPLATE = 'subTemplate';
-	const PARAMETER_THANK_YOU_MESSAGE = 'thankYouMessage';
-
-	const SESSION_PARAMETER_CLOUDCONTROL = 'cloudcontrol';
-	const SESSION_PARAMETER_FORM_COMPONENT = 'FormComponent';
-	/**
-	 * @var null|string
-	 */
-	protected $documentType = null;
-	/**
-	 * @var null|string
-	 */
-	protected $responseFolder = null;
-	/**
-	 * @var string
-	 */
-	protected $subTemplate = 'cms/documents/document-form-form';
-	/**
-	 * @var string
-	 */
-	protected $formParameterName = 'form';
-	/**
-	 * @var string
-	 */
-	protected $thankYouMessage = 'Thank you for sending us your response.';
-
-	/**
-	 * @var bool
-	 */
-	protected $submitOncePerSession = false;
-
-	/**
-	 * @var string
-	 */
-	private $formId;
-	/**
-	 * @var null|string
-	 */
-	private $getPathBackup = null;
-
-	/**
-	 * @var null|\stdClass
-	 */
-	private $userSessionBackup = null;
-
-	/**
-	 * @param Storage $storage
-	 *
-	 * @return void
-	 * @throws \Exception
-	 */
-	public function run(Storage $storage)
-	{
-		parent::run($storage);
-		$this->checkParameters();
-		$this->checkRequiredParameters();
-		$this->setFormId();
-		$this->initialize($storage);
-		$this->checkSubmit($storage);
-	}
-
-	/**
-	 * @param null|Application $application
-	 *
-	 * @throws \Exception
-	 */
-	public function render($application = null)
-	{
-		$request = $this->setPathBackup();
-		$form = $this->renderTemplate($this->subTemplate);
-		$this->resetPathBackup($request);
-		$this->setFormParameter($form);
-
-		parent::render($application);
-	}
-
-	/**
-	 * Checks if parameters were given in the CMS configuration and
-	 * sets them to their respective fields
-	 */
-	private function checkParameters()
-	{
-		$this->checkDocumentTypeParameter();
-		$this->checkResponseFolderParameter();
-		$this->checkSubTemplateParameter();
-		$this->checkFormParameterNameParameter();
-		$this->checkThankYouMessageParameter();
-		$this->checkSubmitOncePerSessionParameter();
-	}
-
-	/**
-	 * Sets variables needed for rendering the form template
-	 *
-	 * @param Storage $storage
-	 */
-	private function initialize($storage)
-	{
-		$this->parameters[self::PARAMETER_SMALLEST_IMAGE] = $storage->getImageSet()->getSmallestImageSet();
-		$this->parameters[self::PARAMETER_CMS_PREFIX] = '';
-
-		$this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $this->storage->getDocumentTypes()->getDocumentTypeBySlug($this->documentType, true);
-		$this->parameters[self::PARAMETER_DOCUMENT_TYPES] = $this->storage->getDocumentTypes()->getDocumentTypes();
-		$this->parameters[self::PARAMETER_HIDE_TITLE_AND_STATE] = true;
-		$this->parameters[self::PARAMETER_FORM_ID] = $this->formId;
-	}
-
-	/**
-	 * If the form has been submitted, save the document
-	 * Calls $this->postSubmit() afterwards
-	 *
-	 * @param Storage $storage
-	 */
-	private function checkSubmit($storage)
-	{
-		if ($this->isFormSubmitted($this->request) && $this->isSubmitAllowed()) {
-			$postValues = $this->getPostValues($this->request);
-			$this->setUserSessionBackup();
-			$storage->getDocuments()->addDocument($postValues);
-			$this->restoreUserSessionBackup();
-			$this->setSubmitToSession();
-			$this->postSubmit($postValues, $storage);
-		}
-	}
-
-	/**
-	 * Hook for derived classes to take actions after
-	 * submitting the form
-	 *
-	 * @param $postValues
-	 * @param $storage
-	 */
-	protected function postSubmit($postValues, $storage)
-	{}
-
-	/**
-	 * Sets a unique id for this particular form, so it can recognize
-	 * it when a submit occurs
-	 */
-	private function setFormId()
-	{
-		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]['submitted'] = false;
-			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
-		}
-	}
-
-	/**
-	 * Checks if this form has been submitted
-	 *
-	 * @param \CloudControl\Cms\cc\Request $request
-	 *
-	 * @return bool
-	 */
-	private function isFormSubmitted($request)
-	{
-		return !empty($request::$post) && isset($request::$post[self::PARAMETER_FORM_ID]) && $request::$post[self::PARAMETER_FORM_ID] === $this->formId && isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]) && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] === $this->formId;
-	}
-
-	/**
-	 * @param \cc\Request $request
-	 * @return array
-	 */
-	private function getPostValues($request)
-	{
-		$postValues = $request::$post;
-		$postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
-		$postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
-		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
-
-		return $postValues;
-	}
-
-	/**
-	 * Temporarily stores the current user session in a backup variable
-	 * and sets a fake user instead
-	 */
-	private function setUserSessionBackup()
-	{
-		$this->userSessionBackup = isset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]) ? $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] : null;
-		$fakeUser = new \stdClass();
-		$fakeUser->username = self::SESSION_PARAMETER_FORM_COMPONENT;
-		$_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $fakeUser;
-	}
-
-	/**
-	 * Removes the fake user and restores the existing user
-	 * session if it was there
-	 */
-	private function restoreUserSessionBackup()
-	{
-		if ($this->userSessionBackup === null) {
-			unset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]);
-		} else {
-			$_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $this->userSessionBackup;
-		}
-	}
-
-	private function setSubmitToSession()
-	{
-		$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = true;
-	}
-
-	private function isSubmitAllowed()
-	{
-		if ($this->submitOncePerSession === true && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] === true) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	private function checkDocumentTypeParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_DOCUMENT_TYPE])) {
-			$this->documentType = $this->parameters[self::PARAMETER_DOCUMENT_TYPE];
-			unset($this->parameters[self::PARAMETER_DOCUMENT_TYPE]);
-		}
-	}
-
-	private function checkResponseFolderParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_RESPONSE_FOLDER])) {
-			$this->responseFolder = $this->parameters[self::PARAMETER_RESPONSE_FOLDER];
-			unset($this->parameters[self::PARAMETER_RESPONSE_FOLDER]);
-		}
-	}
-
-	private function checkSubTemplateParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_SUB_TEMPLATE])) {
-			$this->subTemplate = $this->parameters[self::PARAMETER_SUB_TEMPLATE];
-			unset($this->parameters[self::PARAMETER_SUB_TEMPLATE]);
-		}
-	}
-
-	private function checkFormParameterNameParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME])) {
-			$this->formParameterName = $this->parameters[self::PARAMETER_FORM_PARAMETER_NAME];
-			unset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME]);
-		}
-	}
-
-	private function checkThankYouMessageParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE])) {
-			$this->thankYouMessage = $this->parameters[self::PARAMETER_THANK_YOU_MESSAGE];
-			unset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE]);
-		}
-	}
-
-	private function checkSubmitOncePerSessionParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION])) {
-			$this->submitOncePerSession = $this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION] === 'true';
-			unset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION]);
-		}
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	private function checkRequiredParameters()
-	{
-		if ($this->documentType === null || $this->responseFolder === null) {
-			throw new \Exception('Parameters `documentType` and `responseFolder` are required for usage with this form');
-		}
-	}
-
-	/**
-	 * @return \cc\Request
-	 */
-	private function setPathBackup()
-	{
-		$request = $this->request;
-		if (isset($request::$get[self::GET_PARAMETER_PATH])) {
-			$this->getPathBackup = $request::$get[self::GET_PARAMETER_PATH];
-		}
-		$request::$get[self::GET_PARAMETER_PATH] = $this->responseFolder;
-
-		return $request;
-	}
-
-	/**
-	 * @param \cc\Request $request
-	 */
-	private function resetPathBackup($request)
-	{
-		if ($this->getPathBackup !== null) {
-			$request::$get[self::GET_PARAMETER_PATH] = $this->getPathBackup;
-		} else {
-			unset($request::$get[self::GET_PARAMETER_PATH]);
-		}
-	}
-
-	/**
-	 * @param $form
-	 */
-	private function setFormParameter($form)
-	{
-		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
-		} else {
-			$this->parameters[$this->formParameterName] = $form;
-		}
-	}
+    const GET_PARAMETER_PATH = 'path';
+
+    const PARAMETER_CMS_PREFIX = 'cmsPrefix';
+    const PARAMETER_DOCUMENT_TYPE = 'documentType';
+    const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
+    const PARAMETER_FORM_ID = 'formId';
+    const PARAMETER_FORM_PARAMETER_NAME = 'formParameterName';
+    const PARAMETER_HIDE_TITLE_AND_STATE = 'hideTitleAndState';
+    const PARAMETER_RESPONSE_FOLDER = 'responseFolder';
+    const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
+    const PARAMETER_SUBMIT_ONCE_PER_SESSION = 'submitOncePerSession';
+    const PARAMETER_SUB_TEMPLATE = 'subTemplate';
+    const PARAMETER_THANK_YOU_MESSAGE = 'thankYouMessage';
+
+    const SESSION_PARAMETER_CLOUDCONTROL = 'cloudcontrol';
+    const SESSION_PARAMETER_FORM_COMPONENT = 'FormComponent';
+    /**
+     * @var null|string
+     */
+    protected $documentType = null;
+    /**
+     * @var null|string
+     */
+    protected $responseFolder = null;
+    /**
+     * @var string
+     */
+    protected $subTemplate = 'cms/documents/document-form-form';
+    /**
+     * @var string
+     */
+    protected $formParameterName = 'form';
+    /**
+     * @var string
+     */
+    protected $thankYouMessage = 'Thank you for sending us your response.';
+
+    /**
+     * @var bool
+     */
+    protected $submitOncePerSession = false;
+
+    /**
+     * @var string
+     */
+    private $formId;
+    /**
+     * @var null|string
+     */
+    private $getPathBackup = null;
+
+    /**
+     * @var null|\stdClass
+     */
+    private $userSessionBackup = null;
+
+    /**
+     * @param Storage $storage
+     *
+     * @return void
+     * @throws \Exception
+     */
+    public function run(Storage $storage)
+    {
+        parent::run($storage);
+        $this->checkParameters();
+        $this->checkRequiredParameters();
+        $this->setFormId();
+        $this->initialize($storage);
+        $this->checkSubmit($storage);
+    }
+
+    /**
+     * @param null|Application $application
+     *
+     * @throws \Exception
+     */
+    public function render($application = null)
+    {
+        $request = $this->setPathBackup();
+        $form = $this->renderTemplate($this->subTemplate);
+        $this->resetPathBackup($request);
+        $this->setFormParameter($form);
+
+        parent::render($application);
+    }
+
+    /**
+     * Checks if parameters were given in the CMS configuration and
+     * sets them to their respective fields
+     */
+    private function checkParameters()
+    {
+        $this->checkDocumentTypeParameter();
+        $this->checkResponseFolderParameter();
+        $this->checkSubTemplateParameter();
+        $this->checkFormParameterNameParameter();
+        $this->checkThankYouMessageParameter();
+        $this->checkSubmitOncePerSessionParameter();
+    }
+
+    /**
+     * Sets variables needed for rendering the form template
+     *
+     * @param Storage $storage
+     */
+    private function initialize($storage)
+    {
+        $this->parameters[self::PARAMETER_SMALLEST_IMAGE] = $storage->getImageSet()->getSmallestImageSet();
+        $this->parameters[self::PARAMETER_CMS_PREFIX] = '';
+
+        $this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $this->storage->getDocumentTypes()->getDocumentTypeBySlug($this->documentType, true);
+        $this->parameters[self::PARAMETER_DOCUMENT_TYPES] = $this->storage->getDocumentTypes()->getDocumentTypes();
+        $this->parameters[self::PARAMETER_HIDE_TITLE_AND_STATE] = true;
+        $this->parameters[self::PARAMETER_FORM_ID] = $this->formId;
+    }
+
+    /**
+     * If the form has been submitted, save the document
+     * Calls $this->postSubmit() afterwards
+     *
+     * @param Storage $storage
+     */
+    private function checkSubmit($storage)
+    {
+        if ($this->isFormSubmitted($this->request) && $this->isSubmitAllowed()) {
+            $postValues = $this->getPostValues($this->request);
+            $this->setUserSessionBackup();
+            $storage->getDocuments()->addDocument($postValues);
+            $this->restoreUserSessionBackup();
+            $this->setSubmitToSession();
+            $this->postSubmit($postValues, $storage);
+        }
+    }
+
+    /**
+     * Hook for derived classes to take actions after
+     * submitting the form
+     *
+     * @param $postValues
+     * @param $storage
+     */
+    protected function postSubmit($postValues, $storage)
+    {}
+
+    /**
+     * Sets a unique id for this particular form, so it can recognize
+     * it when a submit occurs
+     */
+    private function setFormId()
+    {
+        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]['submitted'] = false;
+            $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
+        }
+    }
+
+    /**
+     * Checks if this form has been submitted
+     *
+     * @param \CloudControl\Cms\cc\Request $request
+     *
+     * @return bool
+     */
+    private function isFormSubmitted($request)
+    {
+        return !empty($request::$post) && isset($request::$post[self::PARAMETER_FORM_ID]) && $request::$post[self::PARAMETER_FORM_ID] === $this->formId && isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]) && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] === $this->formId;
+    }
+
+    /**
+     * @param \cc\Request $request
+     * @return array
+     */
+    private function getPostValues($request)
+    {
+        $postValues = $request::$post;
+        $postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
+        $postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
+        $postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+
+        return $postValues;
+    }
+
+    /**
+     * Temporarily stores the current user session in a backup variable
+     * and sets a fake user instead
+     */
+    private function setUserSessionBackup()
+    {
+        $this->userSessionBackup = isset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]) ? $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] : null;
+        $fakeUser = new \stdClass();
+        $fakeUser->username = self::SESSION_PARAMETER_FORM_COMPONENT;
+        $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $fakeUser;
+    }
+
+    /**
+     * Removes the fake user and restores the existing user
+     * session if it was there
+     */
+    private function restoreUserSessionBackup()
+    {
+        if ($this->userSessionBackup === null) {
+            unset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]);
+        } else {
+            $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $this->userSessionBackup;
+        }
+    }
+
+    private function setSubmitToSession()
+    {
+        $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = true;
+    }
+
+    private function isSubmitAllowed()
+    {
+        if ($this->submitOncePerSession === true && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] === true) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    private function checkDocumentTypeParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_DOCUMENT_TYPE])) {
+            $this->documentType = $this->parameters[self::PARAMETER_DOCUMENT_TYPE];
+            unset($this->parameters[self::PARAMETER_DOCUMENT_TYPE]);
+        }
+    }
+
+    private function checkResponseFolderParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_RESPONSE_FOLDER])) {
+            $this->responseFolder = $this->parameters[self::PARAMETER_RESPONSE_FOLDER];
+            unset($this->parameters[self::PARAMETER_RESPONSE_FOLDER]);
+        }
+    }
+
+    private function checkSubTemplateParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_SUB_TEMPLATE])) {
+            $this->subTemplate = $this->parameters[self::PARAMETER_SUB_TEMPLATE];
+            unset($this->parameters[self::PARAMETER_SUB_TEMPLATE]);
+        }
+    }
+
+    private function checkFormParameterNameParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME])) {
+            $this->formParameterName = $this->parameters[self::PARAMETER_FORM_PARAMETER_NAME];
+            unset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME]);
+        }
+    }
+
+    private function checkThankYouMessageParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE])) {
+            $this->thankYouMessage = $this->parameters[self::PARAMETER_THANK_YOU_MESSAGE];
+            unset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE]);
+        }
+    }
+
+    private function checkSubmitOncePerSessionParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION])) {
+            $this->submitOncePerSession = $this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION] === 'true';
+            unset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION]);
+        }
+    }
+
+    /**
+     * @throws \Exception
+     */
+    private function checkRequiredParameters()
+    {
+        if ($this->documentType === null || $this->responseFolder === null) {
+            throw new \Exception('Parameters `documentType` and `responseFolder` are required for usage with this form');
+        }
+    }
+
+    /**
+     * @return \cc\Request
+     */
+    private function setPathBackup()
+    {
+        $request = $this->request;
+        if (isset($request::$get[self::GET_PARAMETER_PATH])) {
+            $this->getPathBackup = $request::$get[self::GET_PARAMETER_PATH];
+        }
+        $request::$get[self::GET_PARAMETER_PATH] = $this->responseFolder;
+
+        return $request;
+    }
+
+    /**
+     * @param \cc\Request $request
+     */
+    private function resetPathBackup($request)
+    {
+        if ($this->getPathBackup !== null) {
+            $request::$get[self::GET_PARAMETER_PATH] = $this->getPathBackup;
+        } else {
+            unset($request::$get[self::GET_PARAMETER_PATH]);
+        }
+    }
+
+    /**
+     * @param $form
+     */
+    private function setFormParameter($form)
+    {
+        if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
+            $this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+        } else {
+            $this->parameters[$this->formParameterName] = $form;
+        }
+    }
 }
\ 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