jenskooij / cloudcontrol

cloudcontrol/library/components/CmsComponent.php

Spacing +3 added lines, -3 removed lines

@@ -159,7 +159,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');
 				}
 			}
 		}
@@ -175,7 +175,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');
 				}
 			}
 		}
@@ -219,7 +219,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;
 			}
 		}

cloudcontrol/library/search/indexer/TermFieldLengthNorm.php

Spacing +6 added lines, -6 removed lines

@@ -45,18 +45,18 @@ 
 		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>');
 		}
 		if (($stmt->execute()) === 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>');
 		}
 		$uniqueFieldsPerDocument = $stmt->fetchAll(\PDO::FETCH_OBJ);
 		$values = array();
 		$i = 0;
 		foreach ($uniqueFieldsPerDocument as $fieldRow) {
-			$values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt(' . intval($fieldRow->termCount) . ') WHERE documentPath = ' . $db->quote($fieldRow->documentPath) . ' AND field = ' . $db->quote($fieldRow->field) . ';';
+			$values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt('.intval($fieldRow->termCount).') WHERE documentPath = '.$db->quote($fieldRow->documentPath).' AND field = '.$db->quote($fieldRow->field).';';
 			$i += 1;
 			if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
 				$this->executeUpdateTermNorm($values, $db);
@@ -76,13 +76,13 @@ 
 	 */
 	private function executeUpdateTermNorm($values, $db)
 	{
-		$sql  = 'BEGIN TRANSACTION;' . PHP_EOL;
-		$sql .= implode(PHP_EOL, $values) . PHP_EOL;
+		$sql  = 'BEGIN TRANSACTION;'.PHP_EOL;
+		$sql .= implode(PHP_EOL, $values).PHP_EOL;
 		$sql .= 'COMMIT;';
 		if (($db->exec($sql)) === 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>');
 		}
 	}
 }
\ No newline at end of file

cloudcontrol/library/search/indexer/InverseDocumentFrequency.php

Spacing +2 added lines, -2 removed lines

@@ -47,14 +47,14 @@
 		if (!$stmt = $db->prepare($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>');
 		}
 		$stmt->bindValue(':documentCount', $this->documentCount);
 		$result = $stmt->execute();
 		if ($result === 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>');
 		}
 	}
 }
\ No newline at end of file

cloudcontrol/library/search/indexer/TermFrequency.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 			$i = 0;
 			foreach ($termsForDocumentField as $term) {
 				$frequency = intval($term->count) / $documentField->totalTermCount;
-				$values[] = $quotedDocumentPath . ','  . $quotedField . ', ' . $db->quote($term->term) . ', ' . $db->quote($frequency);
+				$values[] = $quotedDocumentPath.','.$quotedField.', '.$db->quote($term->term).', '.$db->quote($frequency);
 				$i += 1;
 				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
 					$this->executeStore($sql, $values, $db);
@@ -101,11 +101,11 @@ 
 
 	private function executeStore($sql, $values, $db)
 	{
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
+		$sql .= '('.implode('),'.PHP_EOL.'(', $values).');';
 		if (!$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>');
 		}
 	}
 

cloudcontrol/library/search/CharacterFilter.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		$string = strip_tags($string);
 		$string = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $string); // Remove special alphanumeric characters
