jenskooij / cloudcontrol

cloudcontrol/library/cc/Request.php

Spacing +4 added lines, -4 removed lines

@@ -47,21 +47,21 @@
 		{
 			global $rootPath;
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$subfolders = str_replace('//', '/', self::$subfolders);
 			if (PHP_SAPI === 'cli') {
 				global $argv;
 				array_shift($argv);
 				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
+				self::$requestUri = self::$subfolders.implode('/', $argv);
 			} else {
 				self::$requestUri = $_SERVER['REQUEST_URI'];
 				self::$queryString = $_SERVER['QUERY_STRING'];
 			}
 			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
 			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			}
 
 			self::$requestParameters = explode('/', self::$relativeUri);

cloudcontrol/library/components/LanguageComponent.php

Spacing +2 added lines, -2 removed lines

@@ -99,9 +99,9 @@
         $this->sessionValues = $_SESSION['LanguageComponent'];
 
         if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
+            if (substr($request::$relativeUri, 0, 2) !== $lang) {
                 if ($lang !== $this->defaultLanguage) {
-                    header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+                    header('Location: '.$request::$subfolders.$lang.'/'.$request::$relativeUri);
                     exit;
                 }
             }

cloudcontrol/library/components/FormComponent.php

Spacing +3 added lines, -3 removed lines

@@ -162,7 +162,7 @@ 
 		if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		} else {
-			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
 			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		}
@@ -190,7 +190,7 @@ 
 		$postValues = $request::$post;
 		$postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
 		$postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
-		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+		$postValues['title'] = date('r').' - From: '.$request::$requestUri;
 
 		return $postValues;
 	}
@@ -325,7 +325,7 @@ 
 	private function setFormParameter($form)
 	{
 		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+			$this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage;
 		} else {
 			$this->parameters[$this->formParameterName] = $form;
 		}

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