jenskooij / cloudcontrol

cloudcontrol/library/cc/cc.php

Spacing +4 added lines, -4 removed lines

@@ -37,13 +37,13 @@ 
 {
 	$debug_backtrace = current(debug_backtrace());
 	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
 		foreach (func_get_args() as $data) {
 			var_dump($data);
 		}
 	} else {
 		ob_clean();
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
 		echo '<pre>';
 		foreach (func_get_args() as $data) {
 			echo "<code>";
@@ -91,8 +91,8 @@ 
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
+	array_walk_recursive($array, function(&$item) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
 			$item = utf8_encode($item);
 		}
 	});

cloudcontrol/library/cc/StringUtil.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 	public static function slugify($str, $replace = array(), $delimiter = '-')
 	{
 		if (!empty($replace)) {
-			$str = str_replace((array)$replace, ' ', $str);
+			$str = str_replace((array) $replace, ' ', $str);
 		}
 
 		$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
@@ -79,13 +79,13 @@ 
 	public static function humanFileSize($size, $unit = "")
 	{
 		if ((!$unit && $size >= 1 << 30) || $unit == "GB")
-			return number_format($size / (1 << 30), 2) . "GB";
+			return number_format($size / (1 << 30), 2)."GB";
 		if ((!$unit && $size >= 1 << 20) || $unit == "MB")
-			return number_format($size / (1 << 20), 2) . "MB";
+			return number_format($size / (1 << 20), 2)."MB";
 		if ((!$unit && $size >= 1 << 10) || $unit == "KB")
-			return number_format($size / (1 << 10), 2) . "KB";
+			return number_format($size / (1 << 10), 2)."KB";
 
-		return number_format($size) . " bytes";
+		return number_format($size)." bytes";
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 			if ($d >= 1) {
 				$r = round($d);
 
-				return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+				return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago';
 			}
 		}
 

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

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

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

Spacing +11 added lines, -11 removed lines

@@ -40,7 +40,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;
@@ -81,7 +81,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));
@@ -89,7 +89,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);
 		}
@@ -106,7 +106,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'));
@@ -143,7 +143,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;
 	}
 
@@ -157,7 +157,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;
 		}
 	}
@@ -176,11 +176,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;
 		}
 
@@ -195,7 +195,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;
 	}
 
@@ -206,7 +206,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;
 	}
 
@@ -217,7 +217,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;
 	}
 }
\ No newline at end of file