-		$string = str_replace(array('+', '=', '!', ',', '.',';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
+		$string = str_replace(array('+', '=', '!', ',', '.', ';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
 		$string = preg_replace("/[\r\n]+/", " ", $string); // Replace multiple newlines with a single space.
 		$string = preg_replace("/[\t]+/", " ", $string); // Replace multiple tabs with a single space.
 		$string = preg_replace("/[^a-zA-Z0-9 ]/", '', $string); // Filter out everything that is not alphanumeric or a space
@@ -64,7 +64,7 @@ 
 	{
 		$encoding = mb_detect_encoding($string, mb_detect_order(), false);
 
-		if($encoding == "UTF-8") {
+		if ($encoding == "UTF-8") {
 			$string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
 		}
 

cloudcontrol/library/search/SearchDbConnected.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 	protected function configureDatabase()
 	{
 		$db = $this->getSearchDbHandle();
-		$sqlPath = __DIR__ . DIRECTORY_SEPARATOR . '../cc/install/search.sql';
+		$sqlPath = __DIR__.DIRECTORY_SEPARATOR.'../cc/install/search.sql';
 		$searchSql = file_get_contents($sqlPath);
 		$db->exec($searchSql);
 	}
@@ -65,8 +65,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 . 'search.db');
+			$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.'search.db');
 		}
 		return $this->searchDbHandle;
 	}

cloudcontrol/library/search/filters/DutchStopWords.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
 
 class DutchStopWords extends StopWordsFilter
 {
-	protected $stopWords = array('aan','af','al','alles','als','altijd','andere','ben','bij','daar','dan','dat','de','der','deze','die','dit','doch','doen','door','doorgaans','dus','een','eens','en','er','ge','geen','geweest','haar','had','heb','hebben','heeft','hem','het','hier','hij','hoe','hun','iemand','iets','ik','in','is','ja','je','kan','kon','kunnen','maar','me','meer','men','met','mij','mijn','moet','na','naar','niet','niets','nog','nu','of','om','omdat','ons','ook','op','over','reeds','te','tegen','toch','toen','tot','u','uit','uw','van','veel','voor','want','waren','was','wat','we','wel','werd','wezen','wie','wij','wil','worden','zal','ze','zei','zelf','zich','zij','zijn','zo','zodat','zonder','zou');
+	protected $stopWords = array('aan', 'af', 'al', 'alles', 'als', 'altijd', 'andere', 'ben', 'bij', 'daar', 'dan', 'dat', 'de', 'der', 'deze', 'die', 'dit', 'doch', 'doen', 'door', 'doorgaans', 'dus', 'een', 'eens', 'en', 'er', 'ge', 'geen', 'geweest', 'haar', 'had', 'heb', 'hebben', 'heeft', 'hem', 'het', 'hier', 'hij', 'hoe', 'hun', 'iemand', 'iets', 'ik', 'in', 'is', 'ja', 'je', 'kan', 'kon', 'kunnen', 'maar', 'me', 'meer', 'men', 'met', 'mij', 'mijn', 'moet', 'na', 'naar', 'niet', 'niets', 'nog', 'nu', 'of', 'om', 'omdat', 'ons', 'ook', 'op', 'over', 'reeds', 'te', 'tegen', 'toch', 'toen', 'tot', 'u', 'uit', 'uw', 'van', 'veel', 'voor', 'want', 'waren', 'was', 'wat', 'we', 'wel', 'werd', 'wezen', 'wie', 'wij', 'wil', 'worden', 'zal', 'ze', 'zei', 'zelf', 'zich', 'zij', 'zijn', 'zo', 'zodat', 'zonder', 'zou');
 }
\ No newline at end of file

cloudcontrol/library/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 = '\library\search\filters\\' . $filterName;
+			$filterClassName = '\library\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, '\library\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, '\library\search\results\SearchSuggestion');
 			$allResults = array_merge($result, $allResults);

cloudcontrol/library/cc/AutoloadUtil.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 		}
 
 		global $rootPath;
-		$file = $rootPath . str_replace('\\', '/', $class) . ".php";
+		$file = $rootPath.str_replace('\\', '/', $class).".php";
 
 		if (file_exists($file)) {
 			return self::loadClassInExistingFile($class, $throwException, $file);
@@ -60,7 +60,7 @@ 
 		require_once($file);
 		if ($throwException) {
 			if (class_exists($class, false) === false && interface_exists($class, false) === false) {
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file);
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file);
 			} else {
 				return true;
 			}
@@ -81,7 +81,7 @@ 
 	private static function handleUnloadableClassWithBacktrace($class, $throwException, $rootPath, $file, $debug_backtrace)
 	{
 		if ($throwException) {
-			errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
+			errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
 		} else {
 			return false;
 		}
@@ -98,7 +98,7 @@ 
 	private static function handleUnloadableClassWithoutBacktrace($class, $throwException, $file)
 	{
 		if ($throwException) {
-			throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.');
+			throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.');
 		} else {
 			return false;
 		}