jenskooij / cloudcontrol

cloudcontrol/library/cc/autoloader.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'AutoloadUtil.php');
+require_once(__DIR__.DIRECTORY_SEPARATOR.'AutoloadUtil.php');
 spl_autoload_extensions('.php');
 spl_autoload_register("autoloader");
 
-$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 
 /**
  * The function to be registered as the default autoload function

cloudcontrol/library/cc/errorhandler.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'ErrorHandlingUtil.php');
+require_once(__DIR__.DIRECTORY_SEPARATOR.'ErrorHandlingUtil.php');
 set_exception_handler('exceptionHandler');
 set_error_handler('errorHandler');
 register_shutdown_function('shutdownHandler');
@@ -10,8 +10,8 @@ 
  *
  * @param $e
  */
-function exceptionHandler ($e) {
-	\library\cc\ErrorHandlingUtil::renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
+function exceptionHandler($e) {
+	\library\cc\ErrorHandlingUtil::renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
 }
 
 /**
@@ -22,18 +22,18 @@ 
  * @param $errfile
  * @param $errline
  */
-function errorHandler ($errno, $errstr, $errfile, $errline) {
-	\library\cc\ErrorHandlingUtil::renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
+function errorHandler($errno, $errstr, $errfile, $errline) {
+	\library\cc\ErrorHandlingUtil::renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
 }
 
 /**
  * When an error occurs that kills the process, still try
  * to show it using a shutdownHandler.
  */
-function shutdownHandler () {
+function shutdownHandler() {
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-		\library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']);
+		\library\cc\ErrorHandlingUtil::renderError($error['message'], $error['file'], $error['line'], $error['type']);
     }elseif ($error['type'] == 1) {
         dump($error);
     }

cloudcontrol/library/components/BaseComponent.php

Spacing +6 added lines, -6 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,9 +92,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
-			$templatePath = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+			$templatePath = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -111,7 +111,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);
 				}
 			}
 		}
@@ -126,7 +126,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) {

cloudcontrol/library/cc/ErrorHandlingUtil.php

Spacing +11 added lines, -11 removed lines

@@ -75,7 +75,7 @@ 
 	private static function renderCliException($message, $file, $line, $trace, $lines)
 	{
 		if (ob_get_contents()) ob_end_clean();
-		include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php');
+		include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcli.php');
 		exit;
 	}
 
@@ -87,12 +87,12 @@ 
 	 */
 	private static function dontShowError($message, $file, $line, $httpHeader)
 	{
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-		header('X-Error-Message: ' . $message);
-		header('X-Error-File: ' . $file);
-		header('X-Error-Line: ' . $line);
-		if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php')) {
-			include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php');
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+		header('X-Error-Message: '.$message);
+		header('X-Error-File: '.$file);
+		header('X-Error-Line: '.$line);
+		if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php')) {
+			include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php');
 		} else {
 			header('Content-type: application/json');
 			die(json_encode('An error occured.'));
@@ -160,11 +160,11 @@ 
 			'httpHeader' => $httpHeader,
 		);
 
-		if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php')) {
-			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-			include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php');
+		if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php')) {
+			header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+			include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php');
 		} else {
-			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+			header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
 			header('Content-type: application/json');
 			die(json_encode($error));
 		}

cloudcontrol/library/images/Image.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 			} elseif (is_string($imageContainer)) {
 				$this->_imageResource = imagecreatefromstring($imageContainer);
 			} else {
-				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>' . var_export($imageContainer, true) . '</pre>');
+				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>'.var_export($imageContainer, true).'</pre>');
 			}
 		}
 
@@ -179,9 +179,9 @@ 
 				//    Cut it in parts of 2 bytes
 				$header_parts = str_split($header, 2);
 				//    Get the width        4 bytes
-				$width = hexdec($header_parts[19] . $header_parts[18]);
+				$width = hexdec($header_parts[19].$header_parts[18]);
 				//    Get the height        4 bytes
-				$height = hexdec($header_parts[23] . $header_parts[22]);
+				$height = hexdec($header_parts[23].$header_parts[22]);
 				//    Unset the header params
 				unset($header_parts);
 
@@ -226,9 +226,9 @@ 
 				}
 				//    Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body
 				$iPos = $i * 2;
-				$r = hexdec($body[$iPos + 4] . $body[$iPos + 5]);
-				$g = hexdec($body[$iPos + 2] . $body[$iPos + 3]);
-				$b = hexdec($body[$iPos] . $body[$iPos + 1]);
+				$r = hexdec($body[$iPos + 4].$body[$iPos + 5]);
+				$g = hexdec($body[$iPos + 2].$body[$iPos + 3]);
+				$b = hexdec($body[$iPos].$body[$iPos + 1]);
 				//    Calculate and draw the pixel
 				$color = imagecolorallocate($image, $r, $g, $b);
 				imagesetpixel($image, $x, $height - $y, $color);

cloudcontrol/library/components/cms/ImagesRouting.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_IMAGES);
 		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
 			$cmsComponent->storage->getImages()->addImage($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images');
 			exit;
 		}
 	}
@@ -76,7 +76,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getImages()->deleteImageByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/images');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/images');
 		exit;
 	}
 

cloudcontrol/library/components/cms/configuration/ImageSetRouting.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 		$imageSet = $cmsComponent->storage->getImageSet()->getImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getImageSet()->saveImageSet($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_IMAGE_SET, $imageSet);
@@ -72,7 +72,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getImageSet()->addImageSet($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 			exit;
 		}
 	}
@@ -84,7 +84,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getImageSet()->deleteImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 		exit;
 	}
 }
\ No newline at end of file

cloudcontrol/library/storage/storage/ImagesStorage.php

Spacing +5 added lines, -5 removed lines

@@ -33,13 +33,13 @@ 
 	 */
 	public function addImage($postValues)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/images/');
+		$destinationPath = realpath(__DIR__.'/../../../www/images/');
 
 		$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)) {
@@ -64,14 +64,14 @@ 
 	 */
 	public function deleteImageByName($filename)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/images/');
+		$destinationPath = realpath(__DIR__.'/../../../www/images/');
 
 		$images = $this->getImages();
 
 		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 {

cloudcontrol/library/components/cms/FilesRouting.php

Spacing +9 added lines, -9 removed lines

@@ -39,21 +39,21 @@ 
 	private function downloadRoute($slug, $cmsComponent)
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
-		$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;
 	}
 
@@ -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;
 	}