jenskooij / cloudcontrol

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/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 ?>

cloudcontrol/library/storage/storage/ValuelistsStorage.php

Indentation +73 added lines, -73 removed lines

@@ -12,83 +12,83 @@
 
 class ValuelistsStorage extends AbstractStorage
 {
-    /**
-     * Get all valuelists
-     *
-     * @return mixed
-     */
-    public function getValuelists()
-    {
-        return $this->repository->valuelists;
-    }
+	/**
+	 * Get all valuelists
+	 *
+	 * @return mixed
+	 */
+	public function getValuelists()
+	{
+		return $this->repository->valuelists;
+	}
 
-    public function addValuelist($postValues)
-    {
-        $valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
-        $valuelists = $this->repository->valuelists;
-        $valuelists[] = $valueListObject;
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	public function addValuelist($postValues)
+	{
+		$valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+		$valuelists = $this->repository->valuelists;
+		$valuelists[] = $valueListObject;
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Save changes to a valuelist
-     *
-     * @param $slug
-     * @param $postValues
-     *
-     * @throws \Exception
-     */
-    public function saveValuelist($slug, $postValues)
-    {
-        $valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+	/**
+	 * Save changes to a valuelist
+	 *
+	 * @param $slug
+	 * @param $postValues
+	 *
+	 * @throws \Exception
+	 */
+	public function saveValuelist($slug, $postValues)
+	{
+		$valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
 
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                $valuelists[$key] = $valuelistObject;
-            }
-        }
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				$valuelists[$key] = $valuelistObject;
+			}
+		}
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Get a valuelist by its slug
-     *
-     * @param $slug
-     *
-     * @return mixed
-     */
-    public function getValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $valuelist) {
-            if ($valuelist->slug == $slug) {
-                return $valuelist;
-            }
-        }
+	/**
+	 * Get a valuelist by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @return mixed
+	 */
+	public function getValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $valuelist) {
+			if ($valuelist->slug == $slug) {
+				return $valuelist;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Delete a sitemap item by its slug
-     *
-     * @param $slug
-     *
-     * @throws \Exception
-     */
-    public function deleteValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                unset($valuelists[$key]);
-            }
-        }
-        $valuelists = array_values($valuelists);
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	/**
+	 * Delete a sitemap item by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @throws \Exception
+	 */
+	public function deleteValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				unset($valuelists[$key]);
+			}
+		}
+		$valuelists = array_values($valuelists);
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 }
\ No newline at end of file

cloudcontrol/library/storage/factories/ValuelistFactory.php

Indentation +28 added lines, -28 removed lines

@@ -12,34 +12,34 @@
 
 class ValuelistFactory
 {
-    /**
-     * Create a sitemap item from post values
-     *
-     * @param $postValues
-     *
-     * @return \stdClass
-     * @throws \Exception
-     */
-    public static function createValuelistFromPostValues($postValues)
-    {
-        if (isset($postValues['title'])) {
-            $valuelistObject = new \stdClass();
-            $valuelistObject->title = $postValues['title'];
-            $valuelistObject->slug = StringUtil::slugify($postValues['title']);
-            $valuelistObject->pairs = new \stdClass();
-            if (isset($postValues['keys'], $postValues['values'])) {
-                foreach ($postValues['keys'] as $key => $value) {
-                    $valuelistObject->pairs->$value = $postValues['values'][$key];
-                }
-            }
-            $object_vars = get_object_vars($valuelistObject->pairs);
-            ksort($object_vars);
-            $valuelistObject->pairs = (object) $object_vars;
+	/**
+	 * Create a sitemap item from post values
+	 *
+	 * @param $postValues
+	 *
+	 * @return \stdClass
+	 * @throws \Exception
+	 */
+	public static function createValuelistFromPostValues($postValues)
+	{
+		if (isset($postValues['title'])) {
+			$valuelistObject = new \stdClass();
+			$valuelistObject->title = $postValues['title'];
+			$valuelistObject->slug = StringUtil::slugify($postValues['title']);
+			$valuelistObject->pairs = new \stdClass();
+			if (isset($postValues['keys'], $postValues['values'])) {
+				foreach ($postValues['keys'] as $key => $value) {
+					$valuelistObject->pairs->$value = $postValues['values'][$key];
+				}
+			}
+			$object_vars = get_object_vars($valuelistObject->pairs);
+			ksort($object_vars);
+			$valuelistObject->pairs = (object) $object_vars;
 
-            return $valuelistObject;
-        } else {
-            throw new \Exception('Trying to create valuelist with invalid data.');
-        }
-    }
+			return $valuelistObject;
+		} else {
+			throw new \Exception('Trying to create valuelist with invalid data.');
+		}
+	}
 
 }
