jenskooij / cloudcontrol

src/storage/Document.php

Spacing +2 added lines, -2 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();
@@ -97,7 +97,7 @@ 
 	 */
 	public function __toString()
 	{
-		return 'Document:' . $this->title;
+		return 'Document:'.$this->title;
 	}
 
 

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

src/storage/storage/ImagesStorage.php

Spacing +4 added lines, -4 removed lines

@@ -45,10 +45,10 @@ 
         $destinationPath = $this->getDestinationPath();
 
         $filename = $this->validateFilename($postValues['name'], $destinationPath);
-        $destination = $destinationPath . DIRECTORY_SEPARATOR . $filename;
+        $destination = $destinationPath.DIRECTORY_SEPARATOR.$filename;
 
         if ($postValues['error'] != '0') {
-            throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+            throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
         }
 
         if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -80,7 +80,7 @@ 
         foreach ($images as $key => $image) {
             if ($image->file == $filename) {
                 foreach ($image->set as $imageSetFilename) {
-                    $destination = $destinationPath . '/' . $imageSetFilename;
+                    $destination = $destinationPath.'/'.$imageSetFilename;
                     if (file_exists($destination)) {
                         unlink($destination);
                     } else {
@@ -128,7 +128,7 @@ 
      */
     private function getDestinationPath()
     {
-        $destinationPath = realpath($this->imagesDir . DIRECTORY_SEPARATOR);
+        $destinationPath = realpath($this->imagesDir.DIRECTORY_SEPARATOR);
         return $destinationPath;
     }
 }
\ No newline at end of file

src/storage/storage/AbstractStorage.php

Spacing +3 added lines, -3 removed lines

@@ -38,19 +38,19 @@
 			array_pop($fileParts);
 			$fileNameWithoutExtension = implode('-', $fileParts);
 			$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-			$filename = $fileNameWithoutExtension . '.' . $extension;
+			$filename = $fileNameWithoutExtension.'.'.$extension;
 		} else {
 			$filename = StringUtil::slugify($filename);
 		}
 
-		if (file_exists($path . '/' . $filename)) {
+		if (file_exists($path.'/'.$filename)) {
 			$fileParts = explode('.', $filename);
 			if (count($fileParts) > 1) {
 				$extension = end($fileParts);
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension .= '-copy';
-				$filename = $fileNameWithoutExtension . '.' . $extension;
+				$filename = $fileNameWithoutExtension.'.'.$extension;
 			} else {
 				$filename .= '-copy';
 			}

src/storage/storage/FilesStorage.php

Spacing +4 added lines, -4 removed lines

@@ -37,10 +37,10 @@ 
 		$destinationPath = $this->getDestinationPath();
 
 		$filename = $this->validateFilename($postValues['name'], $destinationPath);
-		$destination = $destinationPath . '/' . $filename;
+		$destination = $destinationPath.'/'.$filename;
 
 		if ($postValues['error'] != '0') {
-			throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+			throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 		}
 
 		if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -83,7 +83,7 @@ 
 	public function deleteFileByName($filename)
 	{
 		$destinationPath = $this->getDestinationPath();
-		$destination = $destinationPath . '/' . $filename;
+		$destination = $destinationPath.'/'.$filename;
 
 		if (file_exists($destination)) {
 			$files = $this->getFiles();
@@ -113,7 +113,7 @@ 
 
     protected function getDestinationPath()
     {
-        $destinationPath = realpath($this->filesDir . DIRECTORY_SEPARATOR);
+        $destinationPath = realpath($this->filesDir.DIRECTORY_SEPARATOR);
         return $destinationPath;
     }
 }
\ No newline at end of file

src/components/BaseComponent.php

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,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;
@@ -66,7 +66,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -92,13 +92,13 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
 		    $templateDir = $this->getTemplateDir($template, $application);
 		    if ($application !== null) {
                 $rootDir = $application->getRootDir();
                 if (strpos($templateDir, $rootDir) === false) {
-                    $templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
+                    $templatePath = $rootDir.DIRECTORY_SEPARATOR.$templateDir;
                 } else {
                     $templatePath = $templateDir;
                 }
@@ -121,7 +121,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);
 				}
 			}
 		}
@@ -136,7 +136,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) {
@@ -156,13 +156,13 @@ 
          * @param null | Application $application
          * @return string
          */
-        protected function getTemplateDir($template, $application=null)
+        protected function getTemplateDir($template, $application = null)
         {
             $templatePath = '';
             if ($application !== null) {
                 $templatePath = $application->getTemplateDir();
             }
-            $templatePath = $templatePath . $template . '.php';
+            $templatePath = $templatePath.$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 getTemplateDir($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/components/cms/FilesRouting.php

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@ 
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
 		$path = realpath($cmsComponent->storage->getFiles()->getFilesDir());
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-		$size = filesize($path . '/' . $file->file);
+		$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;
 	}
 
@@ -77,7 +77,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;
 		}
 	}
@@ -89,7 +89,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/util/functions.php

Spacing +11 added lines, -11 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>";
@@ -55,9 +55,9 @@ 
 {
     if (!isset($_GET['unsanitized'])) {
         $search = array(
-            '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-            '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-            '/(\s)+/s',         // shorten multiple whitespace sequences
+            '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+            '/[^\S ]+\</s', // strip whitespaces before tags, except space
+            '/(\s)+/s', // shorten multiple whitespace sequences
             '/<!--(.|\s)*?-->/' // Remove HTML comments
         );
 
@@ -85,7 +85,7 @@ 
  */
 function utf8Convert($array)
 {
-    array_walk_recursive($array, function (&$item) {
+    array_walk_recursive($array, function(&$item) {
         if (!mb_detect_encoding($item, 'utf-8', true)) {
             $item = utf8_encode($item);
         }
@@ -105,8 +105,8 @@ 
 function getRelativePath($from, $to)
 {
     // some compatibility fixes for Windows paths
-    $from = is_dir($from) ? rtrim($from, '\/') . DIRECTORY_SEPARATOR : $from;
-    $to = is_dir($to) ? rtrim($to, '\/') . DIRECTORY_SEPARATOR : $to;
+    $from = is_dir($from) ? rtrim($from, '\/').DIRECTORY_SEPARATOR : $from;
+    $to = is_dir($to) ? rtrim($to, '\/').DIRECTORY_SEPARATOR : $to;
     $from = str_replace('\\', DIRECTORY_SEPARATOR, $from);
     $to = str_replace('\\', DIRECTORY_SEPARATOR, $to);
 
@@ -128,13 +128,13 @@ 
                 $relPath = array_pad($relPath, $padLength, '..');
                 break;
             } else {
-                $relPath[0] = '.' . DIRECTORY_SEPARATOR . $relPath[0];
+                $relPath[0] = '.'.DIRECTORY_SEPARATOR.$relPath[0];
             }
         }
     }
     $relPath = implode(DIRECTORY_SEPARATOR, $relPath);
-    while (strpos($relPath, '.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR) !== false) {
-        $relPath = str_replace('.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR, '.' . DIRECTORY_SEPARATOR, $relPath);
+    while (strpos($relPath, '.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR) !== false) {
+        $relPath = str_replace('.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR, '.'.DIRECTORY_SEPARATOR, $relPath);
     }
     return $relPath;
 }
\ No newline at end of file