jenskooij / cloudcontrol

src/components/cms/SitemapRouting.php

Indentation +62 added lines, -62 removed lines

@@ -14,26 +14,26 @@ 
 class SitemapRouting implements CmsRouting
 {
 
-    /**
-     * SitemapRouting constructor.
-     * @param \CloudControl\Cms\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/sitemap') {
+	/**
+	 * SitemapRouting constructor.
+	 * @param \CloudControl\Cms\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/sitemap') {
 			$this->overviewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/new') {
+		} elseif ($relativeCmsUri == '/sitemap/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteRoute($request, $cmsComponent);
-        } else {
-            $this->redirectRoutes($relativeCmsUri, $request, $cmsComponent);
-        }
-    }
+		} else {
+			$this->redirectRoutes($relativeCmsUri, $request, $cmsComponent);
+		}
+	}
 
 	/**
 	 * @param $request
@@ -92,54 +92,54 @@ 
 		exit;
 	}
 
-    private function redirectRoutes($relativeCmsUri, $request, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/sitemap/redirects') {
-            $this->redirectsOverviewRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/redirects/new') {
-            $this->redirectsNewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/redirects/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $this->redirectEditRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/redirects/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
-            $this->redirectDeleteRoute($request, $cmsComponent);
-        }
-    }
+	private function redirectRoutes($relativeCmsUri, $request, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/sitemap/redirects') {
+			$this->redirectsOverviewRoute($cmsComponent);
+		} elseif ($relativeCmsUri == '/sitemap/redirects/new') {
+			$this->redirectsNewRoute($request, $cmsComponent);
+		} elseif ($relativeCmsUri == '/sitemap/redirects/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$this->redirectEditRoute($request, $cmsComponent);
+		} elseif ($relativeCmsUri == '/sitemap/redirects/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+			$this->redirectDeleteRoute($request, $cmsComponent);
+		}
+	}
 
-    private function redirectsOverviewRoute($cmsComponent)
-    {
-        $cmsComponent->subTemplate = 'sitemap/redirects';
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECTS, $cmsComponent->storage->getRedirects()->getRedirects());
-    }
+	private function redirectsOverviewRoute($cmsComponent)
+	{
+		$cmsComponent->subTemplate = 'sitemap/redirects';
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECTS, $cmsComponent->storage->getRedirects()->getRedirects());
+	}
 
-    private function redirectsNewRoute($request, $cmsComponent)
-    {
-        $cmsComponent->subTemplate = 'sitemap/redirects-form';
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
-        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
-            $cmsComponent->storage->getRedirects()->addRedirect($request::$post);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
-            exit;
-        }
-    }
+	private function redirectsNewRoute($request, $cmsComponent)
+	{
+		$cmsComponent->subTemplate = 'sitemap/redirects-form';
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
+		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
+			$cmsComponent->storage->getRedirects()->addRedirect($request::$post);
+			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+			exit;
+		}
+	}
 
-    private function redirectEditRoute($request, $cmsComponent)
-    {
-        $cmsComponent->subTemplate = 'sitemap/redirects-form';
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
-        $redirect = $cmsComponent->storage->getRedirects()->getRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-        if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
-            $cmsComponent->storage->getRedirects()->saveRedirect($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
-            exit;
-        }
-        $cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECT, $redirect);
-    }
+	private function redirectEditRoute($request, $cmsComponent)
+	{
+		$cmsComponent->subTemplate = 'sitemap/redirects-form';
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
+		$redirect = $cmsComponent->storage->getRedirects()->getRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
+			$cmsComponent->storage->getRedirects()->saveRedirect($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
+			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+			exit;
+		}
+		$cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECT, $redirect);
+	}
 
-    private function redirectDeleteRoute($request, $cmsComponent)
-    {
-        $cmsComponent->storage->getRedirects()->deleteRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
-        exit;
-    }
+	private function redirectDeleteRoute($request, $cmsComponent)
+	{
+		$cmsComponent->storage->getRedirects()->deleteRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
+		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+		exit;
+	}
 }
\ No newline at end of file

src/components/BaseComponent.php

Indentation +16 added lines, -16 removed lines

@@ -2,10 +2,10 @@ 
 namespace CloudControl\Cms\components
 {
 
-    use CloudControl\Cms\cc\Request;
-    use CloudControl\Cms\storage\Storage;
+	use CloudControl\Cms\cc\Request;
+	use CloudControl\Cms\storage\Storage;
 
-    class BaseComponent implements Component
+	class BaseComponent implements Component
 	{
 		/**
 		 * @var string
@@ -93,7 +93,7 @@ 
 		 */
 		public function renderTemplate($template='', $obClean = true, $application=null)
 		{
-		    $templatePath = $this->getTemplatePath($template, $application);
+			$templatePath = $this->getTemplatePath($template, $application);
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -140,16 +140,16 @@ 
 			return $this->parameters;
 		}
 
-        /**
-         * @param $template
-         * @param null $application
-         * @return string
-         */
-        protected function getTemplatePath($template, $application=null)
-        {
-            $templatePath = $application->getTemplatePath();
-            $templatePath = $templatePath . DIRECTORY_SEPARATOR . $template . '.php';
-            return $templatePath;
-        }
-    }
+		/**
+		 * @param $template
+		 * @param null $application
+		 * @return string
+		 */
+		protected function getTemplatePath($template, $application=null)
+		{
+			$templatePath = $application->getTemplatePath();
+			$templatePath = $templatePath . DIRECTORY_SEPARATOR . $template . '.php';
+			return $templatePath;
+		}
+	}
 }
