jenskooij / cloudcontrol

cloudcontrol/library/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);
 	}
 

cloudcontrol/library/storage/Document.php

Indentation +67 added lines, -67 removed lines

@@ -20,60 +20,60 @@ 
  */
 class Document
 {
-    public $id;
-    public $path;
-    public $title;
-    public $slug;
-    public $type;
-    public $documentType;
-    public $documentTypeSlug;
-    public $state;
-    public $lastModificationDate;
-    public $creationDate;
-    public $lastModifiedBy;
-    protected $fields;
-    protected $bricks;
-    protected $dynamicBricks;
-    protected $content;
+	public $id;
+	public $path;
+	public $title;
+	public $slug;
+	public $type;
+	public $documentType;
+	public $documentTypeSlug;
+	public $state;
+	public $lastModificationDate;
+	public $creationDate;
+	public $lastModifiedBy;
+	protected $fields;
+	protected $bricks;
+	protected $dynamicBricks;
+	protected $content;
 
-    protected $dbHandle;
+	protected $dbHandle;
 
-    protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
-    protected $orderableFields = array('title', 'slug', 'type', 'documentType', 'documentTypeSlug', 'state', 'lastModificationDate', 'creationDate', 'lastModifiedBy');
+	protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
+	protected $orderableFields = array('title', 'slug', 'type', 'documentType', 'documentTypeSlug', 'state', 'lastModificationDate', 'creationDate', 'lastModifiedBy');
 
-    public static $DOCUMENT_STATES = array('published', 'unpublished');
+	public static $DOCUMENT_STATES = array('published', 'unpublished');
 
-    public function __get($name) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            if (is_string($this->$name)) {
-                return json_decode($this->$name);
-            } else {
-                return $this->$name;
-            }
-        } elseif ($name === 'content') {
-            if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
-            } else {
-                if ($this->content === null) {
-                    return $this->getContent();
-                }
-            }
-        } elseif ($name === 'dbHandle') {
-            throw new \Exception('Trying to get protected property repository.');
-        }
-        return $this->$name;
-    }
+	public function __get($name) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			if (is_string($this->$name)) {
+				return json_decode($this->$name);
+			} else {
+				return $this->$name;
+			}
+		} elseif ($name === 'content') {
+			if ($this->dbHandle === null) {
+				throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+			} else {
+				if ($this->content === null) {
+					return $this->getContent();
+				}
+			}
+		} elseif ($name === 'dbHandle') {
+			throw new \Exception('Trying to get protected property repository.');
+		}
+		return $this->$name;
+	}
 
-    public function __set($name, $value) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            $this->$name = json_encode($value);
-        } elseif ($name === 'content') {
-            // Dont do anything for now..
-            return;
-        }
+	public function __set($name, $value) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			$this->$name = json_encode($value);
+		} elseif ($name === 'content') {
+			// Dont do anything for now..
+			return;
+		}
 
