jenskooij / cloudcontrol

cloudcontrol/library/storage/storage/RedirectsStorage.php

Indentation +80 added lines, -80 removed lines

@@ -10,91 +10,91 @@
 
 class RedirectsStorage extends AbstractStorage
 {
-    /**
-     * Get all redirects
-     *
-     * @return mixed
-     */
-    public function getRedirects()
-    {
-        $redirects = $this->repository->redirects;
-        usort($redirects, array($this, 'cmp'));
-        return $redirects;
-    }
+	/**
+	 * Get all redirects
+	 *
+	 * @return mixed
+	 */
+	public function getRedirects()
+	{
+		$redirects = $this->repository->redirects;
+		usort($redirects, array($this, 'cmp'));
+		return $redirects;
+	}
 
-    /**
-     * Add a new redirect
-     * @param $postValues
-     */
-    public function addRedirect($postValues) {
-        $redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
-        $redirects = $this->repository->redirects;
-        $redirects[] = $redirectObject;
-        $this->repository->redirects = $redirects;
-        $this->save();
-    }
+	/**
+	 * Add a new redirect
+	 * @param $postValues
+	 */
+	public function addRedirect($postValues) {
+		$redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
+		$redirects = $this->repository->redirects;
+		$redirects[] = $redirectObject;
+		$this->repository->redirects = $redirects;
+		$this->save();
+	}
 
-    /**
-     * Get a redirect by it's slug
-     *
-     * @param $slug
-     * @return \stdClass|null
-     */
-    public function getRedirectBySlug($slug)
-    {
-        $redirects = $this->repository->redirects;
-        foreach ($redirects as $redirect) {
-            if ($redirect->slug == $slug) {
-                return $redirect;
-            }
-        }
+	/**
+	 * Get a redirect by it's slug
+	 *
+	 * @param $slug
+	 * @return \stdClass|null
+	 */
+	public function getRedirectBySlug($slug)
+	{
+		$redirects = $this->repository->redirects;
+		foreach ($redirects as $redirect) {
+			if ($redirect->slug == $slug) {
+				return $redirect;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Save a redirect by it's slug
-     * @param $slug
-     * @param $postValues
-     */
-    public function saveRedirect($slug, $postValues)
-    {
-        $redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
+	/**
+	 * Save a redirect by it's slug
+	 * @param $slug
+	 * @param $postValues
+	 */
+	public function saveRedirect($slug, $postValues)
+	{
+		$redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
 
-        $redirects = $this->repository->redirects;
-        foreach ($redirects as $key => $redirect) {
-            if ($redirect->slug == $slug) {
-                $redirects[$key] = $redirectObject;
-            }
-        }
-        $this->repository->redirects = $redirects;
-        $this->save();
-    }
+		$redirects = $this->repository->redirects;
+		foreach ($redirects as $key => $redirect) {
+			if ($redirect->slug == $slug) {
+				$redirects[$key] = $redirectObject;
+			}
+		}
+		$this->repository->redirects = $redirects;
+		$this->save();
+	}
 
-    /**
-     * Delete a redirect by it's slug
-     * @param $slug
-     */
-    public function deleteRedirectBySlug($slug)
-    {
-        $redirects = $this->repository->redirects;
-        foreach ($redirects as $key => $redirect) {
-            if ($redirect->slug == $slug) {
-                unset($redirects[$key]);
-            }
-        }
-        $redirects = array_values($redirects);
-        $this->repository->redirects = $redirects;
-        $this->save();
-    }
+	/**
+	 * Delete a redirect by it's slug
+	 * @param $slug
+	 */
+	public function deleteRedirectBySlug($slug)
+	{
+		$redirects = $this->repository->redirects;
+		foreach ($redirects as $key => $redirect) {
+			if ($redirect->slug == $slug) {
+				unset($redirects[$key]);
+			}
+		}
+		$redirects = array_values($redirects);
+		$this->repository->redirects = $redirects;
+		$this->save();
+	}
 
-    /**
-     * Compare a redirect by it's title
-     * @param $a
-     * @param $b
-     * @return int
-     */
-    public static function cmp($a, $b) {
-        return strcmp($a->title, $b->title);
-    }
+	/**
+	 * Compare a redirect by it's title
+	 * @param $a
+	 * @param $b
+	 * @return int
+	 */
+	public static function cmp($a, $b) {
+		return strcmp($a->title, $b->title);
+	}
 }
\ No newline at end of file

cloudcontrol/library/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

cloudcontrol/library/components/cms/SitemapRouting.php

Indentation +62 added lines, -62 removed lines

@@ -14,26 +14,26 @@ 
 class SitemapRouting implements CmsRouting
 {
 
-    /**
-     * SitemapRouting constructor.
-     * @param \library\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/sitemap') {
+	/**
+	 * SitemapRouting constructor.
+	 * @param \library\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/sitemap') {
 			$this->overviewRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/new') {
+		} elseif ($relativeCmsUri == '/sitemap/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteRoute($request, $cmsComponent);
-        } 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 = 'cms/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 = 'cms/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 = 'cms/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 = 'cms/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 = 'cms/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 = 'cms/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

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->getSitemap()->addSitemapItem($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 	}
@@ -75,7 +75,7 @@ 
 		$sitemapItem = $cmsComponent->storage->getSitemap()->getSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->getSitemap()->saveSitemapItem($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_SITEMAP_ITEM, $sitemapItem);
@@ -88,7 +88,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getSitemap()->deleteSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 		exit;
 	}
 
@@ -118,7 +118,7 @@ 
         $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');
+            header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
             exit;
         }
     }
@@ -130,7 +130,7 @@ 
         $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');
+            header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
             exit;
         }
         $cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECT, $redirect);
@@ -139,7 +139,7 @@ 
     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');
+        header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
         exit;
     }
 }
\ No newline at end of file

cloudcontrol/library/cc/Application.php

Indentation +267 added lines, -267 removed lines

@@ -2,271 +2,271 @@
 
 namespace library\cc {
 
-    use library\components\Component;
-    use library\storage\Storage;
-
-    /**
-     * Class Application
-     * @package library\cc
-     */
-    class Application
-    {
-        /**
-         * @var \stdClass
-         */
-        private $config;
-        /**
-         * @var \library\storage\Storage $config
-         */
-        private $storage;
-
-        /**
-         * @var 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();
-
-            $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 {
-                initFramework();
-                $this->config();
-            }
-        }
-
-        /**
-         * Initialize the storage
-         */
-        private function storage()
-        {
-            $this->storage = new Storage($this->getStorageDir());
-        }
-
-        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 = '\\library\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
-
-            if (AutoloadUtil::autoLoad($libraryComponentName, false)) {
-                $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
-            } elseif (AutoloadUtil::autoLoad($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 \library\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 getStoragePath()
-        {
-            return $this->config->storagePath;
-        }
-
-        public function getStorageDir()
-        {
-            return $this->config->storageDir;
-        }
-
-        public function getApplicationComponents()
-        {
-            $this->applicationComponents = $this->storage->getApplicationComponents()->getApplicationComponents();
-        }
-    }
+	use library\components\Component;
+	use library\storage\Storage;
+
+	/**
+	 * Class Application
+	 * @package library\cc
+	 */
+	class Application
+	{
+		/**
+		 * @var \stdClass
+		 */
+		private $config;
+		/**
+		 * @var \library\storage\Storage $config
+		 */
+		private $storage;
+
+		/**
+		 * @var 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();
+
+			$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 {
+				initFramework();
+				$this->config();
+			}
+		}
+
+		/**
+		 * Initialize the storage
+		 */
+		private function storage()
+		{
+			$this->storage = new Storage($this->getStorageDir());
+		}
+
+		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 = '\\library\\components\\' . $class;
+			$userComponentName = '\\components\\' . $class;
+
+			if (AutoloadUtil::autoLoad($libraryComponentName, false)) {
+				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
+			} elseif (AutoloadUtil::autoLoad($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 \library\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 getStoragePath()
+		{
+			return $this->config->storagePath;
+		}
+
+		public function getStorageDir()
+		{
+			return $this->config->storageDir;
+		}
+
+		public function getApplicationComponents()
+		{
+			$this->applicationComponents = $this->storage->getApplicationComponents()->getApplicationComponents();
+		}
+	}
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -64,7 +64,7 @@ 
          */
         private function config()
         {
-            $configPath = __DIR__ . '/../../config.json';
+            $configPath = __DIR__.'/../../config.json';
             if (realpath($configPath) !== false) {
                 $json = file_get_contents($configPath);
                 $this->config = json_decode($json);
@@ -85,7 +85,7 @@ 
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($redirects as $redirect) {
                 if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
@@ -95,10 +95,10 @@ 
                     }
                     if ($redirect->type == '301') {
                         header('HTTP/1.1 301 Moved Permanently');
-                        header('Location: ' . $request::$subfolders . $toUrl);
+                        header('Location: '.$request::$subfolders.$toUrl);
                         exit;
                     } elseif ($redirect->type == '302') {
-                        header('Location: ' . $request::$subfolders . $toUrl, true, 302);
+                        header('Location: '.$request::$subfolders.$toUrl, true, 302);
                         exit;
                     } else {
                         throw new \Exception('Invalid redirect type.');
@@ -116,7 +116,7 @@ 
         private function sitemapMatching($request)
         {
             $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($sitemap as $sitemapItem) {
                 if ($sitemapItem->regex) {
@@ -181,15 +181,15 @@ 
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
         {
-            $libraryComponentName = '\\library\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
+            $libraryComponentName = '\\library\\components\\'.$class;
+            $userComponentName = '\\components\\'.$class;
 
             if (AutoloadUtil::autoLoad($libraryComponentName, false)) {
                 $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } elseif (AutoloadUtil::autoLoad($userComponentName, false)) {
                 $component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } else {
-                throw new \Exception('Could not load component ' . $class);
+                throw new \Exception('Could not load component '.$class);
             }
 
             if (!$component instanceof Component) {
@@ -247,8 +247,8 @@ 
          */
         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));
+            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));
         }
 
         /**

cloudcontrol/library/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

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
             }
         } elseif ($name === 'content') {
             if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+                throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')');
             } else {
                 if ($this->content === null) {
                     return $this->getContent();
@@ -97,7 +97,7 @@ 
 	 */
 	public function __toString()
 	{
-		return 'Document:' . $this->title;
+		return 'Document:'.$this->title;
 	}