jenskooij / cloudcontrol

src/templates/cms.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
     </main>
     <script>
       var subfolders = '<?=$request::$subfolders?>',
-        cmsSubfolders = '<?=$request::$subfolders . $cmsPrefix?>';
+        cmsSubfolders = '<?=$request::$subfolders.$cmsPrefix?>';
     </script>
     <script src="<?= $request::$subfolders ?>js/cms.js"></script>
   </body>

src/templates/documents.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 <? include('documents/function.renderFolder.php'); ?>
 <script>window.onload = function () {
     History.init();
-    History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');
+    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>

src/CloudControl.php

Spacing +13 added lines, -13 removed lines

@@ -36,9 +36,9 @@ 
         $event->getIO()->write("*** Checking installation of Cloud Control framework ***");
 
         $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+        $rootDir = realpath($vendorDir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR);
 
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+        $baseConfigTargetPath = $rootDir.DIRECTORY_SEPARATOR.'config.json';
         $configObject = self::getConfig($baseConfigTargetPath);
 
         $configObject->{'vendorDir'} = realpath($vendorDir);
@@ -53,8 +53,8 @@ 
 
         // TODO Fie FilesStorage to use filesDir from config, similar to ImagesStorage
 
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+        $baseStorageDefaultPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.json';
+        $baseStorageSqlPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.sql';
 
         self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
         self::saveConfig($event, $baseConfigTargetPath, $configObject);
@@ -81,23 +81,23 @@ 
     private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
     {
         file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("Saved config to: " . $baseConfigTargetPath);
+        $event->getIO()->write("Saved config to: ".$baseConfigTargetPath);
     }
 
     private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
     {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+        $sourceFilePath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_'.$sourceFileName);
 
         if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
             if ($destinationFileName !== null) {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName);
+                copy($sourceFilePath, realpath($destinationPath).DIRECTORY_SEPARATOR.$destinationFileName);
             } else {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $sourceFileName);
+                copy($sourceFilePath, realpath($destinationPath).DIRECTORY_SEPARATOR.$sourceFileName);
             }
 
-            $event->getIO()->write("Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("Copied file: ".$sourceFileName.' to '.$destinationPath);
         } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("[ERROR] Couldnt copy file: ".$sourceFileName.' to '.$destinationPath);
         }
     }
 
@@ -114,10 +114,10 @@ 
 
     private static function createDir(Event $event, $rootDir, $dirName)
     {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+        $dir = $rootDir.DIRECTORY_SEPARATOR.$dirName.DIRECTORY_SEPARATOR;
         if (!is_dir($dir)) {
             mkdir($dir);
-            $event->getIO()->write("Created dir: " . $dir);
+            $event->getIO()->write("Created dir: ".$dir);
         }
         return realpath($dir);
     }
@@ -128,7 +128,7 @@ 
      */
     private static function getConfig($configTargetPath)
     {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_config.json');
+        $baseConfigDefaultPath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_config.json');
 
         if (file_exists($configTargetPath)) {
             $config = json_decode(file_get_contents($configTargetPath));

src/util/functions.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 {
 	$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);
 		}
@@ -29,7 +29,7 @@ 
 <body>
 END;
 
-		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>";
@@ -53,8 +53,8 @@ 
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
+	array_walk_recursive($array, function(&$item) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
 			$item = utf8_encode($item);
 		}
 	});

src/components/cms/FilesRouting.php

Spacing +9 added lines, -9 removed lines

@@ -40,21 +40,21 @@ 
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
 		// TODO FIX THIS PATH
-		$path = realpath(__DIR__ . '/../www/files/');
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-		$size = filesize($path . '/' . $file->file);
+		$path = realpath(__DIR__.'/../www/files/');
+		$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+		$size = filesize($path.'/'.$file->file);
 
 		header('Content-Description: File Transfer');
-		header('Content-Type: ' . $file->type);
-		header('Content-Disposition: attachment; filename=' . $quoted);
+		header('Content-Type: '.$file->type);
+		header('Content-Disposition: attachment; filename='.$quoted);
 		header('Content-Transfer-Encoding: binary');
 		header('Connection: Keep-Alive');
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Pragma: public');
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 
-		readfile($path . '/' . $file->file);
+		readfile($path.'/'.$file->file);
 		exit;
 	}
 