-        $this->$name = $value;
-    }
+		$this->$name = $value;
+	}
 
 	/**
 	 * @param string $orderBy
@@ -82,13 +82,13 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-    public function getContent($orderBy = 'title', $order = 'ASC')
-    {
-    	$docs = $this->documentStorage->getDocumentsWithState($this->path);
-    	return $docs;
-    	//dump($this->path, $docs);
-        $folderPathWithWildcard = $this->path . '%';
-        $sql = '    SELECT *
+	public function getContent($orderBy = 'title', $order = 'ASC')
+	{
+		$docs = $this->documentStorage->getDocumentsWithState($this->path);
+		return $docs;
+		//dump($this->path, $docs);
+		$folderPathWithWildcard = $this->path . '%';
+		$sql = '    SELECT *
                       FROM documents_published
                      WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . '
                        AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%"
@@ -96,24 +96,24 @@ 
                        AND path != ' . $this->dbHandle->quote($this->path) . '
                   ORDER BY ' . (in_array($orderBy, $this->orderableFields) ? $orderBy : 'title') . ' ' . ($order === 'ASC' ? 'ASC' : 'DESC') . '
                     ';
-        $stmt = $this->dbHandle->prepare($sql);
+		$stmt = $this->dbHandle->prepare($sql);
 		if ($stmt === false) {
 			$errorInfo = $this->dbHandle->errorInfo();
 			$errorMsg = $errorInfo[2];
 			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
 		}
-        $stmt->bindColumn(':orderBy', $orderBy, \PDO::PARAM_STMT);
+		$stmt->bindColumn(':orderBy', $orderBy, \PDO::PARAM_STMT);
 		$stmt->execute();
-        $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
-        foreach ($contents as $key => $document) {
-            if ($document->type === 'folder') {
-                $document->dbHandle = $this->dbHandle;
-                $contents[$key] = $document;
-            }
-        }
-        $this->content = $contents;
-        return $this->content;
-    }
+		$contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
+		foreach ($contents as $key => $document) {
+			if ($document->type === 'folder') {
+				$document->dbHandle = $this->dbHandle;
+				$contents[$key] = $document;
+			}
+		}
+		$this->content = $contents;
+		return $this->content;
+	}
 
 	/**
 	 * @return string

Spacing +9 added lines, -9 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();
@@ -87,20 +87,20 @@ 
     	$docs = $this->documentStorage->getDocumentsWithState($this->path);
     	return $docs;
     	//dump($this->path, $docs);
-        $folderPathWithWildcard = $this->path . '%';
+        $folderPathWithWildcard = $this->path.'%';
         $sql = '    SELECT *
                       FROM documents_published
-                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . '
-                       AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%"
-                       AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/"
-                       AND path != ' . $this->dbHandle->quote($this->path) . '
-                  ORDER BY ' . (in_array($orderBy, $this->orderableFields) ? $orderBy : 'title') . ' ' . ($order === 'ASC' ? 'ASC' : 'DESC') . '
+                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard).'
+                       AND substr(`path`, ' . (strlen($this->path) + 2).') NOT LIKE "%/%"
+                       AND substr(`path`, ' . (strlen($this->path) + 1).', 1) = "/"
+                       AND path != ' . $this->dbHandle->quote($this->path).'
+                  ORDER BY ' . (in_array($orderBy, $this->orderableFields) ? $orderBy : 'title').' '.($order === 'ASC' ? 'ASC' : 'DESC').'
                     ';
         $stmt = $this->dbHandle->prepare($sql);
 		if ($stmt === false) {
 			$errorInfo = $this->dbHandle->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->bindColumn(':orderBy', $orderBy, \PDO::PARAM_STMT);
 		$stmt->execute();
@@ -120,7 +120,7 @@ 
 	 */
 	public function __toString()
 	{
-		return 'Document:' . $this->title;
+		return 'Document:'.$this->title;
 	}
 
 

cloudcontrol/library/storage/Storage.php

Spacing +8 added lines, -8 removed lines

@@ -82,7 +82,7 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . '/../../' . $this->storageDir;
+			$storagePath = __DIR__.'/../../'.$this->storageDir;
 			if (realpath($storagePath) === false) {
 				initFramework();
 				if (Repository::create($storagePath)) {
@@ -90,7 +90,7 @@ 
 					$repository->init();
 					$this->repository = $repository;
 				} else {
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
+					throw new \Exception('Could not create repository directory: '.$storagePath);
 				}
 			} else {
 				$this->repository = new Repository($storagePath);
@@ -133,9 +133,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');
@@ -150,7 +150,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path, 'published');
 			$this->repository->deleteDocumentByPath($path, 'unpublished');
 			$this->repository->cleanPublishedDeletedDocuments();
@@ -158,13 +158,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);
 		}
 
