jenskooij / cloudcontrol

src/install/_index.php

Indentation +1 added lines, -1 removed lines

@@ -25,5 +25,5 @@
 \CloudControl\Cms\CloudControl::run();
 
 if (php_sapi_name() != "cli") {
-    ob_end_flush();
+	ob_end_flush();
 }
\ No newline at end of file

src/images/methods/Watermark.php

Indentation +3 added lines, -3 removed lines

@@ -12,10 +12,10 @@
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\Image;
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\Image;
+	use CloudControl\Cms\images\IMethod;
 
-    class Watermark extends IMethod
+	class Watermark extends IMethod
 	{
 		protected $_x = 0;
 		protected $_y = 0;

src/images/methods/Crop.php

Indentation +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@ 
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\IMethod;
 
-    class Crop extends IMethod
+	class Crop extends IMethod
 	{
 		protected $_width;
 		protected $_height;
@@ -116,8 +116,8 @@ 
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight);
 			

src/images/methods/Resize.php

Indentation +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\IMethod;
 
-    class Resize extends IMethod
+	class Resize extends IMethod
 	{
 		protected $_width;
 		protected $_height;

src/images/methods/Grayscale.php

Indentation +2 added lines, -2 removed lines

@@ -9,9 +9,9 @@
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\IMethod;
 
-    class Grayscale extends IMethod
+	class Grayscale extends IMethod
 	{		
 		public function Execute($imageResource)
 		{			

src/images/ImageResizer.php

Indentation +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 namespace CloudControl\Cms\images
 {
 
-    use CloudControl\Cms\cc\StringUtil;
+	use CloudControl\Cms\cc\StringUtil;
 
-    /**
+	/**
 	 * Class ImageResizer
 	 * @package CloudControl\Cms\images
 	 */

Spacing +18 added lines, -18 removed lines

@@ -45,7 +45,7 @@ 
 				}
 				return $returnFileNames;
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 
@@ -56,10 +56,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function resize($imagePath='', $width='',$height='')
+		public function resize($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-r' . $width . 'x' . $height;
-			return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
+			$modifier = '-r'.$width.'x'.$height;
+			return $this->applyMethod('Resize', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -69,10 +69,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function smartcrop($imagePath='', $width='',$height='')
+		public function smartcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-s' . $width . 'x' . $height;
-			return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-s'.$width.'x'.$height;
+			return $this->applyMethod('SmartCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -82,10 +82,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function boxcrop($imagePath='', $width='',$height='')
+		public function boxcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-b' . $width . 'x' . $height;
-			return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-b'.$width.'x'.$height;
+			return $this->applyMethod('BoxCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -94,7 +94,7 @@ 
 		 *
 		 * @return string
 		 */
-		private function modifyName($imagePath, $modifier='')
+		private function modifyName($imagePath, $modifier = '')
 		{
 			$filename = basename($imagePath);
 			$path = dirname($imagePath);
@@ -104,30 +104,30 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+				$filename = $fileNameWithoutExtension.$modifier.'.'.$extension;
 			} else {
 				$filename = StringUtil::slugify($filename);
 			}
 
-			if (file_exists($path . '/' . $filename)) {
+			if (file_exists($path.'/'.$filename)) {
 				$fileParts = explode('.', $filename);
 				if (count($fileParts) > 1) {
 					$extension = end($fileParts);
 					array_pop($fileParts);
 					$fileNameWithoutExtension = implode('-', $fileParts);
 					$fileNameWithoutExtension .= '-copy';
-					$filename = $fileNameWithoutExtension . '.' . $extension;
+					$filename = $fileNameWithoutExtension.'.'.$extension;
 				} else {
 					$filename .= '-copy';
 				}
-				return $this->modifyName($path . '/' . $filename);
+				return $this->modifyName($path.'/'.$filename);
 			}
-			return $path . '/' . $filename;
+			return $path.'/'.$filename;
 		}
 
 		private function applyMethod($method, $imagePath, $width, $height, $modifier)
 		{
-			$method = 'CloudControl\Cms\\images\\methods\\' . $method;
+			$method = 'CloudControl\Cms\\images\\methods\\'.$method;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -141,7 +141,7 @@ 
 				$resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
 				return basename($destination);
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 	}

src/cc/Application.php

Indentation +276 added lines, -276 removed lines

@@ -2,280 +2,280 @@
 
 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->getStorageDir(), $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 getStoragePath()
-        {
-            return $this->config->storagePath;
-        }
-
-        /**
-         * @return string
-         */
-        public function getTemplatePath()
-        {
-            return $this->config->templateDir;
-        }
-
-        public function getStorageDir()
-        {
-            return $this->config->storageDir;
-        }
-
-        public function getApplicationComponents()
-        {
-            $this->applicationComponents = $this->storage->getApplicationComponents()->getApplicationComponents();
-        }
-    }
+	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->getStorageDir(), $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 getStoragePath()
+		{
+			return $this->config->storagePath;
+		}
+
+		/**
+		 * @return string
+		 */
+		public function getTemplatePath()
+		{
+			return $this->config->templateDir;
+		}
+
+		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

@@ -66,7 +66,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);
@@ -86,7 +86,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)) {
@@ -96,10 +96,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.');
@@ -117,7 +117,7 @@ 
         private function sitemapMatching($request)
         {
             $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($sitemap as $sitemapItem) {
                 if ($sitemapItem->regex) {
@@ -182,15 +182,15 @@ 
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
         {
-            $libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
+            $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);
+                throw new \Exception('Could not load component '.$class);
             }
 
             if (!$component instanceof Component) {
@@ -248,8 +248,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));
         }
 
         /**

src/cc/Request.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 namespace CloudControl\Cms\cc
 {
-    /**
-     * Class Request
-     * @package CloudControl\Cms\cc
-     */
+	/**
+	 * Class Request
+	 * @package CloudControl\Cms\cc
+	 */
 	class Request {
 
 		/**
@@ -45,7 +45,7 @@ 
 		 */
 		public function __construct() 
 		{
-            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+			$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
 			
 			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$subfolders = str_replace('//', '/', self::$subfolders);

Spacing +5 added lines, -5 removed lines

@@ -45,23 +45,23 @@
 		 */
 		public function __construct() 
 		{
-            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$subfolders = str_replace('//', '/', self::$subfolders);
 			if (PHP_SAPI === 'cli') {
 				global $argv;
 				array_shift($argv);
 				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
+				self::$requestUri = self::$subfolders.implode('/', $argv);
 			} else {
 				self::$requestUri = $_SERVER['REQUEST_URI'];
 				self::$queryString = $_SERVER['QUERY_STRING'];
 			}
 			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
 			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			}
 
 			self::$requestParameters = explode('/', self::$relativeUri);

src/templates/documents/function.renderDocument.php

Indentation +13 added lines, -13 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 { ?>
   <div class="grid-box-10">
     <h3>
-      <a class="btn documentTitle" href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/documents/edit-document?slug=<?= $slugPrefix . $document->slug ?>" title="Edit">
+      <a class="btn documentTitle" href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/documents/edit-document?slug=<?= $slugPrefix.$document->slug ?>" title="Edit">
         <i class="fa fa-file-text-o"></i>
         <small class="state <?= strtolower($document->state) ?>">
           <i class="fa <?= $document->state == 'published' ? 'fa-check-circle-o' : 'fa-times-circle-o' ?>"></i></small>
@@ -32,23 +32,23 @@ 
       <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
           <? renderAction('Publish',
               'publish',
-              $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
+              $request::$subfolders.$cmsPrefix.'/documents/publish-document?slug='.$slugPrefix.$document->slug,
               'check'); ?>
       <? endif ?>
       <? if ($document->state == 'published') : ?>
           <? renderAction('Unpublish',
               'unpublish',
-              $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
+              $request::$subfolders.$cmsPrefix.'/documents/unpublish-document?slug='.$slugPrefix.$document->slug,
               'times'); ?>
       <? endif ?>
       <? renderAction('Edit',
           '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
+          $request::$subfolders.$cmsPrefix.'/documents/edit-document?slug='.$slugPrefix.$document->slug,
           'pencil'); ?>
       <? if ($document->state == 'unpublished') : ?>
           <? renderAction('Delete',
               'error',
-              $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
+              $request::$subfolders.$cmsPrefix.'/documents/delete-document?slug='.$slugPrefix.$document->slug,
               'trash',
               'return confirm(\'Are you sure you want to delete this document?\');'); ?>
       <? endif ?>