jenskooij / cloudcontrol

src/crypt/Crypt.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 				$output = '';
 				for ($i = 0; $i < $count; $i += 16) {
 					$random_state =
-						md5(microtime() . $random_state);
+						md5(microtime().$random_state);
 					$output .=
 						pack('H*', md5($random_state));
 				}

Indentation +112 added lines, -112 removed lines

@@ -1,129 +1,129 @@
 <?php
 namespace CloudControl\Cms\crypt
 {
-	/**
-	 * Class Crypt
-	 * @package CloudControl\Cms\crypt
-	 */
-	class Crypt
-	{
-		/**
-		 * @var string
-		 */
-		private $lastSalt;
+    /**
+     * Class Crypt
+     * @package CloudControl\Cms\crypt
+     */
+    class Crypt
+    {
+        /**
+         * @var string
+         */
+        private $lastSalt;
 		
-		/**
-		 * Encrypts the given value using the blowfish algorithm
-		 *
-		 * @param  string  	$value 					The sting to be encrypted
-		 * @param  int 	  	$encryptionIterations 	The amount of iterations used for encryption, 13 by default, resulting in aprox. 0.5 seconds of encrypting. Each raise, will result in about double the time
-		 * @return string 	The hash
-		 */
-		public function encrypt($value, $encryptionIterations = 13)
-		{
-			$random = $this->getRandomBytes(16);
-			$this->lastSalt = $this->getSalt($random, $encryptionIterations);
-			$hash = crypt($value, $this->lastSalt);
-			return $hash;
-		}
+        /**
+         * Encrypts the given value using the blowfish algorithm
+         *
+         * @param  string  	$value 					The sting to be encrypted
+         * @param  int 	  	$encryptionIterations 	The amount of iterations used for encryption, 13 by default, resulting in aprox. 0.5 seconds of encrypting. Each raise, will result in about double the time
+         * @return string 	The hash
+         */
+        public function encrypt($value, $encryptionIterations = 13)
+        {
+            $random = $this->getRandomBytes(16);
+            $this->lastSalt = $this->getSalt($random, $encryptionIterations);
+            $hash = crypt($value, $this->lastSalt);
+            return $hash;
+        }
 		
-		/**
-		 * If on Linux, tries to use built in random byte feed
-		 * else generates its own feed
-		 *
-		 * @param  int 		$count 		The amount of bytes to generates
-		 * @return string 	The bytes
-		 */
-		private function getRandomBytes($count)
-		{
-			$output = '';
-			$random_state = microtime();
+        /**
+         * If on Linux, tries to use built in random byte feed
+         * else generates its own feed
+         *
+         * @param  int 		$count 		The amount of bytes to generates
+         * @return string 	The bytes
+         */
+        private function getRandomBytes($count)
+        {
+            $output = '';
+            $random_state = microtime();
 
-			$openBasedir = ini_get('open_basedir');
-			if (empty($openBasedir) &&
-				is_readable('/dev/urandom') &&
-				($fh = @fopen('/dev/urandom', 'rb'))) {
-				$output = fread($fh, $count);
-				fclose($fh);
-			}
+            $openBasedir = ini_get('open_basedir');
+            if (empty($openBasedir) &&
+                is_readable('/dev/urandom') &&
+                ($fh = @fopen('/dev/urandom', 'rb'))) {
+                $output = fread($fh, $count);
+                fclose($fh);
+            }
 
-			if (strlen($output) < $count) {
-				$output = '';
-				for ($i = 0; $i < $count; $i += 16) {
-					$random_state =
-						md5(microtime() . $random_state);
-					$output .=
-						pack('H*', md5($random_state));
-				}
-				$output = substr($output, 0, $count);
-			}
+            if (strlen($output) < $count) {
+                $output = '';
+                for ($i = 0; $i < $count; $i += 16) {
+                    $random_state =
+                        md5(microtime() . $random_state);
+                    $output .=
+                        pack('H*', md5($random_state));
+                }
+                $output = substr($output, 0, $count);
+            }
 			
-			return $output;
-		}
+            return $output;
+        }
 
-		/**
-		 * Generates the salt used for encryption
-		 *
-		 * @param string $input      Feed for iteration
-		 * @param int    $iterations Amount of iterations
-		 *
-		 * @return string
-		 */
-		private function getSalt($input, $iterations)
-		{
-			$itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        /**
+         * Generates the salt used for encryption
+         *
+         * @param string $input      Feed for iteration
+         * @param int    $iterations Amount of iterations
+         *
+         * @return string
+         */
+        private function getSalt($input, $iterations)
+        {
+            $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
-			$output = '$2a$';
-			$output .= chr(ord('0') + $iterations / 10);
-			$output .= chr(ord('0') + $iterations % 10);
-			$output .= '$';
+            $output = '$2a$';
+            $output .= chr(ord('0') + $iterations / 10);
+            $output .= chr(ord('0') + $iterations % 10);
+            $output .= '$';
 
-			$i = 0;
-			do {
-				$c1 = ord($input[$i++]);
-				$output .= $itoa64[$c1 >> 2];
-				$c1 = ($c1 & 0x03) << 4;
-				if ($i >= 16) {
-					$output .= $itoa64[$c1];
-					break;
-				}
+            $i = 0;
+            do {
+                $c1 = ord($input[$i++]);
+                $output .= $itoa64[$c1 >> 2];
+                $c1 = ($c1 & 0x03) << 4;
+                if ($i >= 16) {
+                    $output .= $itoa64[$c1];
+                    break;
+                }
 
-				$c2 = ord($input[$i++]);
-				$c1 |= $c2 >> 4;
-				$output .= $itoa64[$c1];
-				$c1 = ($c2 & 0x0f) << 2;
+                $c2 = ord($input[$i++]);
+                $c1 |= $c2 >> 4;
+                $output .= $itoa64[$c1];
+                $c1 = ($c2 & 0x0f) << 2;
 
-				$c2 = ord($input[$i++]);
-				$c1 |= $c2 >> 6;
-				$output .= $itoa64[$c1];
-				$output .= $itoa64[$c2 & 0x3f];
-			} while (1);
+                $c2 = ord($input[$i++]);
+                $c1 |= $c2 >> 6;
+                $output .= $itoa64[$c1];
+                $output .= $itoa64[$c2 & 0x3f];
+            } while (1);
 
-			return $output;
-		}
+            return $output;
+        }
 		
-		/**
-		 * Returns the last used salt for encryption
-		 *
-		 * @return string | NULL
-		 */
-		public function getLastSalt()
-		{
-			return $this->lastSalt;
-		}
+        /**
+         * Returns the last used salt for encryption
+         *
+         * @return string | NULL
+         */
+        public function getLastSalt()
+        {
+            return $this->lastSalt;
+        }
 
-		/**
-		 * Compare the input with a known hash and salt
-		 *
-		 * @param $input
-		 * @param $hash
-		 * @param $salt
-		 * @return bool
-		 */
-		public function compare($input, $hash, $salt)
-		{
-			$newHash = crypt($input, $salt);
-			return $newHash == $hash;
-		}
-	}
+        /**
+         * Compare the input with a known hash and salt
+         *
+         * @param $input
+         * @param $hash
+         * @param $salt
+         * @return bool
+         */
+        public function compare($input, $hash, $salt)
+        {
+            $newHash = crypt($input, $salt);
+            return $newHash == $hash;
+        }
+    }
 }
\ No newline at end of file

src/storage/Document.php

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

Indentation +15 added lines, -15 removed lines

@@ -75,13 +75,13 @@ 
         $this->$name = $value;
     }
 
-	/**
-	 * @param string $orderBy
-	 * @param string $order
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
+    /**
+     * @param string $orderBy
+     * @param string $order
+     *
+     * @return array
+     * @throws \Exception
+     */
     public function getContent($orderBy = 'title', $order = 'ASC')
     {
         if (empty($this->content)) {
@@ -89,16 +89,16 @@ 
             $this->content = $docs;
         }
 
-    	return $this->content;
+        return $this->content;
     }
 
-	/**
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return 'Document:' . $this->title;
-	}
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return 'Document:' . $this->title;
+    }
 
 
 }
\ No newline at end of file

src/storage/storage/DocumentStorage.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 	public function getDocuments($state = 'published')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
 		return $this->repository->getDocuments($state);
 	}
@@ -50,9 +50,9 @@ 
 	public function getDocumentBySlug($slug, $state = 'published')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
-		$path = '/' . $slug;
+		$path = '/'.$slug;
 
 		return $this->repository->getDocumentByPath($path, $state);
 	}
@@ -66,16 +66,16 @@ 
 	public function saveDocument($postValues, $state = 'unpublished')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
-		$oldPath = '/' . $postValues['path'];
+		$oldPath = '/'.$postValues['path'];
 
 		$container = $this->getDocumentContainerByPath($oldPath);
 		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
 		if ($container->path === '/') {
-			$newPath = $container->path . $documentObject->slug;
+			$newPath = $container->path.$documentObject->slug;
 		} else {
-			$newPath = $container->path . '/' . $documentObject->slug;
+			$newPath = $container->path.'/'.$documentObject->slug;
 		}
 		$documentObject->path = $newPath;
 		$this->repository->saveDocument($documentObject, $state);
@@ -89,9 +89,9 @@ 
 	{
 		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
 		if ($postValues['path'] === '/') {
-			$documentObject->path = $postValues['path'] . $documentObject->slug;
+			$documentObject->path = $postValues['path'].$documentObject->slug;
 		} else {
-			$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+			$documentObject->path = $postValues['path'].'/'.$documentObject->slug;
 		}
 
 		$this->repository->saveDocument($documentObject, $state);
@@ -102,7 +102,7 @@ 
 	 */
 	public function deleteDocumentBySlug($slug)
 	{
-		$path = '/' . $slug;
+		$path = '/'.$slug;
 		$this->repository->deleteDocumentByPath($path);
 	}
 

Indentation +118 added lines, -118 removed lines