\ No newline at end of file

src/components/DocumentComponent.php

Indentation +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 namespace CloudControl\Cms\components {
 
-    use storage\Storage;
+	use storage\Storage;
 
-    /**
+	/**
 	 * Class DocumentComponent
 	 *
 	 * Has optional parameter `folder` to prefix the relative url with a folder

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 getTemplatePath($template, $application = null)
-        {
-            return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
-        }
-    }
+		protected function getTemplatePath($template, $application = null)
+		{
+			return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+		}
+	}
 }
\ No newline at end of file

src/components/Component.php

Indentation +3 added lines, -3 removed lines

@@ -2,10 +2,10 @@
 namespace CloudControl\Cms\components
 {
 
-    use CloudControl\Cms\cc\Request;
-    use CloudControl\Cms\storage\Storage;
+	use CloudControl\Cms\cc\Request;
+	use CloudControl\Cms\storage\Storage;
 
-    /**
+	/**
 	 * Interface Component
 	 * @package CloudControl\Cms\components
 	 */

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

Indentation +329 added lines, -329 removed lines

@@ -24,221 +24,221 @@ 
  */
 class Repository
 {
-    protected $storagePath;
-
-    protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users', 'valuelists', 'redirects');
-
-    protected $sitemap;
-    protected $sitemapChanges = false;
-
-    protected $applicationComponents;
-    protected $applicationComponentsChanges = false;
-
-    protected $documentTypes;
-    protected $documentTypesChanges = false;
-
-    protected $bricks;
-    protected $bricksChanges = false;
-
-    protected $imageSet;
-    protected $imageSetChanges = false;
-
-    protected $images;
-    protected $imagesChanges = false;
-
-    protected $files;
-    protected $filesChanges = false;
-
-    protected $users;
-    protected $usersChanges = false;
-
-    protected $valuelists;
-    protected $valuelistsChanges = false;
-
-    protected $redirects;
-    protected $redirectsChanges = false;
-
-    protected $contentDbHandle;
-
-
-    /**
-     * Repository constructor.
-     * @param $storagePath
-     * @throws \Exception
-     */
-    public function __construct($storagePath)
-    {
-        $storagePath = realpath($storagePath);
-        if (is_dir($storagePath) && $storagePath !== false) {
-            $this->storagePath = $storagePath;
-        } else {
-            throw new \Exception('Repository not yet initialized.');
-        }
-    }
-
-    /**
-     * Creates the folder in which to create all storage related files
-     *
-     * @param $storagePath
-     * @return bool
-     */
-    public static function create($storagePath)
-    {
-        return mkdir($storagePath);
-    }
-
-    /**
-     * Initiates default storage
-     * @param $baseStorageDefaultPath
-     * @param $baseStorageSqlPath
-     */
-    public function init($baseStorageDefaultPath, $baseStorageSqlPath)
-    {
-        // TODO Make sure storage isnt overwritten when its already initialized
-        $storageDefaultPath = realpath($baseStorageDefaultPath);
-        $contentSqlPath = realpath($baseStorageSqlPath);
-
-        $this->initConfigStorage($storageDefaultPath);
-        $this->initContentDb($contentSqlPath);
-
-        $this->save();
-    }
-
-    /**
-     * Load filebased subset and return it's contents
-     *
-     * @param $name
-     * @return mixed|string
-     * @throws \Exception
-     */
-    public function __get($name)
-    {
-        if (isset($this->$name)) {
-            if (in_array($name, $this->fileBasedSubsets)) {
-                return $this->$name;
-            } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
-            }
-        } else {
-            if (in_array($name, $this->fileBasedSubsets)) {
-                return $this->loadSubset($name);
-            } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
-            }
-        }
-    }
-
-    /**
-     * Set filebased subset contents
-     * @param $name
-     * @param $value
-     * @throws \Exception
-     */
-    public function __set($name, $value)
-    {
-        if (in_array($name, $this->fileBasedSubsets)) {
-            $this->$name = $value;
-            $changes = $name . 'Changes';
-            $this->$changes = true;
-        } else {
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
-        }
-    }
-
-    /**
-     * Persist all subsets
-     */
-    public function save()
-    {
-        $host = $this;
-        array_map(function ($value) use ($host) {
-            $host->saveSubset($value);
+	protected $storagePath;
+
+	protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users', 'valuelists', 'redirects');
+
+	protected $sitemap;
+	protected $sitemapChanges = false;
+
+	protected $applicationComponents;
+	protected $applicationComponentsChanges = false;
+
+	protected $documentTypes;
+	protected $documentTypesChanges = false;
+
+	protected $bricks;
+	protected $bricksChanges = false;
+
+	protected $imageSet;
+	protected $imageSetChanges = false;
+
+	protected $images;
+	protected $imagesChanges = false;
+
+	protected $files;
+	protected $filesChanges = false;
+
+	protected $users;
+	protected $usersChanges = false;
+
+	protected $valuelists;
+	protected $valuelistsChanges = false;
+
+	protected $redirects;
+	protected $redirectsChanges = false;
+
+	protected $contentDbHandle;
+
+
+	/**
+	 * Repository constructor.
+	 * @param $storagePath
+	 * @throws \Exception
+	 */
+	public function __construct($storagePath)
+	{
+		$storagePath = realpath($storagePath);
+		if (is_dir($storagePath) && $storagePath !== false) {
+			$this->storagePath = $storagePath;
+		} else {
+			throw new \Exception('Repository not yet initialized.');
+		}
+	}
+
+	/**
+	 * Creates the folder in which to create all storage related files
+	 *
+	 * @param $storagePath
+	 * @return bool
+	 */
+	public static function create($storagePath)
+	{
+		return mkdir($storagePath);
+	}
+
+	/**
+	 * Initiates default storage
+	 * @param $baseStorageDefaultPath
+	 * @param $baseStorageSqlPath
+	 */
+	public function init($baseStorageDefaultPath, $baseStorageSqlPath)
+	{
+		// TODO Make sure storage isnt overwritten when its already initialized
+		$storageDefaultPath = realpath($baseStorageDefaultPath);
+		$contentSqlPath = realpath($baseStorageSqlPath);
+
+		$this->initConfigStorage($storageDefaultPath);
+		$this->initContentDb($contentSqlPath);
+
+		$this->save();
+	}
+
+	/**
+	 * Load filebased subset and return it's contents
+	 *
+	 * @param $name
+	 * @return mixed|string
+	 * @throws \Exception
+	 */
+	public function __get($name)
+	{
+		if (isset($this->$name)) {
+			if (in_array($name, $this->fileBasedSubsets)) {
+				return $this->$name;
+			} else {
+				throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+			}
+		} else {
+			if (in_array($name, $this->fileBasedSubsets)) {
+				return $this->loadSubset($name);
+			} else {
+				throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+			}
+		}
+	}
+
+	/**
+	 * Set filebased subset contents
+	 * @param $name
+	 * @param $value
+	 * @throws \Exception
+	 */
+	public function __set($name, $value)
+	{
+		if (in_array($name, $this->fileBasedSubsets)) {
+			$this->$name = $value;
+			$changes = $name . 'Changes';
+			$this->$changes = true;
+		} else {
+			throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
+		}
+	}
+
+	/**
+	 * Persist all subsets
+	 */
+	public function save()
+	{
+		$host = $this;
+		array_map(function ($value) use ($host) {
+			$host->saveSubset($value);
 		}, $this->fileBasedSubsets);
-    }
-
-    /**
-     * Persist subset to disk
-     * @param $subset
-     */
-    public function saveSubset($subset)
-    {
+	}
+
+	/**
+	 * Persist subset to disk
+	 * @param $subset
+	 */
+	public function saveSubset($subset)
+	{
 		$changes = $subset . 'Changes';
 		if ($this->$changes === true) {
-            if (!defined('JSON_PRETTY_PRINT')) {
-                $json = json_encode($this->$subset);
-            } else {
-                $json = json_encode($this->$subset, JSON_PRETTY_PRINT);
-            }
+			if (!defined('JSON_PRETTY_PRINT')) {
+				$json = json_encode($this->$subset);
+			} else {
+				$json = json_encode($this->$subset, JSON_PRETTY_PRINT);
+			}
 			$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
 			file_put_contents($subsetStoragePath, $json);
 
 			$this->$changes = false;
 		}
-    }
-
-    /**
-     * Load subset from disk
-     * @param $subset
-     * @return mixed|string
-     */
-    protected function loadSubset($subset)
-    {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
-        $json = file_get_contents($subsetStoragePath);
-        $json = json_decode($json);
-        $this->$subset = $json;
-        return $json;
-    }
-
-    /**
-     * @param $contentSqlPath
-     */
-    protected function initContentDb($contentSqlPath)
-    {
-        $db = $this->getContentDbHandle();
-        $sql = file_get_contents($contentSqlPath);
-        $db->exec($sql);
-    }
-
-    /**
-     * @param $storageDefaultPath
-     */
-    protected function initConfigStorage($storageDefaultPath)
-    {
-        $json = file_get_contents($storageDefaultPath);
-        $json = json_decode($json);
-        $this->sitemap = $json->sitemap;
-        $this->sitemapChanges = true;
-        $this->applicationComponents = $json->applicationComponents;
-        $this->applicationComponentsChanges = true;
-        $this->documentTypes = $json->documentTypes;
-        $this->documentTypesChanges = true;
-        $this->bricks = $json->bricks;
-        $this->bricksChanges = true;
-        $this->imageSet = $json->imageSet;
-        $this->imageSetChanges = true;
-        $this->images = $json->images;
-        $this->imagesChanges = true;
-        $this->files = $json->files;
-        $this->filesChanges = true;
-        $this->users = $json->users;
-        $this->usersChanges = true;
-        $this->valuelists = $json->valuelists;
-        $this->valuelistsChanges = true;
-        $this->redirects = $json->redirects;
-        $this->redirectsChanges = true;
-    }
-
-    /**
-     * @return \PDO
-     */
-    public function getContentDbHandle()
-    {
-        if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
-        }
-        return $this->contentDbHandle;
-    }
+	}
+
+	/**
+	 * Load subset from disk
+	 * @param $subset
+	 * @return mixed|string
+	 */
+	protected function loadSubset($subset)
+	{
+		$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+		$json = file_get_contents($subsetStoragePath);
+		$json = json_decode($json);
+		$this->$subset = $json;
+		return $json;
+	}
+
+	/**
+	 * @param $contentSqlPath
+	 */
+	protected function initContentDb($contentSqlPath)
+	{
+		$db = $this->getContentDbHandle();
+		$sql = file_get_contents($contentSqlPath);
+		$db->exec($sql);
+	}
+
+	/**
+	 * @param $storageDefaultPath
+	 */
+	protected function initConfigStorage($storageDefaultPath)
+	{
+		$json = file_get_contents($storageDefaultPath);
+		$json = json_decode($json);
+		$this->sitemap = $json->sitemap;
+		$this->sitemapChanges = true;
+		$this->applicationComponents = $json->applicationComponents;
+		$this->applicationComponentsChanges = true;
+		$this->documentTypes = $json->documentTypes;
+		$this->documentTypesChanges = true;
+		$this->bricks = $json->bricks;
+		$this->bricksChanges = true;
+		$this->imageSet = $json->imageSet;
+		$this->imageSetChanges = true;
+		$this->images = $json->images;
+		$this->imagesChanges = true;
+		$this->files = $json->files;
+		$this->filesChanges = true;
+		$this->users = $json->users;
+		$this->usersChanges = true;
+		$this->valuelists = $json->valuelists;
+		$this->valuelistsChanges = true;
+		$this->redirects = $json->redirects;
+		$this->redirectsChanges = true;
+	}
+
+	/**
+	 * @return \PDO
+	 */
+	public function getContentDbHandle()
+	{
+		if ($this->contentDbHandle === null) {
+			$this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+		}
+		return $this->contentDbHandle;
+	}
 
 	/**
 	 * Get all documents
@@ -248,13 +248,13 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-    public function getDocuments($state = 'published')
-    {
+	public function getDocuments($state = 'published')
+	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
 			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        return $this->getDocumentsByPath('/', $state);
-    }
+		return $this->getDocumentsByPath('/', $state);
+	}
 
 	public function getDocumentsWithState($folderPath = '/')
 	{
@@ -301,51 +301,51 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-    public function getDocumentsByPath($folderPath, $state = 'published')
-    {
-    	if (!in_array($state, Document::$DOCUMENT_STATES)) {
-    		throw new \Exception('Unsupported document state: ' . $state);
+	public function getDocumentsByPath($folderPath, $state = 'published')
+	{
+		if (!in_array($state, Document::$DOCUMENT_STATES)) {
+			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+		$db = $this->getContentDbHandle();
+		$folderPathWithWildcard = $folderPath . '%';
 
-        $sql = 'SELECT *
+		$sql = 'SELECT *
               FROM documents_' . $state . '
              WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
                AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
                AND path != ' . $db->quote($folderPath) . '
           ORDER BY `type` DESC, `path` ASC';
-        $stmt = $this->getDbStatement($sql);
+		$stmt = $this->getDbStatement($sql);
 
-        $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-        foreach ($documents as $key => $document) {
+		$documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+		foreach ($documents as $key => $document) {
 			$documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
-        }
-        return $documents;
-    }
-
-
-    /**
-     * @param $path
-     * @return bool|Document
-     */
-    public function getDocumentContainerByPath($path)
-    {
-        $document = $this->getDocumentByPath($path, 'unpublished');
-        if ($document === false) {
-            return false;
-        }
-        $slugLength = strlen($document->slug);
-        $containerPath = substr($path, 0, -$slugLength);
-        if ($containerPath === '/') {
-            return $this->getRootFolder();
-        }
-        if (substr($containerPath, -1) === '/'){
+		}
+		return $documents;
+	}
+
+
+	/**
+	 * @param $path
+	 * @return bool|Document
+	 */
+	public function getDocumentContainerByPath($path)
+	{
+		$document = $this->getDocumentByPath($path, 'unpublished');
+		if ($document === false) {
+			return false;
+		}
+		$slugLength = strlen($document->slug);
+		$containerPath = substr($path, 0, -$slugLength);
+		if ($containerPath === '/') {
+			return $this->getRootFolder();
+		}
+		if (substr($containerPath, -1) === '/'){
 			$containerPath = substr($containerPath, 0, -1);
 		}
-        $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
-        return $containerFolder;
-    }
+		$containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
+		return $containerFolder;
+	}
 
 	/**
 	 * @param        $path
@@ -354,23 +354,23 @@ 
 	 * @return bool|\CloudControl\Cms\storage\Document
 	 * @throws \Exception
 	 */
