jenskooij / cloudcontrol

src/storage/storage/UsersStorage.php

Indentation +115 added lines, -115 removed lines

@@ -10,129 +10,129 @@
 
 class UsersStorage extends AbstractStorage
 {
-	/**
-	 * Get all users
-	 *
-	 * @return mixed
-	 */
-	public function getUsers()
-	{
-		return $this->repository->users;
-	}
+    /**
+     * Get all users
+     *
+     * @return mixed
+     */
+    public function getUsers()
+    {
+        return $this->repository->users;
+    }
 
-	/**
-	 * Get user by slug
-	 *
-	 * @param $slug
-	 *
-	 * @return array
-	 */
-	public function getUserBySlug($slug)
-	{
-		$return = array();
+    /**
+     * Get user by slug
+     *
+     * @param $slug
+     *
+     * @return array
+     */
+    public function getUserBySlug($slug)
+    {
+        $return = array();
 
-		$users = $this->repository->users;
-		foreach ($users as $user) {
-			if ($user->slug == $slug) {
-				$return = $user;
-				break;
-			}
-		}
+        $users = $this->repository->users;
+        foreach ($users as $user) {
+            if ($user->slug == $slug) {
+                $return = $user;
+                break;
+            }
+        }
 
-		return $return;
-	}
+        return $return;
+    }
 
-	/**
-	 * Save user
-	 *
-	 * @param $slug
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function saveUser($slug, $postValues)
-	{
-		$userObj = UserFactory::createUserFromPostValues($postValues);
-		if ($userObj->slug != $slug) {
-			// If the username changed, check for duplicates
-			$doesItExist = $this->getUserBySlug($userObj->slug);
-			if (!empty($doesItExist)) {
-				throw new \Exception('Trying to rename user to existing username');
-			}
-		}
-		$users = $this->getUsers();
-		foreach ($users as $key => $user) {
-			if ($user->slug == $slug) {
-				$users[$key] = $userObj;
-			}
-		}
-		$this->repository->users = $users;
-		$this->save();
-	}
+    /**
+     * Save user
+     *
+     * @param $slug
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function saveUser($slug, $postValues)
+    {
+        $userObj = UserFactory::createUserFromPostValues($postValues);
+        if ($userObj->slug != $slug) {
+            // If the username changed, check for duplicates
+            $doesItExist = $this->getUserBySlug($userObj->slug);
+            if (!empty($doesItExist)) {
+                throw new \Exception('Trying to rename user to existing username');
+            }
+        }
+        $users = $this->getUsers();
+        foreach ($users as $key => $user) {
+            if ($user->slug == $slug) {
+                $users[$key] = $userObj;
+            }
+        }
+        $this->repository->users = $users;
+        $this->save();
+    }
 
-	/**
-	 * Add user
-	 *
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function addUser($postValues)
-	{
-		$userObj = UserFactory::createUserFromPostValues($postValues);
+    /**
+     * Add user
+     *
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function addUser($postValues)
+    {
+        $userObj = UserFactory::createUserFromPostValues($postValues);
 
-		$doesItExist = $this->getUserBySlug($userObj->slug);
-		if (!empty($doesItExist)) {
-			throw new \Exception('Trying to add username that already exists.');
-		}
-		$users = $this->repository->users;
-		$users[] = $userObj;
-		$this->repository->users = $users;
-		$this->save();
-	}
+        $doesItExist = $this->getUserBySlug($userObj->slug);
+        if (!empty($doesItExist)) {
+            throw new \Exception('Trying to add username that already exists.');
+        }
+        $users = $this->repository->users;
+        $users[] = $userObj;
+        $this->repository->users = $users;
+        $this->save();
+    }
 
-	/**
-	 * Delete user by slug
-	 *
-	 * @param $slug
-	 *
-	 * @throws \Exception
-	 */
-	public function deleteUserBySlug($slug)
-	{
-		$userToDelete = $this->getUserBySlug($slug);
-		if (empty($userToDelete)) {
-			throw new \Exception('Trying to delete a user that doesn\'t exist.');
-		}
-		$users = $this->getUsers();
-		foreach ($users as $key => $user) {
-			if ($user->slug == $userToDelete->slug) {
-				unset($users[$key]);
-				$this->repository->users = array_values($users);
-			}
-		}
-		$this->save();
-	}
+    /**
+     * Delete user by slug
+     *
+     * @param $slug
+     *
+     * @throws \Exception
+     */
+    public function deleteUserBySlug($slug)
+    {
+        $userToDelete = $this->getUserBySlug($slug);
+        if (empty($userToDelete)) {
+            throw new \Exception('Trying to delete a user that doesn\'t exist.');
+        }
+        $users = $this->getUsers();
+        foreach ($users as $key => $user) {
+            if ($user->slug == $userToDelete->slug) {
+                unset($users[$key]);
+                $this->repository->users = array_values($users);
+            }
+        }
+        $this->save();
+    }
 
-	/**
-	 * Get user by username
-	 *
-	 * @param $username
-	 *
-	 * @return array
-	 */
-	public function getUserByUsername($username)
-	{
-		$return = array();
+    /**
+     * Get user by username
+     *
+     * @param $username
+     *
+     * @return array
+     */
+    public function getUserByUsername($username)
+    {
+        $return = array();
 
-		$users = $this->repository->users;
-		foreach ($users as $user) {
-			if ($user->username == $username) {
-				$return = $user;
-				break;
-			}
-		}
+        $users = $this->repository->users;
+        foreach ($users as $user) {
+            if ($user->username == $username) {
+                $return = $user;
+                break;
+            }
+        }
 
-		return $return;
-	}
+        return $return;
+    }
 }