@@ -178,7 +178,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -310,7 +310,7 @@
 		}
 
 		/**
-		 * @return \library\storage\storage\UsersStorage
+		 * @return ValuelistsStorage
 		 */
 		public function getValuelists()
 		{

cloudcontrol/library/search/Indexer.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 		$this->storage->getDocuments()->cleanPublishedDeletedDocuments();
 		$this->addLog('Retrieving documents to be indexed.');
 		$documents = $this->storage->getDocuments()->getPublishedDocumentsNoFolders();
-		$this->addLog('Start Document Term Count for ' . count($documents) . ' documents');
+		$this->addLog('Start Document Term Count for '.count($documents).' documents');
 		$this->createDocumentTermCount($documents);
 		$this->addLog('Start Document Term Frequency.');
 		$this->createDocumentTermFrequency();
@@ -161,7 +161,7 @@ 
 	private function addLog($string)
 	{
 		$currentTime = round(microtime(true) * 1000);
-		$this->log .= date('d-m-Y H:i:s - ') . str_pad($string, 50, " ", STR_PAD_RIGHT) . "\t" . ($currentTime - $this->lastLog) . 'ms since last log. ' . "\t" . ($currentTime - $this->loggingStart) . 'ms since start.' . PHP_EOL;
+		$this->log .= date('d-m-Y H:i:s - ').str_pad($string, 50, " ", STR_PAD_RIGHT)."\t".($currentTime - $this->lastLog).'ms since last log. '."\t".($currentTime - $this->loggingStart).'ms since start.'.PHP_EOL;
 		$this->lastLog = round(microtime(true) * 1000);
 	}
 
@@ -173,8 +173,8 @@ 
 	protected function getSearchDbHandle()
 	{
 		if ($this->searchDbHandle === null) {
-			$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB);
+			$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB);
 		}
 		return $this->searchDbHandle;
 	}
@@ -185,7 +185,7 @@ 
 	public function replaceOldIndex()
 	{
 		$this->searchDbHandle = null;
-		$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
-		rename($path . self::SEARCH_TEMP_DB, $path . 'search.db');
+		$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
+		rename($path.self::SEARCH_TEMP_DB, $path.'search.db');
 	}
 }
\ No newline at end of file

cloudcontrol/library/components/cms/SearchRouting.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 	}
 
 	private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
 		header('Content-type: application/json');
 		die(json_encode($obj));
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	private function stepRouting($step, $cmsComponent, $indexer)
 	{
-		switch($step) {
+		switch ($step) {
 			case 'resetIndex': $indexer->resetIndex(); break;
 			case 'cleanPublishedDeletedDocuments': $cmsComponent->storage->getDocuments()->cleanPublishedDeletedDocuments(); break;
 			case 'createDocumentTermCount':
@@ -95,7 +95,7 @@ 
 			case 'createTermFieldLengthNorm': $indexer->createTermFieldLengthNorm(); break;
 			case 'createInverseDocumentFrequency': $indexer->createInverseDocumentFrequency(); break;
 			case 'replaceOldIndex': $indexer->replaceOldIndex(); break;
-			default : $this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error'); break;
+			default : $this->showJson('Invalid step: '.$step.'.', 'HTTP/1.0 500 Internal Server Error'); break;
 		}
 		$this->showJson('done');
 	}

cloudcontrol/templates/cms/documents.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <? include('documents/function.renderAction.php'); ?>
 <? include('documents/function.renderDocument.php'); ?>
 <? include('documents/function.renderFolder.php'); ?>
-<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');};</script>
+<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders.$cmsPrefix?>/documents?path=/');};</script>
 <section class="documents">
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
 	<nav class="actions">
@@ -27,9 +27,9 @@ 
 			<? foreach ($documents as $document) : ?>
 				<li class="grid-container">
 					<? if ($document->type == 'document') : ?>
-						<?renderDocument($document, $cmsPrefix);?>
+						<?renderDocument($document, $cmsPrefix); ?>
 					<? elseif ($document->type == 'folder') : ?>
-						<?renderFolder($document, $cmsPrefix, '', true);?>
+						<?renderFolder($document, $cmsPrefix, '', true); ?>
 					<? endif ?>
 				</li>
 			<? endforeach ?>

cloudcontrol/templates/cms/documents/function.renderDocument.php

Indentation +4 added lines, -4 removed lines

@@ -21,9 +21,9 @@ 
 	<div class="documentActions grid-box-2">
 		<? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
             <?renderAction('Publish',
-                'publish',
-                \library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
-                'check');?>
+				'publish',
+				\library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
+				'check');?>
 		<? endif ?>
 		<? if ($document->state == 'published') : ?>
 			<?renderAction('Unpublish',
@@ -40,7 +40,7 @@ 
 				'error',
 				\library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
 				'trash',
-                'return confirm(\'Are you sure you want to delete this document?\');');?>
+				'return confirm(\'Are you sure you want to delete this document?\');');?>
 		<? endif ?>
 	</div>
 <?}?>

