jenskooij / cloudcontrol

src/search/filters/StopWordsFilter.php

Indentation +30 added lines, -30 removed lines

@@ -11,37 +11,37 @@
 
 abstract class StopWordsFilter implements Filter
 {
-    protected $tokens;
-    protected $stopWords = array();
+	protected $tokens;
+	protected $stopWords = array();
 
-    /**
-     * StopWordsFilter constructor.
-     * @param array $tokens
-     */
-    public function __construct($tokens)
-    {
-        $this->tokens = $tokens;
-    }
+	/**
+	 * StopWordsFilter constructor.
+	 * @param array $tokens
+	 */
+	public function __construct($tokens)
+	{
+		$this->tokens = $tokens;
+	}
 
-    /**
-     * @return array
-     */
-    public function getFilterResults()
-    {
-        foreach ($this->stopWords as $stopWord) {
-            foreach ($this->tokens as $field => $tokens) {
-                if (isset($tokens[$stopWord])) {
-                    $tokens[$stopWord] = null;
-                    unset($tokens[$stopWord]);
-                    $tokens = array_filter($tokens);
-                    asort($tokens);
-                }
+	/**
+	 * @return array
+	 */
+	public function getFilterResults()
+	{
+		foreach ($this->stopWords as $stopWord) {
+			foreach ($this->tokens as $field => $tokens) {
+				if (isset($tokens[$stopWord])) {
+					$tokens[$stopWord] = null;
+					unset($tokens[$stopWord]);
+					$tokens = array_filter($tokens);
+					asort($tokens);
+				}
 
-                $this->tokens[$field] = $tokens;
-            }
-        }
-        $this->tokens = array_filter($this->tokens);
-        asort($this->tokens);
-        return $this->tokens;
-    }
+				$this->tokens[$field] = $tokens;
+			}
+		}
+		$this->tokens = array_filter($this->tokens);
+		asort($this->tokens);
+		return $this->tokens;
+	}
 }
\ No newline at end of file

src/storage/Storage.php

Indentation +48 added lines, -48 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 namespace CloudControl\Cms\storage {
 
-    use CloudControl\Cms\storage\factories\DocumentFolderFactory;
-    use CloudControl\Cms\storage\storage\ApplicationComponentsStorage;
-    use CloudControl\Cms\storage\storage\BricksStorage;
-    use CloudControl\Cms\storage\storage\DocumentStorage;
-    use CloudControl\Cms\storage\storage\DocumentTypesStorage;
-    use CloudControl\Cms\storage\storage\FilesStorage;
-    use CloudControl\Cms\storage\storage\ImageSetStorage;
-    use CloudControl\Cms\storage\storage\ImagesStorage;
-    use CloudControl\Cms\storage\storage\RedirectsStorage;
-    use CloudControl\Cms\storage\storage\SitemapStorage;
-    use CloudControl\Cms\storage\storage\UsersStorage;
-    use CloudControl\Cms\storage\storage\ValuelistsStorage;
+	use CloudControl\Cms\storage\factories\DocumentFolderFactory;
+	use CloudControl\Cms\storage\storage\ApplicationComponentsStorage;
+	use CloudControl\Cms\storage\storage\BricksStorage;
+	use CloudControl\Cms\storage\storage\DocumentStorage;
+	use CloudControl\Cms\storage\storage\DocumentTypesStorage;
+	use CloudControl\Cms\storage\storage\FilesStorage;
+	use CloudControl\Cms\storage\storage\ImageSetStorage;
+	use CloudControl\Cms\storage\storage\ImagesStorage;
+	use CloudControl\Cms\storage\storage\RedirectsStorage;
+	use CloudControl\Cms\storage\storage\SitemapStorage;
+	use CloudControl\Cms\storage\storage\UsersStorage;
+	use CloudControl\Cms\storage\storage\ValuelistsStorage;
 
-    /**
+	/**
 	 * Class JsonStorage
-     * @package CloudControl\Cms\storage
+	 * @package CloudControl\Cms\storage
 	 */
 	class Storage
 	{
@@ -61,20 +61,20 @@ 
 		 * @var DocumentStorage
 		 */
 		protected $documents;
-        /**
-         * @var RedirectsStorage
-         */
-        protected $redirects;
-        /**
-         * @var String
-         */
-        protected $imagesDir;
-        /**
-         * @var String
-         */
-        protected $filesDir;
+		/**
+		 * @var RedirectsStorage
+		 */
+		protected $redirects;
+		/**
+		 * @var String
+		 */
+		protected $imagesDir;
+		/**
+		 * @var String
+		 */
+		protected $filesDir;
 
-        /**
+		/**
 		 * @var String
 		 */
 		private $storageDir;
@@ -83,18 +83,18 @@ 
 		 */
 		private $repository;
 
-        /**
-         * JsonStorage constructor.
-         *
-         * @param string $storageDir
-         * @param $imagesDir
-         * @param $filesDir
-         */
-        public function __construct($storageDir, $imagesDir, $filesDir)
+		/**
+		 * JsonStorage constructor.
+		 *
+		 * @param string $storageDir
+		 * @param $imagesDir
+		 * @param $filesDir
+		 */
+		public function __construct($storageDir, $imagesDir, $filesDir)
 		{
 			$this->storageDir = $storageDir;
-            $this->imagesDir = $imagesDir;
-            $this->filesDir = $filesDir;
+			$this->imagesDir = $imagesDir;
+			$this->filesDir = $filesDir;
 			$this->config();
 		}
 
@@ -238,7 +238,7 @@ 
 		{
 			if (!$this->images instanceof ImagesStorage) {
 
-                $this->images = new ImagesStorage($this->repository, $this->imagesDir);
+				$this->images = new ImagesStorage($this->repository, $this->imagesDir);
 			}
 			return $this->images;
 		}
@@ -337,16 +337,16 @@ 
 			return $this->valuelists;
 		}
 
-        /**
-         * @return \CloudControl\Cms\storage\storage\RedirectsStorage
-         */
-        public function getRedirects()
-        {
-            if (!$this->redirects instanceof RedirectsStorage) {
-                $this->redirects = new RedirectsStorage($this->repository);
-            }
-            return $this->redirects;
-        }
+		/**
+		 * @return \CloudControl\Cms\storage\storage\RedirectsStorage
+		 */
+		public function getRedirects()
+		{
+			if (!$this->redirects instanceof RedirectsStorage) {
+				$this->redirects = new RedirectsStorage($this->repository);
+			}
+			return $this->redirects;
+		}
 
 	}
 }