-    public function getDocumentByPath($path, $state = 'published')
-    {
+	public function getDocumentByPath($path, $state = 'published')
+	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
 			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        $db = $this->getContentDbHandle();
-        $document = $this->fetchDocument('
+		$db = $this->getContentDbHandle();
+		$document = $this->fetchDocument('
             SELECT *
               FROM documents_' .  $state . '
              WHERE path = ' . $db->quote($path) . '
         ');
-        if ($document instanceof Document && $document->type === 'folder') {
-            $document->dbHandle = $db;
-            $document->documentStorage = new DocumentStorage($this);
-        }
-        return $document;
-    }
+		if ($document instanceof Document && $document->type === 'folder') {
+			$document->dbHandle = $db;
+			$document->documentStorage = new DocumentStorage($this);
+		}
+		return $document;
+	}
 
 	/**
 	 * Returns the count of all documents stored in the db
@@ -465,58 +465,58 @@ 
 	}
 
 	/**
-     * Return the results of the query as array of Documents
-     * @param $sql
-     * @return array
-     * @throws \Exception
-     */
-    protected function fetchAllDocuments($sql)
-    {
-        $stmt = $this->getDbStatement($sql);
-        return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-    }
-
-    /**
-     * Return the result of the query as Document
-     * @param $sql
-     * @return mixed
-     * @throws \Exception
-     */
-    protected function fetchDocument($sql)
-    {
-        $stmt = $this->getDbStatement($sql);
-        return $stmt->fetchObject('\CloudControl\Cms\storage\Document');
-    }
-
-    /**
-     * Prepare the sql statement
-     * @param $sql
-     * @return \PDOStatement
-     * @throws \Exception
-     */
-    protected function getDbStatement($sql)
-    {
-        $db = $this->getContentDbHandle();
-        $stmt = $db->query($sql);
-        if ($stmt === false) {
-            $errorInfo = $db->errorInfo();
-            $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-        }
-        return $stmt;
-    }
-
-    /**
-     * Create a (non-existent) root folder Document and return it
-     * @return Document
-     */
-    protected function getRootFolder()
-    {
-        $rootFolder = new Document();
-        $rootFolder->path = '/';
-        $rootFolder->type = 'folder';
-        return $rootFolder;
-    }
+	 * Return the results of the query as array of Documents
+	 * @param $sql
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function fetchAllDocuments($sql)
+	{
+		$stmt = $this->getDbStatement($sql);
+		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+	}
+
+	/**
+	 * Return the result of the query as Document
+	 * @param $sql
+	 * @return mixed
+	 * @throws \Exception
+	 */
+	protected function fetchDocument($sql)
+	{
+		$stmt = $this->getDbStatement($sql);
+		return $stmt->fetchObject('\CloudControl\Cms\storage\Document');
+	}
+
+	/**
+	 * Prepare the sql statement
+	 * @param $sql
+	 * @return \PDOStatement
+	 * @throws \Exception
+	 */
+	protected function getDbStatement($sql)
+	{
+		$db = $this->getContentDbHandle();
+		$stmt = $db->query($sql);
+		if ($stmt === false) {
+			$errorInfo = $db->errorInfo();
+			$errorMsg = $errorInfo[2];
+			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+		}
+		return $stmt;
+	}
+
+	/**
+	 * Create a (non-existent) root folder Document and return it
+	 * @return Document
+	 */
+	protected function getRootFolder()
+	{
+		$rootFolder = new Document();
+		$rootFolder->path = '/';
+		$rootFolder->type = 'folder';
+		return $rootFolder;
+	}
 
 	/**
 	 * Save the document to the database
@@ -528,13 +528,13 @@ 
 	 * @throws \Exception
 	 * @internal param $path
 	 */
-    public function saveDocument($documentObject, $state = 'published')
-    {
+	public function saveDocument($documentObject, $state = 'published')
+	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
 			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        $db = $this->getContentDbHandle();
-        $stmt = $this->getDbStatement('
+		$db = $this->getContentDbHandle();
+		$stmt = $this->getDbStatement('
             INSERT OR REPLACE INTO documents_' . $state . ' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
               ' . $db->quote($documentObject->path) . ',
@@ -552,9 +552,9 @@ 
               ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
             )
         ');
-        $result = $stmt->execute();
-        return $result;
-    }
+		$result = $stmt->execute();
+		return $result;
+	}
 
 	/**
 	 * Delete the document from the database
@@ -565,29 +565,29 @@ 
 	 * @internal param string $state
 	 *
 	 */
-    public function deleteDocumentByPath($path)
-    {
-        $db = $this->getContentDbHandle();
-        $documentToDelete = $this->getDocumentByPath($path, 'unpublished');
-        if ($documentToDelete instanceof Document) {
-            if ($documentToDelete->type == 'document') {
-                $stmt = $this->getDbStatement('
+	public function deleteDocumentByPath($path)
+	{
+		$db = $this->getContentDbHandle();
+		$documentToDelete = $this->getDocumentByPath($path, 'unpublished');
+		if ($documentToDelete instanceof Document) {
+			if ($documentToDelete->type == 'document') {
+				$stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
                           WHERE path = ' . $db->quote($path) . '
                 ');
-                $stmt->execute();
-            } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
-                $stmt = $this->getDbStatement('
+				$stmt->execute();
+			} elseif ($documentToDelete->type == 'folder') {
+				$folderPathWithWildcard = $path . '%';
+				$stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
                           WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
                             AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
                             OR path = ' . $db->quote($path) . '
                 ');
-                $stmt->execute();
-            }
-        }
-    }
+				$stmt->execute();
+			}
+		}
+	}
 
 	/**
 	 * @param $document