\ No newline at end of file

src/storage/storage/FilesStorage.php

Indentation +81 added lines, -81 removed lines

@@ -8,97 +8,97 @@
 
 class FilesStorage extends AbstractStorage
 {
-	/**
-	 * @return array
-	 */
-	public function getFiles() {
-		$files = $this->repository->files;
-		usort($files, array($this, 'compareFiles'));
+    /**
+     * @return array
+     */
+    public function getFiles() {
+        $files = $this->repository->files;
+        usort($files, array($this, 'compareFiles'));
 
-		return $files;
-	}
+        return $files;
+    }
 
-	/**
-	 * @param $postValues
-	 *
-	 * @throws \Exception
-	 */
-	public function addFile($postValues)
-	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/files/');
+    /**
+     * @param $postValues
+     *
+     * @throws \Exception
+     */
+    public function addFile($postValues)
+    {
+        $destinationPath = realpath(__DIR__ . '/../../../www/files/');
 
-		$filename = $this->validateFilename($postValues['name'], $destinationPath);
-		$destination = $destinationPath . '/' . $filename;
+        $filename = $this->validateFilename($postValues['name'], $destinationPath);
+        $destination = $destinationPath . '/' . $filename;
 
-		if ($postValues['error'] != '0') {
-			throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
-		}
+        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'];
+        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');
-		}
-	}
+            $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;
-			}
-		}
+    /**
+     * @param $filename
+     *
+     * @return null
+     */
+    public function getFileByName($filename)
+    {
+        $files = $this->getFiles();
+        foreach ($files as $file) {
+            if ($filename == $file->file) {
+                return $file;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * @param $filename
-	 *
-	 * @throws \Exception
-	 */
-	public function deleteFileByName($filename)
-	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/files/');
-		$destination = $destinationPath . '/' . $filename;
+    /**
+     * @param $filename
+     *
+     * @throws \Exception
+     */
+    public function deleteFileByName($filename)
+    {
+        $destinationPath = realpath(__DIR__ . '/../../../www/files/');
+        $destination = $destinationPath . '/' . $filename;
 
-		if (file_exists($destination)) {
-			$files = $this->getFiles();
-			foreach ($files as $key => $file) {
-				if ($file->file == $filename) {
-					unlink($destination);
-					unset($files[$key]);
-				}
-			}
+        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();
-		}
-	}
+            $files = array_values($files);
+            $this->repository->files = $files;
+            $this->save();
+        }
+    }
 
-	/**
-	 * @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);
+    }
 }
\ No newline at end of file

src/storage/Repository.php

Indentation +174 added lines, -174 removed lines

@@ -153,7 +153,7 @@ 
         $host = $this;
         array_map(function ($value) use ($host) {
             $host->saveSubset($value);
-		}, $this->fileBasedSubsets);
+        }, $this->fileBasedSubsets);
     }
 
     /**
@@ -162,18 +162,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;
+        }
     }
 
     /**
@@ -240,33 +240,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,
@@ -280,32 +280,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 . '%';
 
@@ -319,7 +319,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;
     }
@@ -341,24 +341,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 *
@@ -372,87 +372,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
@@ -460,11 +460,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
@@ -518,21 +518,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`)
@@ -556,15 +556,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();
@@ -589,22 +589,22 @@ 
         }
     }
 
-	/**
-	 * @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;
+    }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
     public function save()
     {
         $host = $this;
-        array_map(function ($value) use ($host) {
+        array_map(function($value) use ($host) {
             $host->saveSubset($value);
 		}, $this->fileBasedSubsets);
     }
@@ -340,7 +340,7 @@ 
         if ($containerPath === '/') {
             return $this->getRootFolder();
         }
-        if (substr($containerPath, -1) === '/'){
+        if (substr($containerPath, -1) === '/') {
 			$containerPath = substr($containerPath, 0, -1);
 		}
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
@@ -392,7 +392,7 @@ 
 			 WHERE `type` != "folder"
 		');
 		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
-		if (!is_array($result )) {
+		if (!is_array($result)) {
 			return 0;
 		}
 		return intval(current($result));

src/storage/Storage.php

Indentation +271 added lines, -271 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,251 +91,251 @@ 
          * @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) {
-				if (Repository::create($storagePath)) {
-					$repository = new Repository($storagePath);
-					$repository->init();
-					$this->repository = $repository;
-				} else {
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
-				}
-			} 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) {
+                if (Repository::create($storagePath)) {
+                    $repository = new Repository($storagePath);
+                    $repository->init();
+                    $this->repository = $repository;
+                } else {
+                    throw new \Exception('Could not create repository directory: ' . $storagePath);
+                }
+            } 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);
-			}
-			return $this->files;
-		}
+        /**
+         * Get all files
+         *
+         * @return FilesStorage
+         */
+        public function getFiles()
+        {
+            if (!$this->files instanceof FilesStorage) {
+                $this->files = new FilesStorage($this->repository);
+            }
+            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
@@ -348,5 +348,5 @@ 
             return $this->redirects;
         }
 
-	}
+    }
 }