\ No newline at end of file

src/storage/Document.php

Indentation +56 added lines, -56 removed lines

@@ -20,60 +20,60 @@ 
  */
 class Document
 {
-    public $id;
-    public $path;
-    public $title;
-    public $slug;
-    public $type;
-    public $documentType;
-    public $documentTypeSlug;
-    public $state;
-    public $lastModificationDate;
-    public $creationDate;
-    public $lastModifiedBy;
-    protected $fields;
-    protected $bricks;
-    protected $dynamicBricks;
-    protected $content;
+	public $id;
+	public $path;
+	public $title;
+	public $slug;
+	public $type;
+	public $documentType;
+	public $documentTypeSlug;
+	public $state;
+	public $lastModificationDate;
+	public $creationDate;
+	public $lastModifiedBy;
+	protected $fields;
+	protected $bricks;
+	protected $dynamicBricks;
+	protected $content;
 
-    protected $dbHandle;
+	protected $dbHandle;
 
-    protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
-    protected $orderableFields = array('title', 'slug', 'type', 'documentType', 'documentTypeSlug', 'state', 'lastModificationDate', 'creationDate', 'lastModifiedBy');
+	protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
+	protected $orderableFields = array('title', 'slug', 'type', 'documentType', 'documentTypeSlug', 'state', 'lastModificationDate', 'creationDate', 'lastModifiedBy');
 
-    public static $DOCUMENT_STATES = array('published', 'unpublished');
+	public static $DOCUMENT_STATES = array('published', 'unpublished');
 
-    public function __get($name) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            if (is_string($this->$name)) {
-                return json_decode($this->$name);
-            } else {
-                return $this->$name;
-            }
-        } elseif ($name === 'content') {
-            if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
-            } else {
-                if ($this->content === null) {
-                    return $this->getContent();
-                }
-            }
-        } elseif ($name === 'dbHandle') {
-            throw new \Exception('Trying to get protected property repository.');
-        }
-        return $this->$name;
-    }
+	public function __get($name) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			if (is_string($this->$name)) {
+				return json_decode($this->$name);
+			} else {
+				return $this->$name;
+			}
+		} elseif ($name === 'content') {
+			if ($this->dbHandle === null) {
+				throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+			} else {
+				if ($this->content === null) {
+					return $this->getContent();
+				}
+			}
+		} elseif ($name === 'dbHandle') {
+			throw new \Exception('Trying to get protected property repository.');
+		}
+		return $this->$name;
+	}
 
-    public function __set($name, $value) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            $this->$name = json_encode($value);
-        } elseif ($name === 'content') {
-            // Dont do anything for now..
-            return;
-        }
+	public function __set($name, $value) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			$this->$name = json_encode($value);
+		} elseif ($name === 'content') {
+			// Dont do anything for now..
+			return;
+		}
 