@@ -78,7 +78,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
 		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
 			$cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 			exit;
 		}
 	}
@@ -90,7 +90,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 		exit;
 	}
 

src/components/BaseComponent.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -65,7 +65,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -91,7 +91,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
 		    $templatePath = $this->getTemplatePath($template, $application);
 			if (realpath($templatePath) !== false) {
@@ -110,7 +110,7 @@ 
 				return ob_get_contents();
 			} else {
 				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
+					throw new \Exception('Couldnt find template '.$templatePath);
 				}
 			}
 		}
@@ -125,7 +125,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {
@@ -145,10 +145,10 @@ 
          * @param null $application
          * @return string
          */
-        protected function getTemplatePath($template, $application=null)
+        protected function getTemplatePath($template, $application = null)
         {
             $templatePath = $application->getTemplatePath();
-            $templatePath = $templatePath . DIRECTORY_SEPARATOR . $template . '.php';
+            $templatePath = $templatePath.DIRECTORY_SEPARATOR.$template.'.php';
             return $templatePath;
         }
     }

src/components/CmsComponent.php

Spacing +4 added lines, -4 removed lines

@@ -170,7 +170,7 @@ 
 				$whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -186,7 +186,7 @@ 
 				$blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}
@@ -230,7 +230,7 @@ 
 			if ($relativeCmsUri == '/log-off') {
 				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
 				unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+				header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
 				exit;
 			}
 		}
@@ -371,7 +371,7 @@ 
 
         protected function getTemplatePath($template, $application = null)
         {
-            return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+            return __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php';
         }
     }
 }
\ No newline at end of file

src/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 = '\CloudControl\Cms\search\filters\\' . $filterName;
+			$filterClassName = '\CloudControl\Cms\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,12 +90,12 @@ 
 	 */
 	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>');
 		}
 	}
 

src/search/Search.php

Spacing +12 added lines, -12 removed lines

@@ -79,13 +79,13 @@ 
 		if (!$stmt = $db->query($sql)) {
 			$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>');
 		}
 		$result = $stmt->fetch(\PDO::FETCH_COLUMN);
 		if (false === $result) {
 			$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 intval($result);
 	}
@@ -118,7 +118,7 @@ 
 	protected function applyFilters($tokens)
 	{
 		foreach ($this->filters as $filterName) {
-			$filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
+			$filterClassName = '\CloudControl\Cms\search\filters\\'.$filterName;
 			$filter = new $filterClassName($tokens);
 			$tokens = $filter->getFilterResults();
 		}
@@ -154,13 +154,13 @@ 
 		  GROUP BY term_frequency.documentPath, term_frequency.term
 		  ORDER BY score DESC
 		';
-		if(!$stmt = $db->prepare($sql)) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+		if (!$stmt = $db->prepare($sql)) {
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		$stmt->bindValue(':query', $token);
 		$stmt->bindValue(':queryNorm', $queryNorm);
 		if (!$stmt->execute()) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchResult');
 	}
@@ -216,13 +216,13 @@ 
 		$sql = '
 			SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm
 			  FROM inverse_document_frequency
-			 WHERE term IN (' . $terms . ') 
+			 WHERE term IN (' . $terms.') 
 		';
-		if(!$stmt = $db->prepare($sql)) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+		if (!$stmt = $db->prepare($sql)) {
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		if (!$stmt->execute()) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		$result = $stmt->fetch(\PDO::FETCH_OBJ);
 		return $result->queryNorm == null ? 1 : $result->queryNorm;
@@ -272,11 +272,11 @@ 
 			';
 			$stmt = $db->prepare($sql);
 			if ($stmt === false) {
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 			}
 			$stmt->bindValue(':token', $token);
 			if (($stmt === false) | (!$stmt->execute())) {
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 			}
 			$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchSuggestion');
 			$allResults = array_merge($result, $allResults);