jenskooij / cloudcontrol

cloudcontrol/templates/cms/images/show.php

Spacing +4 added lines, -4 removed lines

@@ -10,22 +10,22 @@
 	<div class="show-image">
 		<label>File</label>
 		<div class="value">
-			<?=isset($image)? $image->file : '' ?>
+			<?=isset($image) ? $image->file : '' ?>
 		</div>
 		<label>Type</label>
 		<div class="value">
-			<?=isset($image)? $image->type : '' ?>
+			<?=isset($image) ? $image->type : '' ?>
 		</div>
 		<label>Size</label>
 		<div class="value">
-			<?=isset($image)? \library\cc\StringUtil::humanFileSize($image->size) : '' ?>
+			<?=isset($image) ? \library\cc\StringUtil::humanFileSize($image->size) : '' ?>
 		</div>
 		<label>Set</label>
 		<? if (isset($image)) : ?>
 			<? foreach ($image->set as $key => $set) : ?>
 				<div class="sets">
 					<label><?=$key?></label>
-					<img src="<?=\library\cc\Request::$subfolders . 'images/' . $set?>" />
+					<img src="<?=\library\cc\Request::$subfolders.'images/'.$set?>" />
 				</div>
 			<? endforeach ?>
 		<? endif ?>

cloudcontrol/library/search/indexer/TermCount.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
 	protected function applyFilters($tokens)
 	{
 		foreach ($this->filters as $filterName) {
-			$filterClassName = '\library\search\filters\\' . $filterName;
+			$filterClassName = '\library\search\filters\\'.$filterName;
 			$filter = new $filterClassName($tokens);
 			$tokens = $filter->getFilterResults();
 		}
@@ -66,7 +66,7 @@ 
 		foreach ($documentTermCount as $field => $countArray) {
 			$quotedField = $db->quote($field);
 			foreach ($countArray as $term => $count) {
-				$values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField;
+				$values[] = $quotedDocumentPath.', '.$db->quote($term).', '.$db->quote($count).', '.$quotedField;
 				$i += 1;
 				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
 					$this->executeStoreDocumentTermCount($values, $sql, $db);
@@ -90,13 +90,13 @@ 
 	 */
 	protected function executeStoreDocumentTermCount($values, $sql, $db)
 	{
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
+		$sql .= '('.implode('),'.PHP_EOL.'(', $values).');';
 
 		$stmt = $db->prepare($sql);
 		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>');
 		}
 	}
 

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

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/brick.php

Spacing +8 added lines, -8 removed lines

@@ -4,9 +4,9 @@ 
 </div>
 <label><?=$brick->title?></label>
 <?if ($static == true) {
-	$fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]';
+	$fieldPrefix = 'bricks['.$myBrickSlug.']['.str_replace('.', '', str_replace(' ', '', microtime())).'][fields]';
 } else {
-	$fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']';
+	$fieldPrefix = 'dynamicBricks['.$brick->slug.']['.str_replace('.', '', str_replace(' ', '', microtime())).']';
 }?>
 <? foreach ($brick->fields as $field) : ?>
 			<div class="form-element">
@@ -31,7 +31,7 @@ 
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
 				<? endif ?>
-					<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+					<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 							</div>
@@ -53,7 +53,7 @@ 
 						<li class="grid-container">
 							<div class="grid-box-10">
 								<div class="grid-inner form-element">
-									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+									<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 								</div>
 							</div>
 							<div class="grid-box-2">
@@ -63,7 +63,7 @@ 
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -80,10 +80,10 @@ 
 							<a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a>
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
-							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+							<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 					<? endforeach ?>
 					<? endif ?>
 					</div>
@@ -92,5 +92,5 @@ 
 				<a class="btn js-addrtemultiple">+</a>
 				<? endif ?>
 			</div>
-			<?$value='';?>
+			<?$value = ''; ?>
 		<? endforeach ?>

cloudcontrol/templates/cms/documents/document-form-form.php

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#' . $formId : '' ?>">
+<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?=isset($formId) ? '#'.$formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
     <input type="hidden" name="path" value="<?=$request::$get['path']?>" />
     <? else : ?>
@@ -17,7 +17,7 @@ 
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>" type="text" id="title" name="title" placeholder="Title" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix = 'fields'; ?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -41,7 +41,7 @@ 
 								<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 								<div class="form-element">
 					<? endif ?>
-						<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+						<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 								</div>
@@ -63,7 +63,7 @@ 
 							<li class="grid-container">
 								<div class="grid-box-10">
 									<div class="grid-inner form-element">
-										<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+										<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 									</div>
 								</div>
 								<div class="grid-box-2">
@@ -73,7 +73,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -90,10 +90,10 @@ 
 								<a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a>
 								<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 								<div class="form-element">
-								<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+								<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 						<? endforeach ?>
 						<? endif ?>
 						</div>
@@ -102,17 +102,17 @@ 
 					<a class="btn js-addrtemultiple">+</a>
 					<? endif ?>
 				</div>
-				<?$value='';?>
+				<?$value = ''; ?>
 			<? endforeach ?>
 			<hr />
-			<? $static_brick_nr = 0;?>
+			<? $static_brick_nr = 0; ?>
 			<? foreach ($documentType->bricks as $brick) : ?>
 			<div class="brick">
 				<label><?=$brick->title?></label>
 				<? if ($brick->multiple == 'true') : ?>
 					<input type="hidden" value="<?=$brick->brickSlug?>"/>
 					<input type="hidden" value="<?=$brick->slug?>"/>
-					<?$myBrickSlug=$brick->slug;?>
+					<?$myBrickSlug = $brick->slug; ?>
 					<ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable">
 						<? if (isset($document)) : ?>
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
@@ -126,7 +126,7 @@ 
 									<li class="brick form-element">
 
 										<?$static = true; ?>
-										<?include(__DIR__ . '/brick.php')?>
+										<?include(__DIR__.'/brick.php')?>
 									</li>
 									<? endif ?>
 								<? endforeach ?>
@@ -136,7 +136,7 @@ 
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
 				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+					<?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -162,7 +162,7 @@ 
 									<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 									<div class="form-element">
 						<? endif ?>
-							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+							<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 									</div>
@@ -185,7 +185,7 @@ 
 								<li class="grid-container">
 									<div class="grid-box-10">
 										<div class="grid-inner form-element">
-											<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+											<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 										</div>
 									</div>
 									<div class="grid-box-2">
@@ -195,7 +195,7 @@ 
 										</div>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 								<? endforeach ?>
 							<? endif ?>
 						</ul>
@@ -213,10 +213,10 @@ 
 									<a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a>
 									<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 									<div class="form-element">
-									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+									<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 							<? endforeach ?>
 							<? endif ?>
 							</div>
@@ -225,12 +225,12 @@ 
 						<a class="btn js-addrtemultiple">+</a>
 						<? endif ?>
 					</div>
-					<?$value='';?>
+					<?$value = ''; ?>
 				<? endforeach ?>
 				<? endif ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 
 
 
@@ -253,7 +253,7 @@ 
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
 							<?$static = false; ?>
-							<?include(__DIR__ . '/brick.php')?>
+							<?include(__DIR__.'/brick.php')?>
 						</li>
 					<? endforeach ?>
 				<? endif ?>