@@ -10,123 +10,123 @@
 
 class DocumentStorage extends AbstractStorage
 {
-	/**
-	 * Get documents
-	 *
-	 * @param string $state
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getDocuments($state = 'published')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		return $this->repository->getDocuments($state);
-	}
-
-	public function getDocumentsWithState($folderPath = '/')
-	{
-		return $this->repository->getDocumentsWithState($folderPath);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTotalDocumentCount()
-	{
-		return $this->repository->getTotalDocumentCount();
-	}
-
-	/**
-	 * @param string $slug
-	 *
-	 * @param string $state
-	 *
-	 * @return mixed
-	 * @throws \Exception
-	 */
-	public function getDocumentBySlug($slug, $state = 'published')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		$path = '/' . $slug;
-
-		return $this->repository->getDocumentByPath($path, $state);
-	}
-
-	/**
-	 * @param $postValues
-	 * @param $state
-	 *
-	 * @throws \Exception
-	 */
-	public function saveDocument($postValues, $state = 'unpublished')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		$oldPath = '/' . $postValues['path'];
-
-		$container = $this->getDocumentContainerByPath($oldPath);
-		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
-		if ($container->path === '/') {
-			$newPath = $container->path . $documentObject->slug;
-		} else {
-			$newPath = $container->path . '/' . $documentObject->slug;
-		}
-		$documentObject->path = $newPath;
-		$this->repository->saveDocument($documentObject, $state);
-	}
-
-	/**
-	 * @param        $postValues
-	 * @param string $state
-	 */
-	public function addDocument($postValues, $state = 'unpublished')
-	{
-		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
-		if ($postValues['path'] === '/') {
-			$documentObject->path = $postValues['path'] . $documentObject->slug;
-		} else {
-			$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
-		}
-
-		$this->repository->saveDocument($documentObject, $state);
-	}
-
-	/**
-	 * @param $slug
-	 */
-	public function deleteDocumentBySlug($slug)
-	{
-		$path = '/' . $slug;
-		$this->repository->deleteDocumentByPath($path);
-	}
-
-	/**
-	 * Returns the folder containing the document
-	 *
-	 * @param $path
-	 *
-	 * @return bool|\CloudControl\Cms\storage\Document
-	 * @throws \Exception
-	 */
-	private function getDocumentContainerByPath($path)
-	{
-		return $this->repository->getDocumentContainerByPath($path);
-	}
-
-	public function getPublishedDocumentsNoFolders()
-	{
-		return $this->repository->getPublishedDocumentsNoFolders();
-	}
-
-	public function cleanPublishedDeletedDocuments()
-	{
-		$this->repository->cleanPublishedDeletedDocuments();
-	}
+    /**
+     * Get documents
+     *
+     * @param string $state
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function getDocuments($state = 'published')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        return $this->repository->getDocuments($state);
+    }
+
+    public function getDocumentsWithState($folderPath = '/')
+    {
+        return $this->repository->getDocumentsWithState($folderPath);
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalDocumentCount()
+    {
+        return $this->repository->getTotalDocumentCount();
+    }
+
+    /**
+     * @param string $slug
+     *
+     * @param string $state
+     *
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getDocumentBySlug($slug, $state = 'published')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        $path = '/' . $slug;
+
+        return $this->repository->getDocumentByPath($path, $state);
+    }
+
+    /**
+     * @param $postValues
+     * @param $state
+     *
+     * @throws \Exception
+     */
+    public function saveDocument($postValues, $state = 'unpublished')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        $oldPath = '/' . $postValues['path'];
+
+        $container = $this->getDocumentContainerByPath($oldPath);
+        $documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
+        if ($container->path === '/') {
+            $newPath = $container->path . $documentObject->slug;
+        } else {
+            $newPath = $container->path . '/' . $documentObject->slug;
+        }
+        $documentObject->path = $newPath;
+        $this->repository->saveDocument($documentObject, $state);
+    }
+
+    /**
+     * @param        $postValues
+     * @param string $state
+     */
+    public function addDocument($postValues, $state = 'unpublished')
+    {
+        $documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
+        if ($postValues['path'] === '/') {
+            $documentObject->path = $postValues['path'] . $documentObject->slug;
+        } else {
+            $documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+        }
+
+        $this->repository->saveDocument($documentObject, $state);
+    }
+
+    /**
+     * @param $slug
+     */
+    public function deleteDocumentBySlug($slug)
+    {
+        $path = '/' . $slug;
+        $this->repository->deleteDocumentByPath($path);
+    }
+
+    /**
+     * Returns the folder containing the document
+     *
+     * @param $path
+     *
+     * @return bool|\CloudControl\Cms\storage\Document
+     * @throws \Exception
+     */
+    private function getDocumentContainerByPath($path)
+    {
+        return $this->repository->getDocumentContainerByPath($path);
+    }
+
+    public function getPublishedDocumentsNoFolders()
+    {
+        return $this->repository->getPublishedDocumentsNoFolders();
+    }
+
+    public function cleanPublishedDeletedDocuments()
+    {
+        $this->repository->cleanPublishedDeletedDocuments();
+    }
 
 }
\ No newline at end of file

src/storage/storage/AbstractStorage.php

Spacing +3 added lines, -3 removed lines

@@ -38,19 +38,19 @@
 			array_pop($fileParts);
 			$fileNameWithoutExtension = implode('-', $fileParts);
 			$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-			$filename = $fileNameWithoutExtension . '.' . $extension;
+			$filename = $fileNameWithoutExtension.'.'.$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';
 			}

Indentation +53 added lines, -53 removed lines

@@ -11,63 +11,63 @@
 
 abstract class AbstractStorage
 {
-	/**
-	 * @var Repository
-	 */
-	protected $repository;
+    /**
+     * @var Repository
+     */
+    protected $repository;
 
-	public function __construct($repository)
-	{
-		$this->repository = $repository;
-	}
+    public function __construct($repository)
+    {
+        $this->repository = $repository;
+    }
 
-	/**
-	 * Converts filename to lowercase, remove non-ascii chars
-	 * And adds "-copy" if the file already exists
-	 *
-	 * @param $filename
-	 * @param $path
-	 *
-	 * @return string
-	 */
-	protected function validateFilename($filename, $path)
-	{
-		$fileParts = explode('.', $filename);
-		if (count($fileParts) > 1) {
-			$extension = end($fileParts);
-			array_pop($fileParts);
-			$fileNameWithoutExtension = implode('-', $fileParts);
-			$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-			$filename = $fileNameWithoutExtension . '.' . $extension;
-		} else {
-			$filename = StringUtil::slugify($filename);
-		}
+    /**
+     * Converts filename to lowercase, remove non-ascii chars
+     * And adds "-copy" if the file already exists
+     *
+     * @param $filename
+     * @param $path
+     *
+     * @return string
+     */
+    protected function validateFilename($filename, $path)
+    {
+        $fileParts = explode('.', $filename);
+        if (count($fileParts) > 1) {
+            $extension = end($fileParts);
+            array_pop($fileParts);
+            $fileNameWithoutExtension = implode('-', $fileParts);
+            $fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
+            $filename = $fileNameWithoutExtension . '.' . $extension;
+        } else {
+            $filename = StringUtil::slugify($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;
-			} else {
-				$filename .= '-copy';
-			}
+        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;
+            } else {
+                $filename .= '-copy';
+            }
 
-			return $this->validateFilename($filename, $path);
-		}
+            return $this->validateFilename($filename, $path);
+        }
 
-		return $filename;
-	}
+        return $filename;
+    }
 
-	/**
-	 * Save changes made to the repository
-	 *
-	 * @throws \Exception
-	 */
-	protected function save()
-	{
-		$this->repository->save();
-	}
+    /**
+     * Save changes made to the repository
+     *
+     * @throws \Exception
+     */
+    protected function save()
+    {
+        $this->repository->save();
+    }
 }
\ No newline at end of file

src/storage/storage/FilesStorage.php

Spacing +4 added lines, -4 removed lines

@@ -37,10 +37,10 @@ 
 		$destinationPath = $this->getDestinationPath();
 
 		$filename = $this->validateFilename($postValues['name'], $destinationPath);
