jenskooij / cloudcontrol

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);

Doc Comments +9 added lines, -9 removed lines

@@ -76,7 +76,7 @@ 
 		 * @param string $imagePath
 		 * @param bool   $getExtension
 		 *
-		 * @return bool|int|string
+		 * @return integer
 		 */
 		public function getImageMimeType($imagePath, $getExtension = false)
 		{
@@ -149,7 +149,7 @@ 
 		}
 
 		/**
-		 * @param $pathToBitmapFile
+		 * @param string $pathToBitmapFile
 		 *
 		 * @return string
 		 */
@@ -165,7 +165,7 @@ 
 		}
 
 		/**
-		 * @param $header
+		 * @param string $header
 		 *
 		 * @return array
 		 */
@@ -195,14 +195,14 @@ 
 		 * Loop through the data in the body of the bitmap
 		 * file and calculate each individual pixel based on the
 		 * bytes
-		 * @param $bodySize
-		 * @param $x
+		 * @param integer $bodySize
+		 * @param integer $x
 		 * @param $width
-		 * @param $usePadding
-		 * @param $y
+		 * @param boolean $usePadding
+		 * @param integer $y
 		 * @param $height
-		 * @param $body
-		 * @param $image
+		 * @param string $body
+		 * @param resource $image
 		 */
 		private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
 		{

cloudcontrol/library/cc/Application.php

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
 		 */
 		private function config()
 		{
-			$configPath = __DIR__ . '/../../config.json';
+			$configPath = __DIR__.'/../../config.json';
 			if (realpath($configPath) !== false) {
 				$json = file_get_contents($configPath);
 				$this->config = json_decode($json);
@@ -90,7 +90,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap()->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -153,17 +153,17 @@ 
 		 * @return mixed
 		 * @throws \Exception
 		 */
-		private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem)
+		private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
 		{
-			$libraryComponentName = '\\library\\components\\' . $class;
-			$userComponentName = '\\components\\' . $class;
+			$libraryComponentName = '\\library\\components\\'.$class;
+			$userComponentName = '\\components\\'.$class;
 
 			if (AutoloadUtil::autoLoad($libraryComponentName, false)) {
 				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} elseif (AutoloadUtil::autoLoad($userComponentName, false)) {
 				$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} else {
-				throw new \Exception('Could not load component ' . $class);
+				throw new \Exception('Could not load component '.$class);
 			}
 			
 			if (!$component instanceof Component) {
@@ -222,7 +222,7 @@ 
 		public function setCachingHeaders()
 		{
 			header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-			header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+			header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
 		}
 
 		/**

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;
 	}
 

Indentation +15 added lines, -15 removed lines

@@ -13,26 +13,26 @@
 class ImagesRouting implements CmsRouting
 {
 
-    /**
-     * ImagesRouting constructor.
-     * @param \library\cc\Request $request
-     * @param mixed|string $relativeCmsUri
-     * @param CmsComponent $cmsComponent
-     */
-    public function __construct($request, $relativeCmsUri, $cmsComponent)
-    {
-        if ($relativeCmsUri == '/images') {
+	/**
+	 * ImagesRouting constructor.
+	 * @param \library\cc\Request $request
+	 * @param mixed|string $relativeCmsUri
+	 * @param CmsComponent $cmsComponent
+	 */
+	public function __construct($request, $relativeCmsUri, $cmsComponent)
+	{
+		if ($relativeCmsUri == '/images') {
 			$this->overviewRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/images.json') {
+		} elseif ($relativeCmsUri == '/images.json') {
 			$this->jsonRoute($cmsComponent);
-        } elseif ($relativeCmsUri == '/images/new') {
+		} elseif ($relativeCmsUri == '/images/new') {
 			$this->newRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+		} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
 			$this->deleteRoute($request, $cmsComponent);
-        } elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+		} elseif ($relativeCmsUri == '/images/show' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
 			$this->showRoute($request, $cmsComponent);
-        }
-    }
+		}
+	}
 
 	/**
 	 * @param CmsComponent $cmsComponent

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

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function newRoute($request, $cmsComponent)
@@ -83,7 +83,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function deleteRoute($request, $cmsComponent)

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;
 	}
 

cloudcontrol/library/storage/storage/FilesStorage.php

Spacing +5 added lines, -5 removed lines

@@ -25,13 +25,13 @@ 
 	 */
 	public function addFile($postValues)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/files/');
+		$destinationPath = realpath(__DIR__.'/../../../www/files/');
 
 		$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)) {
@@ -73,8 +73,8 @@ 
 	 */
 	public function deleteFileByName($filename)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/files/');
-		$destination = $destinationPath . '/' . $filename;
+		$destinationPath = realpath(__DIR__.'/../../../www/files/');
+		$destination = $destinationPath.'/'.$filename;
 
 		if (file_exists($destination)) {
 			$files = $this->getFiles();

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

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_USERNAME])) {
 			$cmsComponent->storage->getUsers()->addUser($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 			exit;
 		}
 	}
@@ -68,7 +68,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getUsers()->deleteUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 		exit;
 	}
 
@@ -83,7 +83,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_USER, $cmsComponent->storage->getUsers()->getUserBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]));
 		if (isset($_POST[CmsComponent::POST_PARAMETER_USERNAME])) {
 			$cmsComponent->storage->getUsers()->saveUser($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/users');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/users');
 			exit;
 		}
 	}

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

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getBricks()->addBrick($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 			exit;
 		}
 	}
@@ -71,7 +71,7 @@ 
 		$brick = $cmsComponent->storage->getBricks()->getBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getBricks()->saveBrick($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_BRICK, $brick);
@@ -84,7 +84,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getBricks()->deleteBrickBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/bricks');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/bricks');
 		exit;
 	}
 }
\ No newline at end of file