-        $this->$name = $value;
-    }
+		$this->$name = $value;
+	}
 
 	/**
 	 * @param string $orderBy
@@ -82,15 +82,15 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-    public function getContent($orderBy = 'title', $order = 'ASC')
-    {
-        if (empty($this->content)) {
-            $docs = $this->documentStorage->getDocumentsWithState($this->path);
-            $this->content = $docs;
-        }
+	public function getContent($orderBy = 'title', $order = 'ASC')
+	{
+		if (empty($this->content)) {
+			$docs = $this->documentStorage->getDocumentsWithState($this->path);
+			$this->content = $docs;
+		}
 
-    	return $this->content;
-    }
+		return $this->content;
+	}
 
 	/**
 	 * @return string

src/storage/factories/RedirectsFactory.php

Indentation +21 added lines, -21 removed lines

@@ -10,26 +10,26 @@
 
 class RedirectsFactory
 {
-    /**
-     * Create a new redirect object from postvalues
-     *
-     * @param $postValues
-     * @return \stdClass
-     * @throws \Exception
-     */
-    public static function createRedirectFromPostValues($postValues)
-    {
-        if (isset($postValues['title'], $postValues['fromUrl'], $postValues['toUrl'])) {
-            $redirectObject = new \stdClass();
-            $redirectObject->title = $postValues['title'];
-            $redirectObject->slug = StringUtil::slugify($postValues['title']);
-            $redirectObject->fromUrl = $postValues['fromUrl'];
-            $redirectObject->toUrl = $postValues['toUrl'];
-            $redirectObject->type = $postValues['type'];
+	/**
+	 * Create a new redirect object from postvalues
+	 *
+	 * @param $postValues
+	 * @return \stdClass
+	 * @throws \Exception
+	 */
+	public static function createRedirectFromPostValues($postValues)
+	{
+		if (isset($postValues['title'], $postValues['fromUrl'], $postValues['toUrl'])) {
+			$redirectObject = new \stdClass();
+			$redirectObject->title = $postValues['title'];
+			$redirectObject->slug = StringUtil::slugify($postValues['title']);
+			$redirectObject->fromUrl = $postValues['fromUrl'];
+			$redirectObject->toUrl = $postValues['toUrl'];
+			$redirectObject->type = $postValues['type'];
 
-            return $redirectObject;
-        } else {
-            throw new \Exception('Trying to create valuelist with invalid data.');
-        }
-    }
+			return $redirectObject;
+		} else {
+			throw new \Exception('Trying to create valuelist with invalid data.');
+		}
+	}
 }
\ No newline at end of file

src/storage/factories/ValuelistFactory.php

Indentation +28 added lines, -28 removed lines

@@ -12,34 +12,34 @@
 
 class ValuelistFactory
 {
-    /**
-     * Create a sitemap item from post values
-     *
-     * @param $postValues
-     *
-     * @return \stdClass
-     * @throws \Exception
-     */
-    public static function createValuelistFromPostValues($postValues)
-    {
-        if (isset($postValues['title'])) {
-            $valuelistObject = new \stdClass();
-            $valuelistObject->title = $postValues['title'];
-            $valuelistObject->slug = StringUtil::slugify($postValues['title']);
-            $valuelistObject->pairs = new \stdClass();
-            if (isset($postValues['keys'], $postValues['values'])) {
-                foreach ($postValues['keys'] as $key => $value) {
-                    $valuelistObject->pairs->$value = $postValues['values'][$key];
-                }
-            }
-            $object_vars = get_object_vars($valuelistObject->pairs);
-            ksort($object_vars);
-            $valuelistObject->pairs = (object) $object_vars;
+	/**
+	 * Create a sitemap item from post values
+	 *
+	 * @param $postValues
+	 *
+	 * @return \stdClass
+	 * @throws \Exception
+	 */
+	public static function createValuelistFromPostValues($postValues)
+	{
+		if (isset($postValues['title'])) {
+			$valuelistObject = new \stdClass();
+			$valuelistObject->title = $postValues['title'];
+			$valuelistObject->slug = StringUtil::slugify($postValues['title']);
+			$valuelistObject->pairs = new \stdClass();
+			if (isset($postValues['keys'], $postValues['values'])) {
+				foreach ($postValues['keys'] as $key => $value) {
+					$valuelistObject->pairs->$value = $postValues['values'][$key];
+				}
+			}
+			$object_vars = get_object_vars($valuelistObject->pairs);
+			ksort($object_vars);
+			$valuelistObject->pairs = (object) $object_vars;
 
-            return $valuelistObject;
-        } else {
-            throw new \Exception('Trying to create valuelist with invalid data.');
-        }
-    }
+			return $valuelistObject;
+		} else {
+			throw new \Exception('Trying to create valuelist with invalid data.');
+		}
+	}
 
 }
\ No newline at end of file

src/storage/storage/ImagesStorage.php

Indentation +120 added lines, -120 removed lines