-		$destination = $destinationPath . '/' . $filename;
+		$destination = $destinationPath.'/'.$filename;
 
 		if ($postValues['error'] != '0') {
-			throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+			throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 		}
 
 		if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -83,7 +83,7 @@ 
 	public function deleteFileByName($filename)
 	{
 		$destinationPath = $this->getDestinationPath();
-		$destination = $destinationPath . '/' . $filename;
+		$destination = $destinationPath.'/'.$filename;
 
 		if (file_exists($destination)) {
 			$files = $this->getFiles();
@@ -113,7 +113,7 @@ 
 
     protected function getDestinationPath()
     {
-        $destinationPath = realpath($this->filesDir . DIRECTORY_SEPARATOR);
+        $destinationPath = realpath($this->filesDir.DIRECTORY_SEPARATOR);
         return $destinationPath;
     }
 }
\ No newline at end of file

Doc Comments +5 added lines, -1 removed lines

@@ -10,6 +10,10 @@ 
 {
     protected $filesDir;
 
+    /**
+     * @param \CloudControl\Cms\storage\Repository $repository
+     * @param string $filesDir
+     */
     public function __construct($repository, $filesDir)
     {
         parent::__construct($repository);
@@ -101,7 +105,7 @@ 
 	}
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getFilesDir()
     {

Indentation +90 added lines, -90 removed lines

@@ -18,87 +18,87 @@ 
 
 
     /**
-	 * @return array
-	 */
-	public function getFiles() {
-		$files = $this->repository->files;
-		usort($files, array($this, 'compareFiles'));
-
-		return $files;
-	}
-
-	/**
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function addFile($postValues)
-	{
-		$destinationPath = $this->getDestinationPath();
-
-		$filename = $this->validateFilename($postValues['name'], $destinationPath);
-		$destination = $destinationPath . '/' . $filename;
-
-		if ($postValues['error'] != '0') {
-			throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
-		}
-
-		if (move_uploaded_file($postValues['tmp_name'], $destination)) {
-			$file = new \stdClass();
-			$file->file = $filename;
-			$file->type = $postValues['type'];
-			$file->size = $postValues['size'];
-
-			$files = $this->repository->files;
-			$files[] = $file;
-			$this->repository->files = $files;
-			$this->save();
-		} else {
-			throw new \Exception('Error moving uploaded file');
-		}
-	}
-
-	/**
-	 * @param $filename
-	 *
-	 * @return null
-	 */
-	public function getFileByName($filename)
-	{
-		$files = $this->getFiles();
-		foreach ($files as $file) {
-			if ($filename == $file->file) {
-				return $file;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param $filename
-	 *
-	 * @throws \Exception
-	 */
-	public function deleteFileByName($filename)
-	{
-		$destinationPath = $this->getDestinationPath();
-		$destination = $destinationPath . '/' . $filename;
-
-		if (file_exists($destination)) {
-			$files = $this->getFiles();
-			foreach ($files as $key => $file) {
-				if ($file->file == $filename) {
-					unlink($destination);
-					unset($files[$key]);
-				}
-			}
-
-			$files = array_values($files);
-			$this->repository->files = $files;
-			$this->save();
-		}
-	}
+     * @return array
+     */
+    public function getFiles() {
+        $files = $this->repository->files;
+        usort($files, array($this, 'compareFiles'));
+
+        return $files;
+    }
+
+    /**
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function addFile($postValues)
+    {
+        $destinationPath = $this->getDestinationPath();
+
+        $filename = $this->validateFilename($postValues['name'], $destinationPath);
+        $destination = $destinationPath . '/' . $filename;
+
+        if ($postValues['error'] != '0') {
+            throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+        }
+
+        if (move_uploaded_file($postValues['tmp_name'], $destination)) {
+            $file = new \stdClass();
+            $file->file = $filename;
+            $file->type = $postValues['type'];
+            $file->size = $postValues['size'];
+
+            $files = $this->repository->files;
+            $files[] = $file;
+            $this->repository->files = $files;
+            $this->save();
+        } else {
+            throw new \Exception('Error moving uploaded file');
+        }
+    }
+
+    /**
+     * @param $filename
+     *
+     * @return null
+     */
+    public function getFileByName($filename)
+    {
+        $files = $this->getFiles();
+        foreach ($files as $file) {
+            if ($filename == $file->file) {
+                return $file;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param $filename
+     *
+     * @throws \Exception
+     */
+    public function deleteFileByName($filename)
+    {
+        $destinationPath = $this->getDestinationPath();
+        $destination = $destinationPath . '/' . $filename;
+
+        if (file_exists($destination)) {
+            $files = $this->getFiles();
+            foreach ($files as $key => $file) {
+                if ($file->file == $filename) {
+                    unlink($destination);
+                    unset($files[$key]);
+                }
+            }
+
+            $files = array_values($files);
+            $this->repository->files = $files;
+            $this->save();
+        }
+    }
 
     /**
      * @return mixed
@@ -109,15 +109,15 @@ 
     }
 
     /**
-	 * @param $a
-	 * @param $b
-	 *
-	 * @return int
-	 */
-	private function compareFiles($a, $b)
-	{
-		return strcmp($a->file, $b->file);
-	}
+     * @param $a
+     * @param $b
+     *
+     * @return int
+     */
+    private function compareFiles($a, $b)
+    {
+        return strcmp($a->file, $b->file);
+    }
 
     protected function getDestinationPath()
     {

src/cc/Application.php

Doc Comments +5 added lines, -2 removed lines

@@ -83,6 +83,9 @@ 
             $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
         }
 
+        /**
+         * @param Request $request
+         */
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
@@ -112,7 +115,7 @@ 
          * Loop through sitemap items and see if one matches the requestUri.
          * If it does, add it tot the matchedSitemapItems array
          *
-         * @param $request
+         * @param Request $request
          */
         private function sitemapMatching($request)
         {
@@ -177,7 +180,7 @@ 
          * @param array $parameters
          * @param \stdClass|null $matchedSitemapItem
          *
-         * @return mixed
+         * @return Component
          * @throws \Exception
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)

Spacing +11 added lines, -11 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);
@@ -80,13 +80,13 @@ 
          */
         private function storage()
         {
-            $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
+            $this->storage = new Storage($this->config->rootDir.DIRECTORY_SEPARATOR.$this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
         }
 
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
+            $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/components/CmsComponent.php

Spacing +4 added lines, -4 removed lines

@@ -170,7 +170,7 @@ 
 				$whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -186,7 +186,7 @@ 
 				$blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}
@@ -230,7 +230,7 @@ 
 			if ($relativeCmsUri == '/log-off') {
 				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
 				unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+				header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
 				exit;
 			}
 		}
@@ -371,7 +371,7 @@ 
 
         protected function getTemplateDir($template, $application = null)
         {
-            return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+            return __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php';
         }
     }
 }
\ No newline at end of file

Indentation +344 added lines, -344 removed lines

@@ -11,51 +11,51 @@ 
     use CloudControl\Cms\storage\Storage;
 
     class CmsComponent extends BaseComponent
-	{
+    {
         /**
-		 * @var \CloudControl\Cms\storage\Storage
-		 */
-		public $storage;
-
-		const INVALID_CREDENTIALS_MESSAGE = 'Invalid username / password combination';
-
-		const MAIN_NAV_CLASS = 'default';
-
-		const PARAMETER_APPLICATION_COMPONENT = 'applicationComponent';
-		const PARAMETER_APPLICATION_COMPONENTS = 'applicationComponents';
-		const PARAMETER_BLACKLIST_IPS = 'blacklistIps';
-		const PARAMETER_BODY = 'body';
-		const PARAMETER_BRICK = 'brick';
-		const PARAMETER_BRICKS = 'bricks';
-		const PARAMETER_CMS_PREFIX = 'cmsPrefix';
-		const PARAMETER_CONFIGURATION = 'configuration';
-		const PARAMETER_DOCUMENT = 'document';
-		const PARAMETER_DOCUMENTS = 'documents';
-		const PARAMETER_DOCUMENT_TYPE = 'documentType';
-		const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
-		const PARAMETER_ERROR_MESSAGE = 'errorMsg';
-		const PARAMETER_FILES = 'files';
-		const PARAMETER_FOLDER = 'folder';
-		const PARAMETER_IMAGE = 'image';
-		const PARAMETER_IMAGES = 'images';
-		const PARAMETER_IMAGE_SET = 'imageSet';
-		const PARAMETER_MAIN_NAV_CLASS = 'mainNavClass';
-		const PARAMETER_MY_BRICK_SLUG = 'myBrickSlug';
+         * @var \CloudControl\Cms\storage\Storage
+         */
+        public $storage;
+
+        const INVALID_CREDENTIALS_MESSAGE = 'Invalid username / password combination';
+
+        const MAIN_NAV_CLASS = 'default';
+
+        const PARAMETER_APPLICATION_COMPONENT = 'applicationComponent';
+        const PARAMETER_APPLICATION_COMPONENTS = 'applicationComponents';
+        const PARAMETER_BLACKLIST_IPS = 'blacklistIps';
+        const PARAMETER_BODY = 'body';
+        const PARAMETER_BRICK = 'brick';
+        const PARAMETER_BRICKS = 'bricks';
+        const PARAMETER_CMS_PREFIX = 'cmsPrefix';
+        const PARAMETER_CONFIGURATION = 'configuration';
+        const PARAMETER_DOCUMENT = 'document';
+        const PARAMETER_DOCUMENTS = 'documents';
+        const PARAMETER_DOCUMENT_TYPE = 'documentType';
+        const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
+        const PARAMETER_ERROR_MESSAGE = 'errorMsg';
+        const PARAMETER_FILES = 'files';
+        const PARAMETER_FOLDER = 'folder';
+        const PARAMETER_IMAGE = 'image';
+        const PARAMETER_IMAGES = 'images';
+        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_SEARCH = 'search';
-		const PARAMETER_SEARCH_LOG = "searchLog";
-		const PARAMETER_SEARCH_NEEDS_UPDATE = "searchNeedsUpdate";
-		const PARAMETER_SITEMAP = 'sitemap';
-		const PARAMETER_SITEMAP_ITEM = 'sitemapItem';
-		const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
-		const PARAMETER_STATIC = 'static';
-		const PARAMETER_USER = 'user';
-		const PARAMETER_USERS = 'users';
-		const PARAMETER_USER_RIGHTS = 'userRights';
-		const PARAMETER_VALUELIST = "valuelist";
-		const PARAMETER_VALUELISTS = "valuelists";
-		const PARAMETER_WHITELIST_IPS = 'whitelistIps';
+        const PARAMETER_SEARCH = 'search';
+        const PARAMETER_SEARCH_LOG = "searchLog";
+        const PARAMETER_SEARCH_NEEDS_UPDATE = "searchNeedsUpdate";
+        const PARAMETER_SITEMAP = 'sitemap';
+        const PARAMETER_SITEMAP_ITEM = 'sitemapItem';
+        const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
+        const PARAMETER_STATIC = 'static';
+        const PARAMETER_USER = 'user';
+        const PARAMETER_USERS = 'users';
+        const PARAMETER_USER_RIGHTS = 'userRights';
+        const PARAMETER_VALUELIST = "valuelist";
+        const PARAMETER_VALUELISTS = "valuelists";
+        const PARAMETER_WHITELIST_IPS = 'whitelistIps';
 
         const POST_PARAMETER_COMPONENT = 'component';
         const POST_PARAMETER_FROM_URL = "fromUrl";
@@ -66,308 +66,308 @@ 
         const POST_PARAMETER_TO_URL = "toUrl";
         const POST_PARAMETER_USERNAME = 'username';
 
-		const GET_PARAMETER_PATH = 'path';
-		const GET_PARAMETER_SLUG = 'slug';
-
-		const FILES_PARAMETER_FILE = 'file';
-
-		const SESSION_PARAMETER_CLOUD_CONTROL = 'cloudcontrol';
-
-		const LOGIN_TEMPLATE_PATH = 'login';
-
-		const CONTENT_TYPE_APPLICATION_JSON = 'Content-type:application/json';
-
-		public $subTemplate = null;
-
-
-		/**
-		 * @param Storage $storage
-		 *
-		 * @return void
-		 */
-		public function run(Storage $storage)
-		{
-			$this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::MAIN_NAV_CLASS;
-			$this->storage = $storage;
-
-			$remoteAddress = $_SERVER['REMOTE_ADDR'];
-			$this->checkWhiteList($remoteAddress);
-			$this->checkBlackList($remoteAddress);
-
-			$this->checkLogin();
-
-			$this->parameters[self::PARAMETER_USER_RIGHTS] = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
-
-			$this->routing();
-		}
-
-		/**
-		 * See if a user is logged or wants to log in and
-		 * takes appropriate actions.
-		 *
-		 * @throws \Exception
-		 */
-		protected function checkLogin()
-		{
-			$request = $this->request;
-
-			if (!isset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL])) {
-				if (isset($request::$post[self::POST_PARAMETER_USERNAME], $request::$post[self::POST_PARAMETER_PASSWORD])) {
-					$this->checkLoginAttempt($request);
-				} else {
-					$this->showLogin();
-				}
-			}
-		}
-
-		/**
-		 * Overrides normal behaviour and only renders the
-		 * login screen
-		 *
-		 * @throws \Exception
-		 */
-		protected function showLogin()
-		{
-			$loginTemplatePath = self::LOGIN_TEMPLATE_PATH;
-			$this->renderTemplate($loginTemplatePath);
-			ob_end_flush();
-			exit;
-		}
-
-		/**
-		 * As an exception, to keep the initial file structure simple
-		 * the cms implements it's own routing, apart from the regular sitemap functionality
-		 *
-		 * @throws \Exception
-		 */
-		protected function routing()
-		{
-			$relativeCmsUri = $this->getRelativeCmsUri($this->request);
-
-			$userRights = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
-
-			$this->dashboardRouting($relativeCmsUri);
-			$this->logOffRouting($this->request, $relativeCmsUri);
-			$this->apiRouting($relativeCmsUri);
-			$this->documentRouting($userRights, $relativeCmsUri);
-			$this->sitemapRouting($userRights, $relativeCmsUri);
-			$this->imageRouting($userRights, $relativeCmsUri);
-			$this->filesRouting($userRights, $relativeCmsUri);
-			$this->configurationRouting($userRights, $relativeCmsUri);
-			$this->searchRouting($userRights, $relativeCmsUri);
-
-			$this->renderBody();
-		}
-
-		/**
-		 * @param $remoteAddress
-		 *
-		 * @throws \Exception
-		 */
-		private function checkWhiteList($remoteAddress)
-		{
-			if (isset($this->parameters[self::PARAMETER_WHITELIST_IPS])) {
-				$whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
-				$whitelistIps = array_map("trim", $whitelistIps);
-				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
-				}
-			}
-		}
-
-		/**
-		 * @param $remoteAddress
-		 *
-		 * @throws \Exception
-		 */
-		private function checkBlackList($remoteAddress)
-		{
-			if (isset($this->parameters[self::PARAMETER_BLACKLIST_IPS])) {
-				$blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
-				$blacklistIps = array_map("trim", $blacklistIps);
-				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
-				}
-			}
-		}
-
-		/**
-		 * @param $request
-		 *
-		 * @return mixed|string
-		 */
-		private function getRelativeCmsUri($request)
-		{
-			// TODO Use regex match parameter instead of calculating relative uri
-			$pos = strpos($request::$relativeUri, $this->parameters[self::PARAMETER_CMS_PREFIX]);
-			$relativeCmsUri = '/';
-			if ($pos !== false) {
-				$relativeCmsUri = substr_replace($request::$relativeUri, '', $pos, strlen($this->parameters[self::PARAMETER_CMS_PREFIX]));
-			}
-
-			return $relativeCmsUri;
-		}
-
-		/**
-		 * @param $relativeCmsUri
-		 */
-		private function apiRouting($relativeCmsUri)
-		{
-			if ($relativeCmsUri == '/images.json') {
-				header(self::CONTENT_TYPE_APPLICATION_JSON);
-				die(json_encode($this->storage->getImages()->getImages()));
-			} elseif ($relativeCmsUri == '/files.json') {
-				header(self::CONTENT_TYPE_APPLICATION_JSON);
-				die(json_encode($this->storage->getFiles()->getFiles()));
-			} elseif ($relativeCmsUri == '/documents.json') {
-				header(self::CONTENT_TYPE_APPLICATION_JSON);
-				die(json_encode($this->storage->getDocuments()->getDocuments()));
-			}
-		}
-
-		private function logOffRouting($request, $relativeCmsUri)
-		{
-			if ($relativeCmsUri == '/log-off') {
-				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
-				unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
-				exit;
-			}
-		}
-
-		public function setParameter($parameterName, $parameterValue)
-		{
-			$this->parameters[$parameterName] = $parameterValue;
-		}
-
-		public function getParameter($parameterName)
-		{
-			return $this->parameters[$parameterName];
-		}
-
-		/**
-		 * @param $relativeCmsUri
-		 */
-		protected function dashboardRouting($relativeCmsUri)
-		{
-			if ($relativeCmsUri == '' || $relativeCmsUri == '/') {
-				$this->subTemplate = 'dashboard';
-			}
-		}
-
-		/**
-		 * @param $userRights
-		 * @param $relativeCmsUri
-		 */
-		protected function documentRouting($userRights, $relativeCmsUri)
-		{
-			if (in_array(self::PARAMETER_DOCUMENTS, $userRights)) {
-				new DocumentRouting($this->request, $relativeCmsUri, $this);
-			}
-		}
-
-		/**
-		 * @param $userRights
-		 * @param $relativeCmsUri
-		 */
-		protected function sitemapRouting($userRights, $relativeCmsUri)
-		{
-			if (in_array(self::PARAMETER_SITEMAP, $userRights)) {
-				new SitemapRouting($this->request, $relativeCmsUri, $this);
-			}
-		}
-
-		/**
-		 * @param $userRights
-		 * @param $relativeCmsUri
-		 */
-		protected function imageRouting($userRights, $relativeCmsUri)
-		{
-			if (in_array(self::PARAMETER_IMAGES, $userRights)) {
-				new ImagesRouting($this->request, $relativeCmsUri, $this);
-			}
-		}
-
-		/**
-		 * @param $userRights
-		 * @param $relativeCmsUri
-		 */
-		protected function filesRouting($userRights, $relativeCmsUri)
-		{
-			if (in_array(self::PARAMETER_FILES, $userRights)) {
-				new FilesRouting($this->request, $relativeCmsUri, $this);
-			}
-		}
-
-		/**
-		 * @param $userRights
-		 * @param $relativeCmsUri
-		 */
-		protected function configurationRouting($userRights, $relativeCmsUri)
-		{
-			if (in_array('configuration', $userRights)) {
-				new ConfigurationRouting($this->request, $relativeCmsUri, $this);
-			}
-		}
-
-		protected function renderBody()
-		{
-			if ($this->subTemplate !== null) {
-				$this->parameters[self::PARAMETER_BODY] = $this->renderTemplate($this->subTemplate);
-			}
-		}
-
-		/**
-		 * @param $crypt
-		 * @param $request
-		 */
-		protected function invalidCredentials($crypt, $request)
-		{
-			$crypt->encrypt($request::$post[self::POST_PARAMETER_PASSWORD], 16); // Buy time, to avoid brute forcing
-			$this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
-			$this->showLogin();
-		}
-
-		/**
-		 * @param $user
-		 * @param $crypt
-		 * @param $request
-		 */
-		protected function checkPassword($user, $crypt, $request)
-		{
-			$salt = $user->salt;
-			$password = $user->password;
-
-			$passwordCorrect = $crypt->compare($request::$post[self::POST_PARAMETER_PASSWORD], $password, $salt);
-
-			if ($passwordCorrect) {
-				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = $user;
-			} else {
-				$this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
-				$this->showLogin();
-			}
-		}
-
-		/**
-		 * @param $request
-		 */
-		protected function checkLoginAttempt($request)
-		{
-			$user = $this->storage->getUsers()->getUserByUsername($request::$post[self::POST_PARAMETER_USERNAME]);
-			$crypt = new Crypt();
-			if (empty($user)) {
-				$this->invalidCredentials($crypt, $request);
-			} else {
-				$this->checkPassword($user, $crypt, $request);
-			}
-		}
-
-		private function searchRouting($userRights, $relativeCmsUri)
-		{
-			if (in_array(self::PARAMETER_SEARCH, $userRights)) {
-				new SearchRouting($this->request, $relativeCmsUri, $this);
-			}
-		}
+        const GET_PARAMETER_PATH = 'path';
+        const GET_PARAMETER_SLUG = 'slug';
+
+        const FILES_PARAMETER_FILE = 'file';
+
+        const SESSION_PARAMETER_CLOUD_CONTROL = 'cloudcontrol';
+
+        const LOGIN_TEMPLATE_PATH = 'login';
+
+        const CONTENT_TYPE_APPLICATION_JSON = 'Content-type:application/json';
+
+        public $subTemplate = null;
+
+
+        /**
+         * @param Storage $storage
+         *
+         * @return void
+         */
+        public function run(Storage $storage)
+        {
+            $this->parameters[self::PARAMETER_MAIN_NAV_CLASS] = self::MAIN_NAV_CLASS;
+            $this->storage = $storage;
+
+            $remoteAddress = $_SERVER['REMOTE_ADDR'];
+            $this->checkWhiteList($remoteAddress);
+            $this->checkBlackList($remoteAddress);
+
+            $this->checkLogin();
+
+            $this->parameters[self::PARAMETER_USER_RIGHTS] = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
+
+            $this->routing();
+        }
+
+        /**
+         * See if a user is logged or wants to log in and
+         * takes appropriate actions.
+         *
+         * @throws \Exception
+         */
+        protected function checkLogin()
+        {
+            $request = $this->request;
+
+            if (!isset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL])) {
+                if (isset($request::$post[self::POST_PARAMETER_USERNAME], $request::$post[self::POST_PARAMETER_PASSWORD])) {
+                    $this->checkLoginAttempt($request);
+                } else {
+                    $this->showLogin();
+                }
+            }
+        }
+
+        /**
+         * Overrides normal behaviour and only renders the
+         * login screen
+         *
+         * @throws \Exception
+         */
+        protected function showLogin()
+        {
+            $loginTemplatePath = self::LOGIN_TEMPLATE_PATH;
+            $this->renderTemplate($loginTemplatePath);
+            ob_end_flush();
+            exit;
+        }
+
+        /**
+         * As an exception, to keep the initial file structure simple
+         * the cms implements it's own routing, apart from the regular sitemap functionality
+         *
+         * @throws \Exception
+         */
+        protected function routing()
+        {
+            $relativeCmsUri = $this->getRelativeCmsUri($this->request);
+
+            $userRights = $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]->rights;
+
+            $this->dashboardRouting($relativeCmsUri);
+            $this->logOffRouting($this->request, $relativeCmsUri);
+            $this->apiRouting($relativeCmsUri);
+            $this->documentRouting($userRights, $relativeCmsUri);
+            $this->sitemapRouting($userRights, $relativeCmsUri);
+            $this->imageRouting($userRights, $relativeCmsUri);
+            $this->filesRouting($userRights, $relativeCmsUri);
+            $this->configurationRouting($userRights, $relativeCmsUri);
+            $this->searchRouting($userRights, $relativeCmsUri);
+
+            $this->renderBody();
+        }
+
+        /**
+         * @param $remoteAddress
+         *
+         * @throws \Exception
+         */
+        private function checkWhiteList($remoteAddress)
+        {
+            if (isset($this->parameters[self::PARAMETER_WHITELIST_IPS])) {
+                $whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
+                $whitelistIps = array_map("trim", $whitelistIps);
+                if (!in_array($remoteAddress, $whitelistIps)) {
+                    throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+                }
+            }
+        }
+
+        /**
+         * @param $remoteAddress
+         *
+         * @throws \Exception
+         */
+        private function checkBlackList($remoteAddress)
+        {
+            if (isset($this->parameters[self::PARAMETER_BLACKLIST_IPS])) {
+                $blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
+                $blacklistIps = array_map("trim", $blacklistIps);
+                if (in_array($remoteAddress, $blacklistIps)) {
+                    throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+                }
+            }
+        }
+
+        /**
+         * @param $request
+         *
+         * @return mixed|string
+         */
+        private function getRelativeCmsUri($request)
+        {
+            // TODO Use regex match parameter instead of calculating relative uri
+            $pos = strpos($request::$relativeUri, $this->parameters[self::PARAMETER_CMS_PREFIX]);
+            $relativeCmsUri = '/';
+            if ($pos !== false) {
+                $relativeCmsUri = substr_replace($request::$relativeUri, '', $pos, strlen($this->parameters[self::PARAMETER_CMS_PREFIX]));
+            }
+
+            return $relativeCmsUri;
+        }
+
+        /**
+         * @param $relativeCmsUri
+         */
+        private function apiRouting($relativeCmsUri)
+        {
+            if ($relativeCmsUri == '/images.json') {
+                header(self::CONTENT_TYPE_APPLICATION_JSON);
+                die(json_encode($this->storage->getImages()->getImages()));
+            } elseif ($relativeCmsUri == '/files.json') {
+                header(self::CONTENT_TYPE_APPLICATION_JSON);
+                die(json_encode($this->storage->getFiles()->getFiles()));
+            } elseif ($relativeCmsUri == '/documents.json') {
+                header(self::CONTENT_TYPE_APPLICATION_JSON);
+                die(json_encode($this->storage->getDocuments()->getDocuments()));
+            }
+        }
+
+        private function logOffRouting($request, $relativeCmsUri)
+        {
+            if ($relativeCmsUri == '/log-off') {
+                $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
+                unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
+                header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+                exit;
+            }
+        }
+
+        public function setParameter($parameterName, $parameterValue)
+        {
+            $this->parameters[$parameterName] = $parameterValue;
+        }
+
+        public function getParameter($parameterName)
+        {
+            return $this->parameters[$parameterName];
+        }
+
+        /**
+         * @param $relativeCmsUri
+         */
+        protected function dashboardRouting($relativeCmsUri)
+        {
+            if ($relativeCmsUri == '' || $relativeCmsUri == '/') {
+                $this->subTemplate = 'dashboard';
+            }
+        }
+
+        /**
+         * @param $userRights
+         * @param $relativeCmsUri
+         */
+        protected function documentRouting($userRights, $relativeCmsUri)
+        {
+            if (in_array(self::PARAMETER_DOCUMENTS, $userRights)) {
+                new DocumentRouting($this->request, $relativeCmsUri, $this);
+            }
+        }
+
+        /**
+         * @param $userRights
+         * @param $relativeCmsUri
+         */
+        protected function sitemapRouting($userRights, $relativeCmsUri)
+        {
+            if (in_array(self::PARAMETER_SITEMAP, $userRights)) {
+                new SitemapRouting($this->request, $relativeCmsUri, $this);
+            }
+        }
+
+        /**
+         * @param $userRights
+         * @param $relativeCmsUri
+         */
+        protected function imageRouting($userRights, $relativeCmsUri)
+        {
+            if (in_array(self::PARAMETER_IMAGES, $userRights)) {
+                new ImagesRouting($this->request, $relativeCmsUri, $this);
+            }
+        }
+
+        /**
+         * @param $userRights
+         * @param $relativeCmsUri
+         */
+        protected function filesRouting($userRights, $relativeCmsUri)
+        {
+            if (in_array(self::PARAMETER_FILES, $userRights)) {
+                new FilesRouting($this->request, $relativeCmsUri, $this);
+            }
+        }
+
+        /**
+         * @param $userRights
+         * @param $relativeCmsUri
+         */
+        protected function configurationRouting($userRights, $relativeCmsUri)
+        {
+            if (in_array('configuration', $userRights)) {
+                new ConfigurationRouting($this->request, $relativeCmsUri, $this);
+            }
+        }
+
+        protected function renderBody()
+        {
+            if ($this->subTemplate !== null) {
+                $this->parameters[self::PARAMETER_BODY] = $this->renderTemplate($this->subTemplate);
+            }
+        }
+
+        /**
+         * @param $crypt
+         * @param $request
+         */
+        protected function invalidCredentials($crypt, $request)
+        {
+            $crypt->encrypt($request::$post[self::POST_PARAMETER_PASSWORD], 16); // Buy time, to avoid brute forcing
+            $this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
+            $this->showLogin();
+        }
+
+        /**
+         * @param $user
+         * @param $crypt
+         * @param $request
+         */
+        protected function checkPassword($user, $crypt, $request)
+        {
+            $salt = $user->salt;
+            $password = $user->password;
+
+            $passwordCorrect = $crypt->compare($request::$post[self::POST_PARAMETER_PASSWORD], $password, $salt);
+
+            if ($passwordCorrect) {
+                $_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = $user;
+            } else {
+                $this->parameters[self::PARAMETER_ERROR_MESSAGE] = self::INVALID_CREDENTIALS_MESSAGE;
+                $this->showLogin();
+            }
+        }
+
+        /**
+         * @param $request
+         */
+        protected function checkLoginAttempt($request)
+        {
+            $user = $this->storage->getUsers()->getUserByUsername($request::$post[self::POST_PARAMETER_USERNAME]);
+            $crypt = new Crypt();
+            if (empty($user)) {
+                $this->invalidCredentials($crypt, $request);
+            } else {
+                $this->checkPassword($user, $crypt, $request);
+            }
+        }
+
+        private function searchRouting($userRights, $relativeCmsUri)
+        {
+            if (in_array(self::PARAMETER_SEARCH, $userRights)) {
+                new SearchRouting($this->request, $relativeCmsUri, $this);
+            }
+        }
 
         protected function getTemplateDir($template, $application = null)
         {

src/storage/Repository.php

Spacing +54 added lines, -54 removed lines

@@ -116,13 +116,13 @@ 
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->$name;
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                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);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         }
     }