\ No newline at end of file

src/util/functions.php

Indentation +25 added lines, -25 removed lines

@@ -9,14 +9,14 @@ 
  */
 function dump()
 {
-	$debug_backtrace = current(debug_backtrace());
-	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
-		foreach (func_get_args() as $data) {
-			var_dump($data);
-		}
-	} else {
-		ob_clean();
+    $debug_backtrace = current(debug_backtrace());
+    if (PHP_SAPI == 'cli') {
+        echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+        foreach (func_get_args() as $data) {
+            var_dump($data);
+        }
+    } else {
+        ob_clean();
         echo <<<END
 <!DOCTYPE html>
 <html>
@@ -29,20 +29,20 @@ 
 <body>
 END;
 
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
-		echo '<pre>';
-		foreach (func_get_args() as $data) {
-			echo "<code>";
-			var_dump($data);
-			echo "</code>";
-		}
-		echo '</pre>';
-		echo <<<END
+        echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+        echo '<pre>';
+        foreach (func_get_args() as $data) {
+            echo "<code>";
+            var_dump($data);
+            echo "</code>";
+        }
+        echo '</pre>';
+        echo <<<END
 </body>
 </html>
 END;
-	}
-	die;
+    }
+    die;
 }
 
 /**
@@ -53,11 +53,11 @@ 
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
-			$item = utf8_encode($item);
-		}
-	});
+    array_walk_recursive($array, function(&$item){
+        if(!mb_detect_encoding($item, 'utf-8', true)){
+            $item = utf8_encode($item);
+        }
+    });
 
-	return $array;
+    return $array;
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
+	array_walk_recursive($array, function(&$item) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
 			$item = utf8_encode($item);
 		}
 	});

src/components/LanguageComponent.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
         $this->sessionValues = $_SESSION['LanguageComponent'];
 
         if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
+            if (substr($request::$relativeUri, 0, 2) !== $lang) {
                 if ($lang !== $this->defaultLanguage) {
                     header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
                     exit;

src/components/CmsComponent.php

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 getTemplatePath($template, $application = null)
         {