@@ -11,124 +11,124 @@
 
 class ImagesStorage extends AbstractStorage
 {
-    protected $imagesDir;
-
-    public function __construct($repository, $imagesDir)
-    {
-        parent::__construct($repository);
-        $this->imagesDir = $imagesDir;
-    }
-
-
-    /**
-     * @var ImageSetStorage
-     */
-    protected $imageSet;
-
-    /**
-     * Get all images
-     *
-     * @return array
-     */
-    public function getImages()
-    {
-        return $this->repository->images;
-    }
-
-    /**
-     * @param $postValues
-     *
-     * @throws \Exception
-     */
-    public function addImage($postValues)
-    {
-        $destinationPath = $this->getDestinationPath();
-
-        $filename = $this->validateFilename($postValues['name'], $destinationPath);
-        $destination = $destinationPath . DIRECTORY_SEPARATOR . $filename;
-
-        if ($postValues['error'] != '0') {
-            throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
-        }
-
-        if (move_uploaded_file($postValues['tmp_name'], $destination)) {
-            $imageResizer = new ImageResizer($this->getImageSet()->getImageSet());
-            $fileNames = $imageResizer->applyImageSetToImage($destination);
-            $fileNames['original'] = $filename;
-            $imageObject = ImageFactory::createImageFromPostValues($postValues, $filename, $fileNames);
-
-            $images = $this->repository->images;
-            $images[] = $imageObject;
-            $this->repository->images = $images;
-
-            $this->save();
-        } else {
-            throw new \Exception('Error moving uploaded file');
-        }
-    }
-
-    /**
-     * Delete image by name
-     * @param $filename
-     */
-    public function deleteImageByName($filename)
-    {
-        $destinationPath = $this->getDestinationPath();
-
-        $images = $this->getImages();
-
-        foreach ($images as $key => $image) {
-            if ($image->file == $filename) {
-                foreach ($image->set as $imageSetFilename) {
-                    $destination = $destinationPath . '/' . $imageSetFilename;
-                    if (file_exists($destination)) {
-                        unlink($destination);
-                    } else {
-                        dump($destination);
-                    }
-                }
-                unset($images[$key]);
-            }
-        }
-
-        $this->repository->images = $images;
-        $this->save();
-    }
-
-    /**
-     * @param $filename
-     *
-     * @return null
-     */
-    public function getImageByName($filename)
-    {
-        $images = $this->getImages();
-        foreach ($images as $image) {
-            if ($image->file == $filename) {
-                return $image;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return \CloudControl\Cms\storage\storage\ImageSetStorage
-     */
-    private function getImageSet()
-    {
-        if (!$this->imageSet instanceof ImageSetStorage) {
-            $this->imageSet = new ImageSetStorage($this->repository);
-        }
-        return $this->imageSet;
-    }
-
-    /**
-     * @return bool|string
-     */
-    private function getDestinationPath()
-    {
-        $destinationPath = realpath($this->imagesDir . DIRECTORY_SEPARATOR);
-        return $destinationPath;
-    }
+	protected $imagesDir;
+
+	public function __construct($repository, $imagesDir)
+	{
+		parent::__construct($repository);
+		$this->imagesDir = $imagesDir;
+	}
+
+
+	/**
+	 * @var ImageSetStorage
+	 */
+	protected $imageSet;
+
+	/**
+	 * Get all images
+	 *
+	 * @return array
+	 */
+	public function getImages()
+	{
+		return $this->repository->images;
+	}
+
+	/**
+	 * @param $postValues
+	 *
+	 * @throws \Exception
+	 */
+	public function addImage($postValues)
+	{
+		$destinationPath = $this->getDestinationPath();
+
+		$filename = $this->validateFilename($postValues['name'], $destinationPath);
+		$destination = $destinationPath . DIRECTORY_SEPARATOR . $filename;
+
+		if ($postValues['error'] != '0') {
+			throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+		}
+
+		if (move_uploaded_file($postValues['tmp_name'], $destination)) {
+			$imageResizer = new ImageResizer($this->getImageSet()->getImageSet());
+			$fileNames = $imageResizer->applyImageSetToImage($destination);
+			$fileNames['original'] = $filename;
+			$imageObject = ImageFactory::createImageFromPostValues($postValues, $filename, $fileNames);
+
+			$images = $this->repository->images;
+			$images[] = $imageObject;
+			$this->repository->images = $images;
+
+			$this->save();
+		} else {
+			throw new \Exception('Error moving uploaded file');
+		}
+	}
+
+	/**
+	 * Delete image by name
+	 * @param $filename
+	 */
+	public function deleteImageByName($filename)
+	{
+		$destinationPath = $this->getDestinationPath();
+
+		$images = $this->getImages();
+
+		foreach ($images as $key => $image) {
+			if ($image->file == $filename) {
+				foreach ($image->set as $imageSetFilename) {
+					$destination = $destinationPath . '/' . $imageSetFilename;
+					if (file_exists($destination)) {
+						unlink($destination);
+					} else {
+						dump($destination);
+					}
+				}
+				unset($images[$key]);
+			}
+		}
+
+		$this->repository->images = $images;
+		$this->save();
+	}
+
+	/**
+	 * @param $filename
+	 *
+	 * @return null
+	 */
+	public function getImageByName($filename)
+	{
+		$images = $this->getImages();
+		foreach ($images as $image) {
+			if ($image->file == $filename) {
+				return $image;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @return \CloudControl\Cms\storage\storage\ImageSetStorage
+	 */
+	private function getImageSet()
+	{
+		if (!$this->imageSet instanceof ImageSetStorage) {
+			$this->imageSet = new ImageSetStorage($this->repository);
+		}
+		return $this->imageSet;
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	private function getDestinationPath()
+	{
+		$destinationPath = realpath($this->imagesDir . DIRECTORY_SEPARATOR);
+		return $destinationPath;
+	}
 }
\ No newline at end of file

src/storage/storage/ValuelistsStorage.php

Indentation +73 added lines, -73 removed lines

@@ -12,83 +12,83 @@
 
 class ValuelistsStorage extends AbstractStorage
 {
-    /**
-     * Get all valuelists
-     *
-     * @return mixed
-     */
-    public function getValuelists()
-    {
-        return $this->repository->valuelists;
-    }
+	/**
+	 * Get all valuelists
+	 *
+	 * @return mixed
+	 */
+	public function getValuelists()
+	{
+		return $this->repository->valuelists;
+	}
 
-    public function addValuelist($postValues)
-    {
-        $valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
-        $valuelists = $this->repository->valuelists;
-        $valuelists[] = $valueListObject;
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	public function addValuelist($postValues)
+	{
+		$valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+		$valuelists = $this->repository->valuelists;
+		$valuelists[] = $valueListObject;
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Save changes to a valuelist
-     *
-     * @param $slug
-     * @param $postValues
-     *
-     * @throws \Exception
-     */
-    public function saveValuelist($slug, $postValues)
-    {
-        $valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+	/**
+	 * Save changes to a valuelist
+	 *
+	 * @param $slug
+	 * @param $postValues
+	 *
+	 * @throws \Exception
+	 */
+	public function saveValuelist($slug, $postValues)
+	{
+		$valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
 
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                $valuelists[$key] = $valuelistObject;
-            }
-        }
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				$valuelists[$key] = $valuelistObject;
+			}
+		}
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Get a valuelist by its slug
-     *
-     * @param $slug
-     *
-     * @return mixed
-     */
-    public function getValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $valuelist) {
-            if ($valuelist->slug == $slug) {
-                return $valuelist;
-            }
-        }
+	/**
+	 * Get a valuelist by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @return mixed
+	 */
+	public function getValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $valuelist) {
+			if ($valuelist->slug == $slug) {
+				return $valuelist;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Delete a sitemap item by its slug
-     *
-     * @param $slug
-     *
-     * @throws \Exception
-     */
-    public function deleteValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                unset($valuelists[$key]);
-            }
-        }
-        $valuelists = array_values($valuelists);
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	/**
+	 * Delete a sitemap item by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @throws \Exception
+	 */
+	public function deleteValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				unset($valuelists[$key]);
+			}
+		}
+		$valuelists = array_values($valuelists);
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 }
\ No newline at end of file

src/components/CmsComponent.php

Indentation +26 added lines, -26 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 namespace CloudControl\Cms\components {
 
-    use CloudControl\Cms\components\cms\ConfigurationRouting;
-    use CloudControl\Cms\components\cms\DocumentRouting;
-    use CloudControl\Cms\components\cms\FilesRouting;
-    use CloudControl\Cms\components\cms\ImagesRouting;
-    use CloudControl\Cms\components\cms\SearchRouting;
-    use CloudControl\Cms\components\cms\SitemapRouting;
-    use CloudControl\Cms\crypt\Crypt;
-    use CloudControl\Cms\storage\Storage;
-
-    class CmsComponent extends BaseComponent
+	use CloudControl\Cms\components\cms\ConfigurationRouting;
+	use CloudControl\Cms\components\cms\DocumentRouting;
+	use CloudControl\Cms\components\cms\FilesRouting;
+	use CloudControl\Cms\components\cms\ImagesRouting;
+	use CloudControl\Cms\components\cms\SearchRouting;
+	use CloudControl\Cms\components\cms\SitemapRouting;
+	use CloudControl\Cms\crypt\Crypt;
+	use CloudControl\Cms\storage\Storage;
+
+	class CmsComponent extends BaseComponent
 	{
-        /**
+		/**
 		 * @var \CloudControl\Cms\storage\Storage
 		 */
 		public $storage;
@@ -41,8 +41,8 @@ 
 		const PARAMETER_IMAGE_SET = 'imageSet';
 		const PARAMETER_MAIN_NAV_CLASS = 'mainNavClass';
 		const PARAMETER_MY_BRICK_SLUG = 'myBrickSlug';
-        const PARAMETER_REDIRECT = 'redirect';
-        const PARAMETER_REDIRECTS = 'redirects';
+		const PARAMETER_REDIRECT = 'redirect';
+		const PARAMETER_REDIRECTS = 'redirects';
 		const PARAMETER_SEARCH = 'search';
 		const PARAMETER_SEARCH_LOG = "searchLog";
 		const PARAMETER_SEARCH_NEEDS_UPDATE = "searchNeedsUpdate";
@@ -57,14 +57,14 @@ 
 		const PARAMETER_VALUELISTS = "valuelists";
 		const PARAMETER_WHITELIST_IPS = 'whitelistIps';
 
-        const POST_PARAMETER_COMPONENT = 'component';
-        const POST_PARAMETER_FROM_URL = "fromUrl";
-        const POST_PARAMETER_PASSWORD = 'password';
-        const POST_PARAMETER_SAVE = 'save';
-        const POST_PARAMETER_TEMPLATE = 'template';
-        const POST_PARAMETER_TITLE = 'title';
-        const POST_PARAMETER_TO_URL = "toUrl";
-        const POST_PARAMETER_USERNAME = 'username';
+		const POST_PARAMETER_COMPONENT = 'component';
+		const POST_PARAMETER_FROM_URL = "fromUrl";
+		const POST_PARAMETER_PASSWORD = 'password';
+		const POST_PARAMETER_SAVE = 'save';
+		const POST_PARAMETER_TEMPLATE = 'template';
+		const POST_PARAMETER_TITLE = 'title';
+		const POST_PARAMETER_TO_URL = "toUrl";
+		const POST_PARAMETER_USERNAME = 'username';
 
 		const GET_PARAMETER_PATH = 'path';
 		const GET_PARAMETER_SLUG = 'slug';
@@ -369,9 +369,9 @@ 
 			}
 		}
 
-        protected function getTemplateDir($template, $application = null)
-        {
-            return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
-        }
-    }
+		protected function getTemplateDir($template, $application = null)
+		{
+			return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+		}
+	}
 }