Spacing +9 added lines, -9 removed lines

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

cloudcontrol/library/storage/Repository.php

Spacing +52 added lines, -52 removed lines

@@ -106,13 +106,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);
             }
         }
     }
@@ -127,10 +127,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>');
         }
     }
 
@@ -139,7 +139,7 @@ 
      */
     public function save()
     {
-        array_map(function ($value) {
+        array_map(function($value) {
         	$this->saveSubset($value);
 		}, $this->fileBasedSubsets);
     }
@@ -150,10 +150,10 @@ 
      */
     protected function saveSubset($subset)
     {
-		$changes = $subset . 'Changes';
+		$changes = $subset.'Changes';
 		if ($this->$changes === true) {
 			$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;
@@ -167,7 +167,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;
@@ -215,7 +215,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;
     }
@@ -231,7 +231,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);
     }
@@ -239,7 +239,7 @@ 
 	public function getDocumentsWithState($folderPath = '/')
 	{
 		$db = $this->getContentDbHandle();
-		$folderPathWithWildcard = $folderPath . '%';
+		$folderPathWithWildcard = $folderPath.'%';
 
 		$ifRootIndex = 1;
 		if ($folderPath == '/') {
@@ -254,10 +254,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);
@@ -284,16 +284,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);
 
@@ -320,7 +320,7 @@ 
         if ($containerPath === '/') {
             return $this->getRootFolder();
         }
-        if (substr($containerPath, -1) === '/'){
+        if (substr($containerPath, -1) === '/') {
 			$containerPath = substr($containerPath, 0, -1);
 		}
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
@@ -337,13 +337,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;
@@ -363,16 +363,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));
@@ -391,7 +391,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;
 	}
@@ -401,7 +401,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
 			';
@@ -414,7 +414,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();
@@ -481,7 +481,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;
     }
@@ -511,25 +511,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();
@@ -553,16 +553,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();
             }

Indentation +316 added lines, -316 removed lines

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

cloudcontrol/templates/cms/documents/function.renderFolder.php

Spacing +8 added lines, -8 removed lines

@@ -5,10 +5,10 @@ 
  * @param string                    $slugPrefix
  * @param bool                      $root
  */
-function renderFolder($document, $cmsPrefix, $slugPrefix ='', $root = false) {?>
+function renderFolder($document, $cmsPrefix, $slugPrefix = '', $root = false) {?>
 	<div class="grid-box-8">
 		<h3>
-			<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix . $document->slug?>" title="Open">
+			<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix.$document->slug?>" title="Open">
 				<i class="fa fa-folder-o "></i> <?=$document->title?>
 			</a>
 		</h3>
@@ -16,21 +16,21 @@ 
 	<div class="documentActions grid-box-4">
 		<?renderAction('Edit',
 			'',
-			\library\cc\Request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
-			'pencil');?>
+			\library\cc\Request::$subfolders.$cmsPrefix.'/documents/edit-folder?slug='.$slugPrefix.$document->slug,
+			'pencil'); ?>
 		<?renderAction('Delete',
 			'error',
-			\library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
+			\library\cc\Request::$subfolders.$cmsPrefix.'/documents/delete-folder?slug='.$slugPrefix.$document->slug,
 			'trash',
-			'return confirm(\'Are you sure you want to delete this document?\');');?>
+			'return confirm(\'Are you sure you want to delete this document?\');'); ?>
 	</div>
 	<ul class="documents grid-wrapper nested<?=$root ? ' root' : '' ?>">
 		<? foreach ($document->content as $subDocument) : ?>
 			<li class="grid-container">
 				<? if ($subDocument->type == 'document') : ?>
-					<?renderDocument($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
+					<?renderDocument($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
 				<? elseif ($subDocument->type == 'folder') : ?>
-					<?renderFolder($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
+					<?renderFolder($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
 				<? endif ?>
 			</li>
 		<? endforeach ?>