\ No newline at end of file

cloudcontrol/library/components/cms/DocumentRouting.php

Indentation +37 added lines, -37 removed lines

@@ -12,33 +12,33 @@ 
 
 class DocumentRouting implements CmsRouting
 {
-    /**
-     * DocumentRouting constructor.
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/documents') {
-            $cmsComponent->subTemplate = 'cms/documents';
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()->getDocumentsWithState());
-            $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
-        }
-        $this->documentRouting($request, $relativeCmsUri, $cmsComponent);
-        $this->folderRouting($request, $relativeCmsUri, $cmsComponent);
+	/**
+	 * DocumentRouting constructor.
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/documents') {
+			$cmsComponent->subTemplate = 'cms/documents';
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENTS, $cmsComponent->storage->getDocuments()->getDocumentsWithState());
+			$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
+		}
+		$this->documentRouting($request, $relativeCmsUri, $cmsComponent);
+		$this->folderRouting($request, $relativeCmsUri, $cmsComponent);
 		$this->valuelistsRouting($request, $relativeCmsUri, $cmsComponent);
-    }
+	}
 
 
-    /**
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     * @throws \Exception
-     */
-    private function documentRouting($request, $relativeCmsUri, $cmsComponent)
-    {
+	/**
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 * @throws \Exception
+	 */
+	private function documentRouting($request, $relativeCmsUri, $cmsComponent)
+	{
 		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->documentNewRoute($request, $cmsComponent);
 		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
@@ -50,23 +50,23 @@ 
 				case '/documents/unpublish-document': $this->unpublishDocumentRoute($request, $cmsComponent); break;
 			}
 		}
-    }
+	}
 
-    /**
-     * @param $request
-     * @param $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    private function folderRouting($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
+	/**
+	 * @param $request
+	 * @param $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	private function folderRouting($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/documents/new-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->newFolderRoute($request, $cmsComponent);
-        } else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} else if ($relativeCmsUri == '/documents/edit-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->editFolderRoute($request, $cmsComponent);
-        } else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
+		} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$this->deleteFolderRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	private function valuelistsRouting($request, $relativeCmsUri, $cmsComponent)
 	{

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
     {
 		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->documentNewRoute($request, $cmsComponent);
-		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
+		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			switch ($relativeCmsUri) {
 				case '/documents/edit-document': $this->editDocumentRoute($request, $cmsComponent); break;
 				case '/documents/get-brick': $this->getBrickRoute($request, $cmsComponent); break;
@@ -95,7 +95,7 @@ 
 		if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 				$cmsComponent->storage->getDocuments()->addDocument($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 				exit;
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
@@ -103,7 +103,7 @@ 
 		} else {
 			$documentTypes = $cmsComponent->storage->getDocumentTypes()->getDocumentTypes();
 			if (count($documentTypes) < 1) {
-				throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
+				throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types/new">Please do so first.</a>');
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
 		}
@@ -120,7 +120,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->getDocuments()->saveDocument($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocuments()->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG], 'unpublished'));
@@ -157,7 +157,7 @@ 
 	private function deleteDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getDocuments()->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -171,7 +171,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
 			$cmsComponent->storage->addDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 	}
@@ -190,11 +190,11 @@ 
 		array_pop($path);
 		$path = implode('/', $path);
 
-		$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
+		$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/'.$path;
 
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
 			$cmsComponent->storage->saveDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 
@@ -209,7 +209,7 @@ 
 	private function deleteFolderRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -220,7 +220,7 @@ 
 	private function publishDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->publishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -231,7 +231,7 @@ 
 	private function unpublishDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->unpublishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -248,7 +248,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getValuelists()->addValuelist($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 			exit;
 		}
 	}
@@ -260,7 +260,7 @@ 
 
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->getValuelists()->saveValuelist($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 			exit;
 		}
 
@@ -271,7 +271,7 @@ 
 	private function deleteValuelistRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getValuelists()->deleteValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 		exit;
 	}
 }
\ No newline at end of file

cloudcontrol/library/components/NotFoundComponent.php

Indentation +5 added lines, -5 removed lines

@@ -12,10 +12,10 @@
 
 class NotFoundComponent extends BaseComponent
 {
-    public function run(Storage $storage)
-    {
-        parent::run($storage);
-        header("HTTP/1.0 404 Not Found");
-    }
+	public function run(Storage $storage)
+	{
+		parent::run($storage);
+		header("HTTP/1.0 404 Not Found");
+	}
 
 }
\ No newline at end of file