@@ -137,10 +137,10 @@ 
     {
         if (in_array($name, $this->fileBasedSubsets)) {
             $this->$name = $value;
-            $changes = $name . 'Changes';
+            $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>');
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
         }
     }
 
@@ -150,7 +150,7 @@ 
     public function save()
     {
         $host = $this;
-        array_map(function ($value) use ($host) {
+        array_map(function($value) use ($host) {
             $host->saveSubset($value);
 		}, $this->fileBasedSubsets);
     }
@@ -161,14 +161,14 @@ 
      */
     public function saveSubset($subset)
     {
-		$changes = $subset . 'Changes';
+		$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);
             }
-			$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+			$subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
 			file_put_contents($subsetStoragePath, $json);
 
 			$this->$changes = false;
@@ -182,7 +182,7 @@ 
      */
     protected function loadSubset($subset)
     {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         $json = file_get_contents($subsetStoragePath);
         $json = json_decode($json);
         $this->$subset = $json;
@@ -224,7 +224,7 @@ 
     public function getContentDbHandle()
     {
         if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
         }
         return $this->contentDbHandle;
     }
@@ -240,7 +240,7 @@ 
     public function getDocuments($state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         return $this->getDocumentsByPath('/', $state);
     }
@@ -248,7 +248,7 @@ 
 	public function getDocumentsWithState($folderPath = '/')
 	{
 		$db = $this->getContentDbHandle();
-		$folderPathWithWildcard = $folderPath . '%';
+		$folderPathWithWildcard = $folderPath.'%';
 
 		$ifRootIndex = 1;
 		if ($folderPath == '/') {
@@ -263,10 +263,10 @@ 
               FROM documents_unpublished
 		 LEFT JOIN documents_published
          		ON documents_published.path = documents_unpublished.path
-             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1) . ') NOT LIKE "%/%"
-               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex) . '
-               AND documents_unpublished.path != ' . $db->quote($folderPath) . '
+             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard).'
+               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1).') NOT LIKE "%/%"
+               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex).'
+               AND documents_unpublished.path != ' . $db->quote($folderPath).'
           ORDER BY documents_unpublished.`type` DESC, documents_unpublished.`path` ASC
         ';
 		$stmt = $this->getDbStatement($sql);