\ No newline at end of file

src/cc/Application.php

Indentation +273 added lines, -273 removed lines

@@ -2,277 +2,277 @@
 
 namespace CloudControl\Cms\cc {
 
-    use CloudControl\Cms\components\Component;
-    use CloudControl\Cms\storage\Storage;
-    use Whoops\Handler\PrettyPageHandler;
-    use Whoops\Run;
-
-    class Application
-    {
-        /**
-         * @var \stdClass
-         */
-        private $config;
-        /**
-         * @var \CloudControl\Cms\storage\Storage
-         */
-        private $storage;
-
-        /**
-         * @var \CloudControl\Cms\cc\Request
-         */
-        private $request;
-
-        /**
-         * @var array
-         */
-        private $matchedSitemapItems = array();
-
-        /**
-         * @var array
-         */
-        private $applicationComponents = array();
-
-        /**
-         * Application constructor.
-         */
-        public function __construct()
-        {
-            $this->config();
-            $this->storage();
-
-            $this->request = new Request();
-
-            $whoops = new Run;
-            $whoops->pushHandler(new PrettyPageHandler);
-            $whoops->register();
-
-            $this->redirectMatching($this->request);
-            $this->sitemapMatching($this->request);
-
-            $this->getApplicationComponents();
-
-            $this->runApplicationComponents();
-            $this->runSitemapComponents();
-
-            $this->renderApplicationComponents();
-            $this->renderSitemapComponents();
-        }
-
-        /**
-         * Initialize the config
-         *
-         * @throws \Exception
-         */
-        private function config()
-        {
-            $configPath = __DIR__ . '/../../config.json';
-            if (realpath($configPath) !== false) {
-                $json = file_get_contents($configPath);
-                $this->config = json_decode($json);
-            } else {
-                throw new \Exception('Framework not initialized yet. Consider running composer install');
-            }
-        }
-
-        /**
-         * Initialize the storage
-         */
-        private function storage()
-        {
-            $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
-        }
-
-        private function redirectMatching($request)
-        {
-            $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
-
-            foreach ($redirects as $redirect) {
-                if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
-                    $toUrl = preg_replace($redirect->fromUrl, $redirect->toUrl, $relativeUri);
-                    if (substr($toUrl, 0, 1) == '/') {
-                        $toUrl = substr($toUrl, 1);
-                    }
-                    if ($redirect->type == '301') {
-                        header('HTTP/1.1 301 Moved Permanently');
-                        header('Location: ' . $request::$subfolders . $toUrl);
-                        exit;
-                    } elseif ($redirect->type == '302') {
-                        header('Location: ' . $request::$subfolders . $toUrl, true, 302);
-                        exit;
-                    } else {
-                        throw new \Exception('Invalid redirect type.');
-                    }
-                }
-            }
-        }
-
-        /**
-         * Loop through sitemap items and see if one matches the requestUri.
-         * If it does, add it tot the matchedSitemapItems array
-         *
-         * @param $request
-         */
-        private function sitemapMatching($request)
-        {
-            $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
-
-            foreach ($sitemap as $sitemapItem) {
-                if ($sitemapItem->regex) {
-                    $matches = array();
-                    if (preg_match_all($sitemapItem->url, $relativeUri, $matches)) {
-                        // Make a clone, so it doesnt add the matches to the original
-                        $matchedClone = clone $sitemapItem;
-                        $matchedClone->matches = $matches;
-                        $this->matchedSitemapItems[] = $matchedClone;
-                        return;
-                    }
-                } else {
-                    if ($sitemapItem->url == $relativeUri) {
-                        $this->matchedSitemapItems[] = $sitemapItem;
-                        return;
-                    }
-                }
-            }
-        }
-
-        /**
-         * Loop through all application components and run them
-         *
-         * @throws \Exception
-         */
-        private function runApplicationComponents()
-        {
-            foreach ($this->applicationComponents as $key => $applicationComponent) {
-                $class = $applicationComponent->component;
-                $parameters = $applicationComponent->parameters;
-                $this->applicationComponents[$key]->{'object'} = $this->getComponentObject($class, null, $parameters, null);
-                $this->applicationComponents[$key]->{'object'}->run($this->storage);
-            }
-        }
-
-        /**
-         * Loop through all (matched) sitemap components and run them
-         *
-         * @throws \Exception
-         */
-        private function runSitemapComponents()
-        {
-            foreach ($this->matchedSitemapItems as $key => $sitemapItem) {
-                $class = $sitemapItem->component;
-                $template = $sitemapItem->template;
-                $parameters = $sitemapItem->parameters;
-
-                $this->matchedSitemapItems[$key]->object = $this->getComponentObject($class, $template, $parameters, $sitemapItem);
-
-                $this->matchedSitemapItems[$key]->object->run($this->storage);
-            }
-        }
-
-        /**
-         * @param string $class
-         * @param string $template
-         * @param array $parameters
-         * @param \stdClass|null $matchedSitemapItem
-         *
-         * @return mixed
-         * @throws \Exception
-         */
-        private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
-        {
-            $libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
-
-            if (!class_exists($libraryComponentName, false)) {
-                $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
-            } elseif (!class_exists($userComponentName, false)) {
-                $component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
-            } else {
-                throw new \Exception('Could not load component ' . $class);
-            }
-
-            if (!$component instanceof Component) {
-                throw new \Exception('Component not of type Component. Must inherit \CloudControl\Cms\components\Component');
-            }
-
-            return $component;
-        }
-
-        /**
-         * Loop through all application components and render them
-         */
-        private function renderApplicationComponents()
-        {
-            foreach ($this->applicationComponents as $applicationComponent) {
-                $applicationComponent->{'object'}->render();
-            }
-        }
-
-        /**
-         * Loop through all (matched) sitemap components and render them
-         */
-        private function renderSitemapComponents()
-        {
-            foreach ($this->matchedSitemapItems as $sitemapItem) {
-                $this->setCachingHeaders();
-                $sitemapItem->object->render($this);
-                ob_clean();
-                echo $sitemapItem->object->get();
-                ob_end_flush();
-                exit;
-            }
-        }
-
-        public function getAllApplicationComponentParameters()
-        {
-            $allParameters = array();
-            foreach ($this->applicationComponents as $applicationComponent) {
-                $parameters = $applicationComponent->{'object'}->getParameters();
-                $allParameters[] = $parameters;
-            }
-            return $allParameters;
-        }
-
-        public function unlockApplicationComponentParameters()
-        {
-            foreach ($this->applicationComponents as $applicationComponent) {
-                $parameters = $applicationComponent->{'object'}->getParameters();
-                extract($parameters);
-            }
-        }
-
-        /**
-         * Set the default caching of pages to 2 days
-         */
-        public function setCachingHeaders()
-        {
-            header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-            header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
-        }
-
-        /**
-         * @return string
-         */
-        public function getTemplateDir()
-        {
-            return $this->config->templateDir;
-        }
-
-        public function getStorageDir()
-        {
-            return $this->config->storageDir;
-        }
-
-        public function getApplicationComponents()
-        {
-            $this->applicationComponents = $this->storage->getApplicationComponents()->getApplicationComponents();
-        }
-
-        public function getRootDir()
-        {
-            return $this->config->rootDir;
-        }
-    }
+	use CloudControl\Cms\components\Component;
+	use CloudControl\Cms\storage\Storage;
+	use Whoops\Handler\PrettyPageHandler;
+	use Whoops\Run;
+
+	class Application
+	{
+		/**
+		 * @var \stdClass
+		 */
+		private $config;
+		/**
+		 * @var \CloudControl\Cms\storage\Storage
+		 */
+		private $storage;
+
+		/**
+		 * @var \CloudControl\Cms\cc\Request
+		 */
+		private $request;
+
+		/**
+		 * @var array
+		 */
+		private $matchedSitemapItems = array();
+
+		/**
+		 * @var array
+		 */
+		private $applicationComponents = array();
+
+		/**
+		 * Application constructor.
+		 */
+		public function __construct()
+		{
+			$this->config();
+			$this->storage();
+
+			$this->request = new Request();
+
+			$whoops = new Run;
+			$whoops->pushHandler(new PrettyPageHandler);
+			$whoops->register();
+
+			$this->redirectMatching($this->request);
+			$this->sitemapMatching($this->request);
+
+			$this->getApplicationComponents();
+
+			$this->runApplicationComponents();
+			$this->runSitemapComponents();
+
+			$this->renderApplicationComponents();
+			$this->renderSitemapComponents();
+		}
+
+		/**
+		 * Initialize the config
+		 *
+		 * @throws \Exception
+		 */
+		private function config()
+		{
+			$configPath = __DIR__ . '/../../config.json';
+			if (realpath($configPath) !== false) {
+				$json = file_get_contents($configPath);
+				$this->config = json_decode($json);
+			} else {
+				throw new \Exception('Framework not initialized yet. Consider running composer install');
+			}
+		}
+
+		/**
+		 * Initialize the storage
+		 */
+		private function storage()
+		{
+			$this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
+		}
+
+		private function redirectMatching($request)
+		{
+			$redirects = $this->storage->getRedirects()->getRedirects();
+			$relativeUri = '/' . $request::$relativeUri;
+
+			foreach ($redirects as $redirect) {
+				if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
+					$toUrl = preg_replace($redirect->fromUrl, $redirect->toUrl, $relativeUri);
+					if (substr($toUrl, 0, 1) == '/') {
+						$toUrl = substr($toUrl, 1);
+					}
+					if ($redirect->type == '301') {
+						header('HTTP/1.1 301 Moved Permanently');
+						header('Location: ' . $request::$subfolders . $toUrl);
+						exit;
+					} elseif ($redirect->type == '302') {
+						header('Location: ' . $request::$subfolders . $toUrl, true, 302);
+						exit;
+					} else {
+						throw new \Exception('Invalid redirect type.');
+					}
+				}
+			}
+		}
+
+		/**
+		 * Loop through sitemap items and see if one matches the requestUri.
+		 * If it does, add it tot the matchedSitemapItems array
+		 *
+		 * @param $request
+		 */
+		private function sitemapMatching($request)
+		{
+			$sitemap = $this->storage->getSitemap()->getSitemap();
+			$relativeUri = '/' . $request::$relativeUri;
+
+			foreach ($sitemap as $sitemapItem) {
+				if ($sitemapItem->regex) {
+					$matches = array();
+					if (preg_match_all($sitemapItem->url, $relativeUri, $matches)) {
+						// Make a clone, so it doesnt add the matches to the original
+						$matchedClone = clone $sitemapItem;
+						$matchedClone->matches = $matches;
+						$this->matchedSitemapItems[] = $matchedClone;
+						return;
+					}
+				} else {
+					if ($sitemapItem->url == $relativeUri) {
+						$this->matchedSitemapItems[] = $sitemapItem;
+						return;
+					}
+				}
+			}
+		}
+
+		/**
+		 * Loop through all application components and run them
+		 *
+		 * @throws \Exception
+		 */
+		private function runApplicationComponents()
+		{
+			foreach ($this->applicationComponents as $key => $applicationComponent) {
+				$class = $applicationComponent->component;
+				$parameters = $applicationComponent->parameters;
+				$this->applicationComponents[$key]->{'object'} = $this->getComponentObject($class, null, $parameters, null);
+				$this->applicationComponents[$key]->{'object'}->run($this->storage);
+			}
+		}
+
+		/**
+		 * Loop through all (matched) sitemap components and run them
+		 *
+		 * @throws \Exception
+		 */
+		private function runSitemapComponents()
+		{
+			foreach ($this->matchedSitemapItems as $key => $sitemapItem) {
+				$class = $sitemapItem->component;
+				$template = $sitemapItem->template;
+				$parameters = $sitemapItem->parameters;
+
+				$this->matchedSitemapItems[$key]->object = $this->getComponentObject($class, $template, $parameters, $sitemapItem);
+
+				$this->matchedSitemapItems[$key]->object->run($this->storage);
+			}
+		}
+
+		/**
+		 * @param string $class
+		 * @param string $template
+		 * @param array $parameters
+		 * @param \stdClass|null $matchedSitemapItem
+		 *
+		 * @return mixed
+		 * @throws \Exception
+		 */
+		private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
+		{
+			$libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
+			$userComponentName = '\\components\\' . $class;
+
+			if (!class_exists($libraryComponentName, false)) {
+				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
+			} elseif (!class_exists($userComponentName, false)) {
+				$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
+			} else {
+				throw new \Exception('Could not load component ' . $class);
+			}
+
+			if (!$component instanceof Component) {
+				throw new \Exception('Component not of type Component. Must inherit \CloudControl\Cms\components\Component');
+			}
+
+			return $component;
+		}
+
+		/**
+		 * Loop through all application components and render them
+		 */
+		private function renderApplicationComponents()
+		{
+			foreach ($this->applicationComponents as $applicationComponent) {
+				$applicationComponent->{'object'}->render();
+			}
+		}
+
+		/**
+		 * Loop through all (matched) sitemap components and render them
+		 */
+		private function renderSitemapComponents()
+		{
+			foreach ($this->matchedSitemapItems as $sitemapItem) {
+				$this->setCachingHeaders();
+				$sitemapItem->object->render($this);
+				ob_clean();
+				echo $sitemapItem->object->get();
+				ob_end_flush();
+				exit;
+			}
+		}
+
+		public function getAllApplicationComponentParameters()
+		{
+			$allParameters = array();
+			foreach ($this->applicationComponents as $applicationComponent) {
+				$parameters = $applicationComponent->{'object'}->getParameters();
+				$allParameters[] = $parameters;
+			}
+			return $allParameters;
+		}
+
+		public function unlockApplicationComponentParameters()
+		{
+			foreach ($this->applicationComponents as $applicationComponent) {
+				$parameters = $applicationComponent->{'object'}->getParameters();
+				extract($parameters);
+			}
+		}
+
+		/**
+		 * Set the default caching of pages to 2 days
+		 */
+		public function setCachingHeaders()
+		{
+			header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
+			header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+		}
+
+		/**
+		 * @return string
+		 */
+		public function getTemplateDir()
+		{
+			return $this->config->templateDir;
+		}
+
+		public function getStorageDir()
+		{
+			return $this->config->storageDir;
+		}
+
+		public function getApplicationComponents()
+		{
+			$this->applicationComponents = $this->storage->getApplicationComponents()->getApplicationComponents();
+		}
+
+		public function getRootDir()
+		{
+			return $this->config->rootDir;
+		}
+	}
 }
\ No newline at end of file