@@ -293,16 +293,16 @@ 
     public function getDocumentsByPath($folderPath, $state = 'published')
     {
     	if (!in_array($state, Document::$DOCUMENT_STATES)) {
-    		throw new \Exception('Unsupported document state: ' . $state);
+    		throw new \Exception('Unsupported document state: '.$state);
 		}
         $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+        $folderPathWithWildcard = $folderPath.'%';
 
         $sql = 'SELECT *
-              FROM documents_' . $state . '
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
-               AND path != ' . $db->quote($folderPath) . '
+              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);
 
@@ -329,7 +329,7 @@ 
         if ($containerPath === '/') {
             return $this->getRootFolder();
         }
-        if (substr($containerPath, -1) === '/'){
+        if (substr($containerPath, -1) === '/') {
 			$containerPath = substr($containerPath, 0, -1);
 		}
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
@@ -346,13 +346,13 @@ 
     public function getDocumentByPath($path, $state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         $db = $this->getContentDbHandle();
         $document = $this->fetchDocument('
             SELECT *
-              FROM documents_' .  $state . '
-             WHERE path = ' . $db->quote($path) . '
+              FROM documents_' .  $state.'
+             WHERE path = ' . $db->quote($path).'
         ');
         if ($document instanceof Document && $document->type === 'folder') {
             $document->dbHandle = $db;
@@ -372,16 +372,16 @@ 
 	public function getTotalDocumentCount($state = 'published')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
 		$db = $this->getContentDbHandle();
 		$stmt = $db->query('
 			SELECT count(*)
-			  FROM documents_' . $state . '
+			  FROM documents_' . $state.'
 			 WHERE `type` != "folder"
 		');
 		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
-		if (!is_array($result )) {
+		if (!is_array($result)) {
 			return 0;
 		}
 		return intval(current($result));
@@ -400,7 +400,7 @@ 
 		if ($stmt === false || !$stmt->execute()) {
 			$errorInfo = $db->errorInfo();
 			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
 		}
 		return $result;
 	}
@@ -410,7 +410,7 @@ 
 			$sql = '
 				INSERT OR REPLACE INTO documents_published 
 					  (`id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`publicationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
-				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time() . ' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
+				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time().' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
 				  FROM documents_unpublished
 				 WHERE `path` = :path
 			';
@@ -423,7 +423,7 @@ 
 		if ($stmt === false) {
 			$errorInfo = $db->errorInfo();
 			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
 		}
 		$stmt->bindValue(':path', $path);
 		$stmt->execute();
@@ -490,7 +490,7 @@ 
         if ($stmt === false) {
             $errorInfo = $db->errorInfo();
             $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
         }
         return $stmt;
     }
@@ -520,25 +520,25 @@ 
     public function saveDocument($documentObject, $state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         $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`)
+            INSERT OR REPLACE INTO documents_' . $state.' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
-              ' . $db->quote($documentObject->path) . ',
-              ' . $db->quote($documentObject->title) . ',
-              ' . $db->quote($documentObject->slug) . ',
-              ' . $db->quote($documentObject->type) . ',
-              ' . $db->quote($documentObject->documentType) . ',
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
-              ' . $db->quote($documentObject->state) . ',
-              ' . $db->quote($documentObject->lastModificationDate) . ',
-              ' . $db->quote($documentObject->creationDate) . ',
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
+              ' . $db->quote($documentObject->path).',
+              ' . $db->quote($documentObject->title).',
+              ' . $db->quote($documentObject->slug).',
+              ' . $db->quote($documentObject->type).',
+              ' . $db->quote($documentObject->documentType).',
+              ' . $db->quote($documentObject->documentTypeSlug).',
+              ' . $db->quote($documentObject->state).',
+              ' . $db->quote($documentObject->lastModificationDate).',
+              ' . $db->quote($documentObject->creationDate).',
+              ' . $db->quote($documentObject->lastModifiedBy).',
+              ' . $db->quote(json_encode($documentObject->fields)).',
+              ' . $db->quote(json_encode($documentObject->bricks)).',
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
             )
         ');
         $result = $stmt->execute();
@@ -562,16 +562,16 @@ 
             if ($documentToDelete->type == 'document') {
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
-                          WHERE path = ' . $db->quote($path) . '
+                          WHERE path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
+                $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) . '
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
+                            OR path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             }
@@ -599,11 +599,11 @@ 
 
     private function initConfigIfNotExists($json, $subsetName)
     {
-        $subsetFileName = $this->storagePath . DIRECTORY_SEPARATOR . $subsetName . '.json';
+        $subsetFileName = $this->storagePath.DIRECTORY_SEPARATOR.$subsetName.'.json';
         if (file_exists($subsetFileName)) {
             $this->loadSubset($subsetName);
         } else {
-            $changes = $subsetName . 'Changes';
+            $changes = $subsetName.'Changes';
             $this->$subsetName = $json->$subsetName;
             $this->$changes = true;
         }

Indentation +174 added lines, -174 removed lines

@@ -152,7 +152,7 @@ 
         $host = $this;
         array_map(function ($value) use ($host) {
             $host->saveSubset($value);
-		}, $this->fileBasedSubsets);
+        }, $this->fileBasedSubsets);
     }
 
     /**
@@ -161,18 +161,18 @@ 
      */
     public function saveSubset($subset)
     {
-		$changes = $subset . 'Changes';
-		if ($this->$changes === true) {
+        $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);
             }
-			$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
-			file_put_contents($subsetStoragePath, $json);
+            $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+            file_put_contents($subsetStoragePath, $json);
 
-			$this->$changes = false;
-		}
+            $this->$changes = false;
+        }
     }
 
     /**
@@ -229,33 +229,33 @@ 
         return $this->contentDbHandle;
     }
 
-	/**
-	 * Get all documents
-	 *
-	 * @param string $state
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
+    /**
+     * Get all documents
+     *
+     * @param string $state
+     *
+     * @return array
+     * @throws \Exception
+     */
     public function getDocuments($state = 'published')
     {
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
         return $this->getDocumentsByPath('/', $state);
     }
 
-	public function getDocumentsWithState($folderPath = '/')
-	{
-		$db = $this->getContentDbHandle();
-		$folderPathWithWildcard = $folderPath . '%';
+    public function getDocumentsWithState($folderPath = '/')
+    {
+        $db = $this->getContentDbHandle();
+        $folderPathWithWildcard = $folderPath . '%';
 
-		$ifRootIndex = 1;
-		if ($folderPath == '/') {
-			$ifRootIndex = 0;
-		}
+        $ifRootIndex = 1;
+        if ($folderPath == '/') {
+            $ifRootIndex = 0;
+        }
 
-		$sql = '
+        $sql = '
             SELECT documents_unpublished.*,
             	   IFNULL(documents_published.state,"unpublished") as state,
             	   IFNULL(documents_published.publicationDate,NULL) as publicationDate,
@@ -269,32 +269,32 @@ 
                AND documents_unpublished.path != ' . $db->quote($folderPath) . '
           ORDER BY documents_unpublished.`type` DESC, documents_unpublished.`path` ASC
         ';
-		$stmt = $this->getDbStatement($sql);
-
-
-
-		$documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-		foreach ($documents as $key => $document) {
-			$documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
-		}
-		//dump($documents);
-		return $documents;
-	}
-
-	/**
-	 * Get all documents and folders in a certain path
-	 *
-	 * @param        $folderPath
-	 * @param string $state
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
+        $stmt = $this->getDbStatement($sql);
+
+
+
+        $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+        foreach ($documents as $key => $document) {
+            $documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
+        }
+        //dump($documents);
+        return $documents;
+    }
+
+    /**
+     * Get all documents and folders in a certain path
+     *
+     * @param        $folderPath
+     * @param string $state
+     *
+     * @return array
+     * @throws \Exception
+     */
     public function getDocumentsByPath($folderPath, $state = 'published')
     {
-    	if (!in_array($state, Document::$DOCUMENT_STATES)) {
-    		throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
         $db = $this->getContentDbHandle();
         $folderPathWithWildcard = $folderPath . '%';
 
@@ -308,7 +308,7 @@ 
 
         $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
         foreach ($documents as $key => $document) {
-			$documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
+            $documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
         }
         return $documents;
     }
@@ -330,24 +330,24 @@ 
             return $this->getRootFolder();
         }
         if (substr($containerPath, -1) === '/'){
-			$containerPath = substr($containerPath, 0, -1);
-		}
+            $containerPath = substr($containerPath, 0, -1);
+        }
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
         return $containerFolder;
     }
 
-	/**
-	 * @param        $path
-	 * @param string $state
-	 *
-	 * @return bool|\CloudControl\Cms\storage\Document
-	 * @throws \Exception
-	 */
+    /**
+     * @param        $path
+     * @param string $state
+     *
+     * @return bool|\CloudControl\Cms\storage\Document
+     * @throws \Exception
+     */
     public function getDocumentByPath($path, $state = 'published')
     {
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
         $db = $this->getContentDbHandle();
         $document = $this->fetchDocument('
             SELECT *
@@ -361,87 +361,87 @@ 
         return $document;
     }
 
-	/**
-	 * Returns the count of all documents stored in the db
-	 *
-	 * @param string $state
-	 *
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function getTotalDocumentCount($state = 'published')
-	{
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
-		$db = $this->getContentDbHandle();
-		$stmt = $db->query('
+    /**
+     * Returns the count of all documents stored in the db
+     *
+     * @param string $state
+     *
+     * @return int
+     * @throws \Exception
+     */
+    public function getTotalDocumentCount($state = 'published')
+    {
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
+        $db = $this->getContentDbHandle();
+        $stmt = $db->query('
 			SELECT count(*)
 			  FROM documents_' . $state . '
 			 WHERE `type` != "folder"
 		');
-		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
-		if (!is_array($result )) {
-			return 0;
-		}
-		return intval(current($result));
-	}
-
-	public function getPublishedDocumentsNoFolders()
-	{
-		$db = $this->getContentDbHandle();
-		$sql = '
+        $result = $stmt->fetch(\PDO::FETCH_ASSOC);
+        if (!is_array($result )) {
+            return 0;
+        }
+        return intval(current($result));
+    }
+
+    public function getPublishedDocumentsNoFolders()
+    {
+        $db = $this->getContentDbHandle();
+        $sql = '
 			SELECT *
 			  FROM documents_published
 			 WHERE `type` != "folder"
 		';
-		$stmt = $db->query($sql);
-		$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-		if ($stmt === false || !$stmt->execute()) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		return $result;
-	}
-
-	private function publishOrUnpublishDocumentByPath($path, $publish = true) {
-		if ($publish) {
-			$sql = '
+        $stmt = $db->query($sql);
+        $result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+        if ($stmt === false || !$stmt->execute()) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        return $result;
+    }
+
+    private function publishOrUnpublishDocumentByPath($path, $publish = true) {
+        if ($publish) {
+            $sql = '
 				INSERT OR REPLACE INTO documents_published 
 					  (`id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`publicationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
 				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time() . ' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
 				  FROM documents_unpublished
 				 WHERE `path` = :path
 			';
-		} else {
-			$sql = 'DELETE FROM documents_published
+        } else {
+            $sql = 'DELETE FROM documents_published
 					  WHERE `path` = :path';
-		}
-		$db = $this->getContentDbHandle();
-		$stmt = $db->prepare($sql);
-		if ($stmt === false) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-		$stmt->bindValue(':path', $path);
-		$stmt->execute();
-	}
-
-	public function publishDocumentByPath($path)
-	{
-		$this->publishOrUnpublishDocumentByPath($path);
-	}
-
-	public function unpublishDocumentByPath($path)
-	{
-		$this->publishOrUnpublishDocumentByPath($path, false);
-	}
-
-	public function cleanPublishedDeletedDocuments()
-	{
-		$sql = '   DELETE FROM documents_published
+        }
+        $db = $this->getContentDbHandle();
+        $stmt = $db->prepare($sql);
+        if ($stmt === false) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+        $stmt->bindValue(':path', $path);
+        $stmt->execute();
+    }
+
+    public function publishDocumentByPath($path)
+    {
+        $this->publishOrUnpublishDocumentByPath($path);
+    }
+
+    public function unpublishDocumentByPath($path)
+    {
+        $this->publishOrUnpublishDocumentByPath($path, false);
+    }
+
+    public function cleanPublishedDeletedDocuments()
+    {
+        $sql = '   DELETE FROM documents_published
 						 WHERE documents_published.path IN (
 						SELECT documents_published.path
 						  FROM documents_published
@@ -449,11 +449,11 @@ 
 							ON documents_unpublished.path = documents_published.path
 						 WHERE documents_unpublished.path IS NULL
 		)';
-		$stmt = $this->getDbStatement($sql);
-		$stmt->execute();
-	}
+        $stmt = $this->getDbStatement($sql);
+        $stmt->execute();
+    }
 
-	/**
+    /**
      * Return the results of the query as array of Documents
      * @param $sql
      * @return array
@@ -507,21 +507,21 @@ 
         return $rootFolder;
     }
 
-	/**
-	 * Save the document to the database
-	 *
-	 * @param Document $documentObject
-	 * @param string   $state
-	 *
-	 * @return bool
-	 * @throws \Exception
-	 * @internal param $path
-	 */
+    /**
+     * Save the document to the database
+     *
+     * @param Document $documentObject
+     * @param string   $state
+     *
+     * @return bool
+     * @throws \Exception
+     * @internal param $path
+     */
     public function saveDocument($documentObject, $state = 'published')
     {
-		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
-		}
+        if (!in_array($state, Document::$DOCUMENT_STATES)) {
+            throw new \Exception('Unsupported document state: ' . $state);
+        }
         $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`)
@@ -545,15 +545,15 @@ 
         return $result;
     }
 
-	/**
-	 * Delete the document from the database
-	 * If it's a folder, also delete it's contents
-	 *
-	 * @param        $path
-	 *
-	 * @internal param string $state
-	 *
-	 */
+    /**
+     * Delete the document from the database
+     * If it's a folder, also delete it's contents
+     *
+     * @param        $path
+     *
+     * @internal param string $state
+     *
+     */
     public function deleteDocumentByPath($path)
     {
         $db = $this->getContentDbHandle();
@@ -578,24 +578,24 @@ 
         }
     }
 
-	/**
-	 * @param $document
-	 * @param $db
-	 * @param $documents
-	 * @param $key
-	 *
-	 * @return mixed
-	 */
-	private function setAssetsToDocumentFolders($document, $db, $documents, $key)
-	{
-		if ($document->type === 'folder') {
-			$document->dbHandle = $db;
-			$document->documentStorage = new DocumentStorage($this);
-			$documents[$key] = $document;
-		}
-
-		return $documents;
-	}
+    /**
+     * @param $document
+     * @param $db
+     * @param $documents
+     * @param $key
+     *
+     * @return mixed
+     */
+    private function setAssetsToDocumentFolders($document, $db, $documents, $key)
+    {
+        if ($document->type === 'folder') {
+            $document->dbHandle = $db;
+            $document->documentStorage = new DocumentStorage($this);
+            $documents[$key] = $document;
+        }
+
+        return $documents;
+    }
 
     private function initConfigIfNotExists($json, $subsetName)
     {

src/storage/Storage.php

Spacing +6 added lines, -6 removed lines

@@ -150,9 +150,9 @@ 
 		{
 			$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
 			if ($postValues['path'] === '/') {
-				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
 			} else {
-				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
 			}
 			$this->repository->saveDocument($documentFolderObject, 'published');
 			$this->repository->saveDocument($documentFolderObject, 'unpublished');
@@ -167,7 +167,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path, 'published');
 			$this->repository->deleteDocumentByPath($path, 'unpublished');
 			$this->repository->cleanPublishedDeletedDocuments();
@@ -175,13 +175,13 @@ 
 
 		public function publishDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->publishDocumentByPath($path);
 		}
 
 		public function unpublishDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->unpublishDocumentByPath($path);
 		}
 
@@ -195,7 +195,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}

Indentation +265 added lines, -265 removed lines

@@ -15,52 +15,52 @@ 
     use CloudControl\Cms\storage\storage\ValuelistsStorage;
 
     /**
-	 * Class JsonStorage
+     * Class JsonStorage
      * @package CloudControl\Cms\storage
-	 */
-	class Storage
-	{
-		/**
-		 * @var SitemapStorage
-		 */
-		protected $sitemap;
-		/**
-		 * @var ImagesStorage
-		 */
-		protected $images;
-		/**
-		 * @var ImageSetStorage
-		 */
-		protected $imageSet;
-		/**
-		 * @var FilesStorage
-		 */
-		protected $files;
-		/**
-		 * @var UsersStorage
-		 */
-		protected $users;
-		/**
-		 * @var DocumentTypesStorage
-		 */
-		protected $documentTypes;
-		/**
-		 * @var BricksStorage
-		 */
-		protected $bricks;
-		/**
-		 * @var ApplicationComponentsStorage
-		 */
-		protected $applicationComponents;
+     */
+    class Storage
+    {
+        /**
+         * @var SitemapStorage
+         */
+        protected $sitemap;
+        /**
+         * @var ImagesStorage
+         */
+        protected $images;
+        /**
+         * @var ImageSetStorage
+         */
+        protected $imageSet;
+        /**
+         * @var FilesStorage
+         */
+        protected $files;
+        /**
+         * @var UsersStorage
+         */
+        protected $users;
+        /**
+         * @var DocumentTypesStorage
+         */
+        protected $documentTypes;
+        /**
+         * @var BricksStorage
+         */
+        protected $bricks;
+        /**
+         * @var ApplicationComponentsStorage
+         */
+        protected $applicationComponents;
 
-		/**
-		 * @var ValuelistsStorage
-		 */
-		protected $valuelists;
-		/**
-		 * @var DocumentStorage
-		 */
-		protected $documents;
+        /**
+         * @var ValuelistsStorage
+         */
+        protected $valuelists;
+        /**
+         * @var DocumentStorage
+         */
+        protected $documents;
         /**
          * @var RedirectsStorage
          */
@@ -75,13 +75,13 @@ 
         protected $filesDir;
 
         /**
-		 * @var String
-		 */
-		private $storageDir;
-		/**
-		 * @var Repository
-		 */
-		private $repository;
+         * @var String
+         */
+        private $storageDir;
+        /**
+         * @var Repository
+         */
+        private $repository;
 
         /**
          * JsonStorage constructor.
@@ -91,245 +91,245 @@ 
          * @param $filesDir
          */
         public function __construct($storageDir, $imagesDir, $filesDir)
-		{
-			$this->storageDir = $storageDir;
+        {
+            $this->storageDir = $storageDir;
             $this->imagesDir = $imagesDir;
             $this->filesDir = $filesDir;
-			$this->config();
-		}
+            $this->config();
+        }
 
-		/**
-		 * Retrieve the data from the storagepath
-		 * so it can be interacted with
-		 *
-		 * @throws \Exception
-		 */
-		private function config()
-		{
-			$storagePath = $this->storageDir;
-			if (realpath($storagePath) === false) {
-				throw new \Exception('Storage doesnt seem to be initialized, consider running composer install to do so.');
-			} else {
-				$this->repository = new Repository($storagePath);
-			}
+        /**
+         * Retrieve the data from the storagepath
+         * so it can be interacted with
+         *
+         * @throws \Exception
+         */
+        private function config()
+        {
+            $storagePath = $this->storageDir;
+            if (realpath($storagePath) === false) {
+                throw new \Exception('Storage doesnt seem to be initialized, consider running composer install to do so.');
+            } else {
+                $this->repository = new Repository($storagePath);
+            }
 
-		}
+        }
 
-		/**
-		 * @return \CloudControl\Cms\storage\storage\UsersStorage
-		 */
-		public function getUsers()
-		{
-			if (!$this->users instanceof UsersStorage) {
-				$this->users = new UsersStorage($this->repository);
-			}
-			return $this->users;
-		}
+        /**
+         * @return \CloudControl\Cms\storage\storage\UsersStorage
+         */
+        public function getUsers()
+        {
+            if (!$this->users instanceof UsersStorage) {
+                $this->users = new UsersStorage($this->repository);
+            }
+            return $this->users;
+        }
 
-		/**
-		 * Get documents
-		 *
-		 * @return DocumentStorage
-		 */
-		public function getDocuments()
-		{
-			if (!$this->documents instanceof DocumentStorage) {
-				$this->documents = new DocumentStorage($this->repository);
-			}
-			return $this->documents;
-		}
+        /**
+         * Get documents
+         *
+         * @return DocumentStorage
+         */
+        public function getDocuments()
+        {
+            if (!$this->documents instanceof DocumentStorage) {
+                $this->documents = new DocumentStorage($this->repository);
+            }
+            return $this->documents;
+        }
 
-		/**
-		 * Add new document in given path
-		 *
-		 * @param array $postValues
-		 *
-		 * @throws \Exception
-		 */
-		public function addDocumentFolder($postValues)
-		{
-			$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
-			if ($postValues['path'] === '/') {
-				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
-			} else {
-				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
-			}
-			$this->repository->saveDocument($documentFolderObject, 'published');
-			$this->repository->saveDocument($documentFolderObject, 'unpublished');
-		}
+        /**
+         * Add new document in given path
+         *
+         * @param array $postValues
+         *
+         * @throws \Exception
+         */
+        public function addDocumentFolder($postValues)
+        {
+            $documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
+            if ($postValues['path'] === '/') {
+                $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+            } else {
+                $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+            }
+            $this->repository->saveDocument($documentFolderObject, 'published');
+            $this->repository->saveDocument($documentFolderObject, 'unpublished');
+        }
 
-		/**
-		 * Delete a folder by its compound slug
-		 *
-		 * @param $slug
-		 *
-		 * @throws \Exception
-		 */
-		public function deleteDocumentFolderBySlug($slug)
-		{
-			$path = '/' . $slug;
-			$this->repository->deleteDocumentByPath($path, 'published');
-			$this->repository->deleteDocumentByPath($path, 'unpublished');
-			$this->repository->cleanPublishedDeletedDocuments();
-		}
+        /**
+         * Delete a folder by its compound slug
+         *
+         * @param $slug
+         *
+         * @throws \Exception
+         */
+        public function deleteDocumentFolderBySlug($slug)
+        {
+            $path = '/' . $slug;
+            $this->repository->deleteDocumentByPath($path, 'published');
+            $this->repository->deleteDocumentByPath($path, 'unpublished');
+            $this->repository->cleanPublishedDeletedDocuments();
+        }
 
-		public function publishDocumentBySlug($slug)
-		{
-			$path = '/' . $slug;
-			$this->repository->publishDocumentByPath($path);
-		}
+        public function publishDocumentBySlug($slug)
+        {
+            $path = '/' . $slug;
+            $this->repository->publishDocumentByPath($path);
+        }
 
-		public function unpublishDocumentBySlug($slug)
-		{
-			$path = '/' . $slug;
-			$this->repository->unpublishDocumentByPath($path);
-		}
+        public function unpublishDocumentBySlug($slug)
+        {
+            $path = '/' . $slug;
+            $this->repository->unpublishDocumentByPath($path);
+        }
 
-		/**
-		 * Retrieve a folder by its compound slug
-		 *
-		 * @param $slug
-		 *
-		 * @return mixed
-		 * @throws \Exception
-		 */
-		public function getDocumentFolderBySlug($slug)
-		{
-			$path = '/' . $slug;
+        /**
+         * Retrieve a folder by its compound slug
+         *
+         * @param $slug
+         *
+         * @return mixed
+         * @throws \Exception
+         */
+        public function getDocumentFolderBySlug($slug)
+        {
+            $path = '/' . $slug;
 
-			return $this->repository->getDocumentByPath($path);
-		}
+            return $this->repository->getDocumentByPath($path);
+        }
 
-		/**
-		 * Save changes to folder
-		 *
-		 * @param $postValues
-		 *
-		 * @throws \Exception
-		 */
-		public function saveDocumentFolder($postValues)
-		{
-			$this->addDocumentFolder($postValues);
-		}
+        /**
+         * Save changes to folder
+         *
+         * @param $postValues
+         *
+         * @throws \Exception
+         */
+        public function saveDocumentFolder($postValues)
+        {
+            $this->addDocumentFolder($postValues);
+        }
 
-		/**
-		 * @return SitemapStorage
-		 */
-		public function getSitemap()
-		{
-			if (!$this->sitemap instanceof SitemapStorage) {
-				$this->sitemap = new SitemapStorage($this->repository);
-			}
-			return $this->sitemap;
-		}
+        /**
+         * @return SitemapStorage
+         */
+        public function getSitemap()
+        {
+            if (!$this->sitemap instanceof SitemapStorage) {
+                $this->sitemap = new SitemapStorage($this->repository);
+            }
+            return $this->sitemap;
+        }
 
-		/**
-		 * Get all images
-		 *
-		 * @return ImagesStorage
-		 */
-		public function getImages()
-		{
-			if (!$this->images instanceof ImagesStorage) {
+        /**
+         * Get all images
+         *
+         * @return ImagesStorage
+         */
+        public function getImages()
+        {
+            if (!$this->images instanceof ImagesStorage) {
 
                 $this->images = new ImagesStorage($this->repository, $this->imagesDir);
-			}
-			return $this->images;
-		}
+            }
+            return $this->images;
+        }
 
-		/**
-		 * Get all files
-		 *
-		 * @return FilesStorage
-		 */
-		public function getFiles()
-		{
-			if (!$this->files instanceof FilesStorage) {
-				$this->files = new FilesStorage($this->repository, $this->filesDir);
-			}
-			return $this->files;
-		}
+        /**
+         * Get all files
+         *
+         * @return FilesStorage
+         */
+        public function getFiles()
+        {
+            if (!$this->files instanceof FilesStorage) {
+                $this->files = new FilesStorage($this->repository, $this->filesDir);
+            }
+            return $this->files;
+        }
 
-		/**
-		 * @return string
-		 */
-		public function getStorageDir()
-		{
-			return $this->storageDir;
-		}
+        /**
+         * @return string
+         */
+        public function getStorageDir()
+        {
+            return $this->storageDir;
+        }
 
-		/**
-		 * @return \PDO
-		 */
-		public function getContentDbHandle()
-		{
-			return $this->repository->getContentDbHandle();
-		}
+        /**
+         * @return \PDO
+         */
+        public function getContentDbHandle()
+        {
+            return $this->repository->getContentDbHandle();
+        }
 
-		/**
-		 * @return DocumentTypesStorage
-		 */
-		public function getDocumentTypes()
-		{
-			if (!$this->documentTypes instanceof DocumentTypesStorage) {
-				$this->documentTypes = new DocumentTypesStorage($this->repository);
-			}
-			return $this->documentTypes;
-		}
+        /**
+         * @return DocumentTypesStorage
+         */
+        public function getDocumentTypes()
+        {
+            if (!$this->documentTypes instanceof DocumentTypesStorage) {
+                $this->documentTypes = new DocumentTypesStorage($this->repository);
+            }
+            return $this->documentTypes;
+        }
 
-		/**
-		 * @return BricksStorage
-		 */
-		public function getBricks()
-		{
-			if (!$this->bricks instanceof BricksStorage) {
-				$this->bricks = new BricksStorage($this->repository);
-			}
-			return $this->bricks;
-		}
+        /**
+         * @return BricksStorage
+         */
+        public function getBricks()
+        {
+            if (!$this->bricks instanceof BricksStorage) {
+                $this->bricks = new BricksStorage($this->repository);
+            }
+            return $this->bricks;
+        }
 
-		/**
-		 * Get the image set
-		 *
-		 * @return ImageSetStorage
-		 */
-		public function getImageSet()
-		{
-			if (!$this->imageSet instanceof ImageSetStorage) {
-				$this->imageSet = new ImageSetStorage($this->repository);
-			}
-			return $this->imageSet;
-		}
+        /**
+         * Get the image set
+         *
+         * @return ImageSetStorage
+         */
+        public function getImageSet()
+        {
+            if (!$this->imageSet instanceof ImageSetStorage) {
+                $this->imageSet = new ImageSetStorage($this->repository);
+            }
+            return $this->imageSet;
+        }
 
-		/**
-		 * @return ApplicationComponentsStorage
-		 */
-		public function getApplicationComponents()
-		{
-			if (!$this->applicationComponents instanceof ApplicationComponentsStorage) {
-				$this->applicationComponents = new ApplicationComponentsStorage($this->repository);
-			}
-			return $this->applicationComponents;
-		}
+        /**
+         * @return ApplicationComponentsStorage
+         */
+        public function getApplicationComponents()
+        {
+            if (!$this->applicationComponents instanceof ApplicationComponentsStorage) {
+                $this->applicationComponents = new ApplicationComponentsStorage($this->repository);
+            }
+            return $this->applicationComponents;
+        }
 
-		/**
-		 * @return \CloudControl\Cms\storage\Repository
-		 */
-		public function getRepository()
-		{
-			return $this->repository;
-		}
+        /**
+         * @return \CloudControl\Cms\storage\Repository
+         */
+        public function getRepository()
+        {
+            return $this->repository;
+        }
 
-		/**
-		 * @return \CloudControl\Cms\storage\storage\ValuelistsStorage
-		 */
-		public function getValuelists()
-		{
-			if (!$this->valuelists instanceof ValuelistsStorage) {
-				$this->valuelists = new ValuelistsStorage($this->repository);
-			}
-			return $this->valuelists;
-		}
+        /**
+         * @return \CloudControl\Cms\storage\storage\ValuelistsStorage
+         */
+        public function getValuelists()
+        {
+            if (!$this->valuelists instanceof ValuelistsStorage) {
+                $this->valuelists = new ValuelistsStorage($this->repository);
+            }
+            return $this->valuelists;
+        }
 
         /**
          * @return \CloudControl\Cms\storage\storage\RedirectsStorage
@@ -342,5 +342,5 @@ 
             return $this->redirects;
         }
 
-	}
+    }
 }
\ No newline at end of file