jenskooij / cloudcontrol

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

Indentation +227 added lines, -227 removed lines

@@ -9,232 +9,232 @@
  */
 
 namespace CloudControl\Cms\images {
-	class Image
-	{
-		private $_imageResource;
-
-		/**
-		 * Load the a image resource into $this->_imageResource
-		 * automagically :-)
-		 *
-		 * @param    resource | string | path
-		 *
-		 * @throws    \Exception
-		 */
-		public function loadImage($imageContainer)
-		{
-			if (is_resource($imageContainer) && get_resource_type($imageContainer) === 'gd') {
-				$this->_imageResource = $imageContainer;
-			} elseif (is_string($imageContainer) && file_exists($imageContainer)) {
-				if ($this->getImageMimeType($imageContainer) == IMAGETYPE_BMP) {
-					$this->_imageResource = $this->createImageFromBmp($imageContainer);
-				} else {
-					$imageContent = file_get_contents($imageContainer);
-					$this->_imageResource = imagecreatefromstring($imageContent);
-				}
-			} 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>');
-			}
-		}
-
-		/**
-		 * Saves the image to a file
-		 *
-		 * @param string $path
-		 * @param int    $mimeTypeConstantValue
-		 * @param int    $quality
-		 * @param null   $imageResource If no resource is given, uses $this->_imageResource
-		 *
-		 * @return bool
-		 * @throws \Exception
-		 */
-		public function saveImage($path, $mimeTypeConstantValue, $quality = 100, $imageResource = null)
-		{
-			if ($imageResource == null) {
-				$imageResource = $this->getImageResource();
-			}
-
-			if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
-				return imagegif($imageResource, $path);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
-				return imagejpeg($imageResource, $path, $quality);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
-				return imagepng($imageResource, $path, (intval($quality / 10) - 1));
-			} else {
-				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
-			}
-		}
-
-		/**
-		 * Returns either the Mime-Type Constant value
-		 * or the default extension for the detected mime-type;
-		 *
-		 * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
-		 *
-		 * @param string $imagePath
-		 * @param bool   $getExtension
-		 *
-		 * @return bool|int|string
-		 */
-		public function getImageMimeType($imagePath, $getExtension = false)
-		{
-			if (function_exists('exif_imagetype')) {
-				$exif = exif_imagetype($imagePath);
-			} else {
-				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
-					$exif = $type;
-				} else {
-					$exif = false;
-				}
-			}
-
-			return $getExtension ? image_type_to_extension($exif) : $exif;
-		}
-
-		/**
-		 * Create Image resource from Bitmap
-		 *
-		 * @see       http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-		 * @author    alexander at alexauto dot nl
-		 *
-		 * @param    string $pathToBitmapFile
-		 *
-		 * @return  resource
-		 */
-		public function createImageFromBmp($pathToBitmapFile)
-		{
-			$bitmapFileData = $this->getBitmapFileData($pathToBitmapFile);
-
-			$temp = unpack("H*", $bitmapFileData);
-			$hex = $temp[1];
-			$header = substr($hex, 0, 108);
-			list($width, $height) = $this->calculateWidthAndHeight($header);
-
-			//    Define starting X and Y 
-			$x = 0;
-			$y = 1;
-
-			$image = imagecreatetruecolor($width, $height);
-
-			//    Grab the body from the image 
-			$body = substr($hex, 108);
-
-			//    Calculate if padding at the end-line is needed. Divided by two to keep overview. 1 byte = 2 HEX-chars
-			$bodySize = (strlen($body) / 2);
-			$headerSize = ($width * $height);
-
-			//    Use end-line padding? Only when needed 
-			$usePadding = ($bodySize > ($headerSize * 3) + 4);
-			$this->loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image);
-
-			unset($body);
-
-			return $image;
-		}
-
-		/**
-		 * Returns the image resource
-		 * @return resource
-		 * @throws \Exception
-		 */
-		final public function getImageResource()
-		{
-			if (is_resource($this->_imageResource) && get_resource_type($this->_imageResource) === 'gd') {
-				return $this->_imageResource;
-			} else {
-				throw new \Exception('Image resource is not set. Use $this->LoadImage to load an image into the resource');
-			}
-		}
-
-		/**
-		 * @param $pathToBitmapFile
-		 *
-		 * @return string
-		 */
-		private function getBitmapFileData($pathToBitmapFile)
-		{
-			$fileHandle = fopen($pathToBitmapFile, "rb");
-			$bitmapFileData = fread($fileHandle, 10);
-			while (!feof($fileHandle) && ($bitmapFileData <> "")) {
-				$bitmapFileData .= fread($fileHandle, 1024);
-			}
-
-			return $bitmapFileData;
-		}
-
-		/**
-		 * @param $header
-		 *
-		 * @return array
-		 */
-		private function calculateWidthAndHeight($header)
-		{
-			$width = null;
-			$height = null;
-
-			//    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-			if (substr($header, 0, 4) == "424d") {
-				//    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]);
-				//    Get the height        4 bytes
-				$height = hexdec($header_parts[23] . $header_parts[22]);
-				//    Unset the header params
-				unset($header_parts);
-
-				return array($width, $height);
-			}
-
-			return array($width, $height);
-		}
-
-		/**
-		 * 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 $width
-		 * @param $usePadding
-		 * @param $y
-		 * @param $height
-		 * @param $body
-		 * @param $image
-		 */
-		private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
-		{
+    class Image
+    {
+        private $_imageResource;
+
+        /**
+         * Load the a image resource into $this->_imageResource
+         * automagically :-)
+         *
+         * @param    resource | string | path
+         *
+         * @throws    \Exception
+         */
+        public function loadImage($imageContainer)
+        {
+            if (is_resource($imageContainer) && get_resource_type($imageContainer) === 'gd') {
+                $this->_imageResource = $imageContainer;
+            } elseif (is_string($imageContainer) && file_exists($imageContainer)) {
+                if ($this->getImageMimeType($imageContainer) == IMAGETYPE_BMP) {
+                    $this->_imageResource = $this->createImageFromBmp($imageContainer);
+                } else {
+                    $imageContent = file_get_contents($imageContainer);
+                    $this->_imageResource = imagecreatefromstring($imageContent);
+                }
+            } 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>');
+            }
+        }
+
+        /**
+         * Saves the image to a file
+         *
+         * @param string $path
+         * @param int    $mimeTypeConstantValue
+         * @param int    $quality
+         * @param null   $imageResource If no resource is given, uses $this->_imageResource
+         *
+         * @return bool
+         * @throws \Exception
+         */
+        public function saveImage($path, $mimeTypeConstantValue, $quality = 100, $imageResource = null)
+        {
+            if ($imageResource == null) {
+                $imageResource = $this->getImageResource();
+            }
+
+            if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
+                return imagegif($imageResource, $path);
+            } elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
+                return imagejpeg($imageResource, $path, $quality);
+            } elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
+                return imagepng($imageResource, $path, (intval($quality / 10) - 1));
+            } else {
+                throw new \Exception('Not a valid mimetypeconstant given see function documentation');
+            }
+        }
+
+        /**
+         * Returns either the Mime-Type Constant value
+         * or the default extension for the detected mime-type;
+         *
+         * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
+         *
+         * @param string $imagePath
+         * @param bool   $getExtension
+         *
+         * @return bool|int|string
+         */
+        public function getImageMimeType($imagePath, $getExtension = false)
+        {
+            if (function_exists('exif_imagetype')) {
+                $exif = exif_imagetype($imagePath);
+            } else {
+                if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
+                    $exif = $type;
+                } else {
+                    $exif = false;
+                }
+            }
+
+            return $getExtension ? image_type_to_extension($exif) : $exif;
+        }
+
+        /**
+         * Create Image resource from Bitmap
+         *
+         * @see       http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
+         * @author    alexander at alexauto dot nl
+         *
+         * @param    string $pathToBitmapFile
+         *
+         * @return  resource
+         */
+        public function createImageFromBmp($pathToBitmapFile)
+        {
+            $bitmapFileData = $this->getBitmapFileData($pathToBitmapFile);
+
+            $temp = unpack("H*", $bitmapFileData);
+            $hex = $temp[1];
+            $header = substr($hex, 0, 108);
+            list($width, $height) = $this->calculateWidthAndHeight($header);
+
+            //    Define starting X and Y 
+            $x = 0;
+            $y = 1;
+
+            $image = imagecreatetruecolor($width, $height);
+
+            //    Grab the body from the image 
+            $body = substr($hex, 108);
+
+            //    Calculate if padding at the end-line is needed. Divided by two to keep overview. 1 byte = 2 HEX-chars
+            $bodySize = (strlen($body) / 2);
+            $headerSize = ($width * $height);
+
+            //    Use end-line padding? Only when needed 
+            $usePadding = ($bodySize > ($headerSize * 3) + 4);
+            $this->loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image);
+
+            unset($body);
+
+            return $image;
+        }
+
+        /**
+         * Returns the image resource
+         * @return resource
+         * @throws \Exception
+         */
+        final public function getImageResource()
+        {
+            if (is_resource($this->_imageResource) && get_resource_type($this->_imageResource) === 'gd') {
+                return $this->_imageResource;
+            } else {
+                throw new \Exception('Image resource is not set. Use $this->LoadImage to load an image into the resource');
+            }
+        }
+
+        /**
+         * @param $pathToBitmapFile
+         *
+         * @return string
+         */
+        private function getBitmapFileData($pathToBitmapFile)
+        {
+            $fileHandle = fopen($pathToBitmapFile, "rb");
+            $bitmapFileData = fread($fileHandle, 10);
+            while (!feof($fileHandle) && ($bitmapFileData <> "")) {
+                $bitmapFileData .= fread($fileHandle, 1024);
+            }
+
+            return $bitmapFileData;
+        }
+
+        /**
+         * @param $header
+         *
+         * @return array
+         */
+        private function calculateWidthAndHeight($header)
+        {
+            $width = null;
+            $height = null;
+
+            //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
+            if (substr($header, 0, 4) == "424d") {
+                //    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]);
+                //    Get the height        4 bytes
+                $height = hexdec($header_parts[23] . $header_parts[22]);
+                //    Unset the header params
+                unset($header_parts);
+
+                return array($width, $height);
+            }
+
+            return array($width, $height);
+        }
+
+        /**
+         * 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 $width
+         * @param $usePadding
+         * @param $y
+         * @param $height
+         * @param $body
+         * @param $image
+         */
+        private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
+        {
 //    Using a for-loop with index-calculation instead of str_split to avoid large memory consumption
-			//    Calculate the next DWORD-position in the body
-			for ($i = 0; $i < $bodySize; $i += 3) {
-				//    Calculate line-ending and padding
-				if ($x >= $width) {
-					//    If padding needed, ignore image-padding. Shift i to the ending of the current 32-bit-block
-					if ($usePadding) {
-						$i += $width % 4;
-					}
-					//    Reset horizontal position
-					$x = 0;
-					//    Raise the height-position (bottom-up)
-					$y++;
-					//    Reached the image-height? Break the for-loop
-					if ($y > $height) {
-						break;
-					}
-				}
-				//    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]);
-				//    Calculate and draw the pixel
-				$color = imagecolorallocate($image, $r, $g, $b);
-				imagesetpixel($image, $x, $height - $y, $color);
-				//    Raise the horizontal position
-				$x++;
-			}
-		}
-	}
+            //    Calculate the next DWORD-position in the body
+            for ($i = 0; $i < $bodySize; $i += 3) {
+                //    Calculate line-ending and padding
+                if ($x >= $width) {
+                    //    If padding needed, ignore image-padding. Shift i to the ending of the current 32-bit-block
+                    if ($usePadding) {
+                        $i += $width % 4;
+                    }
+                    //    Reset horizontal position
+                    $x = 0;
+                    //    Raise the height-position (bottom-up)
+                    $y++;
+                    //    Reached the image-height? Break the for-loop
+                    if ($y > $height) {
+                        break;
+                    }
+                }
+                //    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]);
+                //    Calculate and draw the pixel
+                $color = imagecolorallocate($image, $r, $g, $b);
+                imagesetpixel($image, $x, $height - $y, $color);
+                //    Raise the horizontal position
+                $x++;
+            }
+        }
+    }
 }
\ No newline at end of file

src/images/methods/Resize.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 			
 			// Define the ratio and adjust the width and height
 			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+				$ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight);
 				$this->_width = $originalWidth * $ratio;
 				$this->_height = $originalHeight * $ratio;
 			}

Indentation +60 added lines, -60 removed lines

@@ -14,73 +14,73 @@
     use CloudControl\Cms\images\IMethod;
 
     class Resize extends IMethod
-	{
-		protected $_width;
-		protected $_height;
-		protected $_preserveAspectRatio = true;
+    {
+        protected $_width;
+        protected $_height;
+        protected $_preserveAspectRatio = true;
 		
-		/**
-		 * Set the width
-		 *
-		 * @param  int $width
-		 * @return self
-		 */
-		public function SetWidth($width)
-		{
-			$this->_width = intval($width);
-			return $this;
-		}
+        /**
+         * Set the width
+         *
+         * @param  int $width
+         * @return self
+         */
+        public function SetWidth($width)
+        {
+            $this->_width = intval($width);
+            return $this;
+        }
 		
-		/**
-		 * Set the height
-		 *
-		 * @param  int $height
-		 * @return self
-		 */
-		public function SetHeight($height)
-		{
-			$this->_height = intval($height);
-			return $this;
-		}
+        /**
+         * Set the height
+         *
+         * @param  int $height
+         * @return self
+         */
+        public function SetHeight($height)
+        {
+            $this->_height = intval($height);
+            return $this;
+        }
 		
-		/**
-		 * Sets wheter or not the aspect ratio of the original
-		 * image needs to preserved
-		 *
-		 * @param  bool $bool
-		 * @return self
-		 */
-		public function SetPreserveAspectRatio($bool)
-		{
-			$this->_preserveAspectRatio = (bool) $bool;
-			return $this;
-		}
+        /**
+         * Sets wheter or not the aspect ratio of the original
+         * image needs to preserved
+         *
+         * @param  bool $bool
+         * @return self
+         */
+        public function SetPreserveAspectRatio($bool)
+        {
+            $this->_preserveAspectRatio = (bool) $bool;
+            return $this;
+        }
 		
-		public function Execute($imageResource)
-		{
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+        public function Execute($imageResource)
+        {
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Define the ratio and adjust the width and height
-			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
-				$this->_width = $originalWidth * $ratio;
-				$this->_height = $originalHeight * $ratio;
-			}
+            // Define the ratio and adjust the width and height
+            if ($this->_preserveAspectRatio) {
+                $ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+                $this->_width = $originalWidth * $ratio;
+                $this->_height = $originalHeight * $ratio;
+            }
 			
-			// Create the new image
-			$new = imagecreatetruecolor($this->_width, $this->_height);
+            // Create the new image
+            $new = imagecreatetruecolor($this->_width, $this->_height);
 			
-			// Preserve transparency
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-			imagealphablending($new, false);
-			imagesavealpha($new, true);
+            // Preserve transparency
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            imagealphablending($new, false);
+            imagesavealpha($new, true);
 			
-			// Do the actual resizing
-			imagecopyresampled($new, $imageResource, 0, 0, 0, 0, $this->_width, $this->_height, $originalWidth, $originalHeight);
+            // Do the actual resizing
+            imagecopyresampled($new, $imageResource, 0, 0, 0, 0, $this->_width, $this->_height, $originalWidth, $originalHeight);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

src/images/methods/BoxCrop.php

Spacing +2 added lines, -2 removed lines

@@ -26,14 +26,14 @@
 			
 			// Define which ratio will be used, depending on which is the smallest side
 			$ratio = min($hRatio, $wRatio);
-			if($ratio > 1) $ratio = 1;
+			if ($ratio > 1) $ratio = 1;
 			
 			// Define sizes
 			$this->_destWidth = floor($originalWidth * $ratio);
 			$this->_destHeight = floor($originalHeight * $ratio);
 			
 			// Define margins
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
+			$this->_destX = floor(($this->_width - $this->_destWidth) / 2);
 			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
 			
 			// Execute the Crop method with the given parameters

Indentation +26 added lines, -26 removed lines

@@ -10,36 +10,36 @@
  
 namespace CloudControl\Cms\images\methods
 {
-	class BoxCrop extends Crop
-	{
-		/**
-		 * @param resource $imageResource
-		 * @return resource
+    class BoxCrop extends Crop
+    {
+        /**
+         * @param resource $imageResource
+         * @return resource
          */
-		public function Execute($imageResource)
-		{
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+        public function Execute($imageResource)
+        {
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Define the ratios
-			$wRatio = $this->_width / $originalWidth;
-			$hRatio = $this->_height / $originalHeight;
+            // Define the ratios
+            $wRatio = $this->_width / $originalWidth;
+            $hRatio = $this->_height / $originalHeight;
 			
-			// Define which ratio will be used, depending on which is the smallest side
-			$ratio = min($hRatio, $wRatio);
-			if($ratio > 1) $ratio = 1;
+            // Define which ratio will be used, depending on which is the smallest side
+            $ratio = min($hRatio, $wRatio);
+            if($ratio > 1) $ratio = 1;
 			
-			// Define sizes
-			$this->_destWidth = floor($originalWidth * $ratio);
-			$this->_destHeight = floor($originalHeight * $ratio);
+            // Define sizes
+            $this->_destWidth = floor($originalWidth * $ratio);
+            $this->_destHeight = floor($originalHeight * $ratio);
 			
-			// Define margins
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
-			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
+            // Define margins
+            $this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
+            $this->_destY = floor(($this->_height - $this->_destHeight) / 2);
 			
-			// Execute the Crop method with the given parameters
-			return parent::Execute($imageResource);
-		}
-	}
+            // Execute the Crop method with the given parameters
+            return parent::Execute($imageResource);
+        }
+    }
 }
\ No newline at end of file

src/images/ImageResizer.php

Spacing +18 added lines, -18 removed lines

@@ -45,7 +45,7 @@ 
 				}
 				return $returnFileNames;
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 
@@ -56,10 +56,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function resize($imagePath='', $width='',$height='')
+		public function resize($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-r' . $width . 'x' . $height;
-			return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
+			$modifier = '-r'.$width.'x'.$height;
+			return $this->applyMethod('Resize', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -69,10 +69,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function smartcrop($imagePath='', $width='',$height='')
+		public function smartcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-s' . $width . 'x' . $height;
-			return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-s'.$width.'x'.$height;
+			return $this->applyMethod('SmartCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -82,10 +82,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function boxcrop($imagePath='', $width='',$height='')
+		public function boxcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-b' . $width . 'x' . $height;
-			return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-b'.$width.'x'.$height;
+			return $this->applyMethod('BoxCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -94,7 +94,7 @@ 
 		 *
 		 * @return string
 		 */
-		private function modifyName($imagePath, $modifier='')
+		private function modifyName($imagePath, $modifier = '')
 		{
 			$filename = basename($imagePath);
 			$path = dirname($imagePath);
@@ -104,30 +104,30 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+				$filename = $fileNameWithoutExtension.$modifier.'.'.$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';
 				}
-				return $this->modifyName($path . '/' . $filename);
+				return $this->modifyName($path.'/'.$filename);
 			}
-			return $path . '/' . $filename;
+			return $path.'/'.$filename;
 		}
 
 		private function applyMethod($method, $imagePath, $width, $height, $modifier)
 		{
-			$method = 'CloudControl\Cms\\images\\methods\\' . $method;
+			$method = 'CloudControl\Cms\\images\\methods\\'.$method;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -141,7 +141,7 @@ 
 				$resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
 				return basename($destination);
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 	}

Indentation +132 added lines, -132 removed lines

@@ -5,144 +5,144 @@
     use CloudControl\Cms\cc\StringUtil;
 
     /**
-	 * Class ImageResizer
-	 * @package CloudControl\Cms\images
-	 */
-	class ImageResizer
-	{
-		protected $imageSet;
+     * Class ImageResizer
+     * @package CloudControl\Cms\images
+     */
+    class ImageResizer
+    {
+        protected $imageSet;
 
-		/**
-		 * ImageResizer constructor.
-		 *
-		 * @param $imageSet
-		 */
-		public function __construct($imageSet)
-		{
-			$this->imageSet = $imageSet;
-		}
+        /**
+         * ImageResizer constructor.
+         *
+         * @param $imageSet
+         */
+        public function __construct($imageSet)
+        {
+            $this->imageSet = $imageSet;
+        }
 
-		/**
-		 * @param $imagePath
-		 *
-		 * @return array
-		 * @throws \Exception
-		 */
-		public function applyImageSetToImage($imagePath)
-		{
-			$returnFileNames = array();
-			$filename = '';
-			if (file_exists($imagePath)) {
-				foreach ($this->imageSet as $set) {
-					if ($set->method == 'resize') {
-						$filename = $this->resize($imagePath, $set->width, $set->height);
-					} elseif ($set->method == 'smartcrop') {
-						$filename = $this->smartcrop($imagePath, $set->width, $set->height);
-					} elseif ($set->method == 'boxcrop') {
-						$filename = $this->boxcrop($imagePath, $set->width, $set->height);
-					}
-					$returnFileNames[$set->slug] = $filename;
-				}
-				return $returnFileNames;
-			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
-			}
-		}
+        /**
+         * @param $imagePath
+         *
+         * @return array
+         * @throws \Exception
+         */
+        public function applyImageSetToImage($imagePath)
+        {
+            $returnFileNames = array();
+            $filename = '';
+            if (file_exists($imagePath)) {
+                foreach ($this->imageSet as $set) {
+                    if ($set->method == 'resize') {
+                        $filename = $this->resize($imagePath, $set->width, $set->height);
+                    } elseif ($set->method == 'smartcrop') {
+                        $filename = $this->smartcrop($imagePath, $set->width, $set->height);
+                    } elseif ($set->method == 'boxcrop') {
+                        $filename = $this->boxcrop($imagePath, $set->width, $set->height);
+                    }
+                    $returnFileNames[$set->slug] = $filename;
+                }
+                return $returnFileNames;
+            } else {
+                throw new \Exception('Image doesnt exist: ' . $imagePath);
+            }
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function resize($imagePath='', $width='',$height='')
-		{
-			$modifier = '-r' . $width . 'x' . $height;
-			return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function resize($imagePath='', $width='',$height='')
+        {
+            $modifier = '-r' . $width . 'x' . $height;
+            return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function smartcrop($imagePath='', $width='',$height='')
-		{
-			$modifier = '-s' . $width . 'x' . $height;
-			return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function smartcrop($imagePath='', $width='',$height='')
+        {
+            $modifier = '-s' . $width . 'x' . $height;
+            return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function boxcrop($imagePath='', $width='',$height='')
-		{
-			$modifier = '-b' . $width . 'x' . $height;
-			return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function boxcrop($imagePath='', $width='',$height='')
+        {
+            $modifier = '-b' . $width . 'x' . $height;
+            return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param        $imagePath
-		 * @param string $modifier
-		 *
-		 * @return string
-		 */
-		private function modifyName($imagePath, $modifier='')
-		{
-			$filename = basename($imagePath);
-			$path = dirname($imagePath);
-			$fileParts = explode('.', $filename);
-			if (count($fileParts) > 1) {
-				$extension = end($fileParts);
-				array_pop($fileParts);
-				$fileNameWithoutExtension = implode('-', $fileParts);
-				$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
-			} else {
-				$filename = StringUtil::slugify($filename);
-			}
+        /**
+         * @param        $imagePath
+         * @param string $modifier
+         *
+         * @return string
+         */
+        private function modifyName($imagePath, $modifier='')
+        {
+            $filename = basename($imagePath);
+            $path = dirname($imagePath);
+            $fileParts = explode('.', $filename);
+            if (count($fileParts) > 1) {
+                $extension = end($fileParts);
+                array_pop($fileParts);
+                $fileNameWithoutExtension = implode('-', $fileParts);
+                $fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
+                $filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+            } else {
+                $filename = StringUtil::slugify($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;
-				} else {
-					$filename .= '-copy';
-				}
-				return $this->modifyName($path . '/' . $filename);
-			}
-			return $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;
+                } else {
+                    $filename .= '-copy';
+                }
+                return $this->modifyName($path . '/' . $filename);
+            }
+            return $path . '/' . $filename;
+        }
 
-		private function applyMethod($method, $imagePath, $width, $height, $modifier)
-		{
-			$method = 'CloudControl\Cms\\images\\methods\\' . $method;
-			$destination = $this->modifyName($imagePath, $modifier);
-			if (file_exists($imagePath)) {
-				$image = new Image();
-				$image->loadImage($imagePath);
-				$resize = new $method();
-				$resize->SetWidth($width);
-				$resize->SetHeight($height);
-				$resizedImageResource = $resize->Execute($image->getImageResource());
-				$resizedImage = new Image();
-				$resizedImage->loadImage($resizedImageResource);
-				$resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
-				return basename($destination);
-			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
-			}
-		}
-	}
+        private function applyMethod($method, $imagePath, $width, $height, $modifier)
+        {
+            $method = 'CloudControl\Cms\\images\\methods\\' . $method;
+            $destination = $this->modifyName($imagePath, $modifier);
+            if (file_exists($imagePath)) {
+                $image = new Image();
+                $image->loadImage($imagePath);
+                $resize = new $method();
+                $resize->SetWidth($width);
+                $resize->SetHeight($height);
+                $resizedImageResource = $resize->Execute($image->getImageResource());
+                $resizedImage = new Image();
+                $resizedImage->loadImage($resizedImageResource);
+                $resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
+                return basename($destination);
+            } else {
+                throw new \Exception('Image doesnt exist: ' . $imagePath);
+            }
+        }
+    }
 }
\ No newline at end of file

src/cc/Request.php

Spacing +5 added lines, -5 removed lines

@@ -45,23 +45,23 @@
 		 */
 		public function __construct() 
 		{
-            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 			
-			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);

Indentation +68 added lines, -68 removed lines

@@ -5,79 +5,79 @@
      * Class Request
      * @package CloudControl\Cms\cc
      */
-	class Request {
+    class Request {
 
-		/**
-		 * @var string
-		 */
-		public static $subfolders;
-		/**
-		 * @var string
-		 */
-		public static $requestUri;
-		/**
-		 * @var string
-		 */
-		public static $relativeUri;
-		/**
-		 * @var string
-		 */
-		public static $queryString;
-		/**
-		 * @var array
-		 */
-		public static $requestParameters;
-		/**
-		 * @var array
-		 */
-		public static $post = array();
-		/**
-		 * @var array
-		 */
-		public static $get = array();
-		/**
-		 * @var array
-		 */
-		private $statics = array();
+        /**
+         * @var string
+         */
+        public static $subfolders;
+        /**
+         * @var string
+         */
+        public static $requestUri;
+        /**
+         * @var string
+         */
+        public static $relativeUri;
+        /**
+         * @var string
+         */
+        public static $queryString;
+        /**
+         * @var array
+         */
+        public static $requestParameters;
+        /**
+         * @var array
+         */
+        public static $post = array();
+        /**
+         * @var array
+         */
+        public static $get = array();
+        /**
+         * @var array
+         */
+        private $statics = array();
 
-		/**
-		 * Request constructor.
-		 */
-		public function __construct() 
-		{
+        /**
+         * Request constructor.
+         */
+        public function __construct() 
+        {
             $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
 			
-			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);
-			} else {
-				self::$requestUri = $_SERVER['REQUEST_URI'];
-				self::$queryString = $_SERVER['QUERY_STRING'];
-			}
-			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
-			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
-			}
+            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);
+            } else {
+                self::$requestUri = $_SERVER['REQUEST_URI'];
+                self::$queryString = $_SERVER['QUERY_STRING'];
+            }
+            if (self::$subfolders === '/') {
+                self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+            } else {
+                self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+            }
 
-			self::$requestParameters = explode('/', self::$relativeUri);
+            self::$requestParameters = explode('/', self::$relativeUri);
 			
-			self::$get = $_GET;
-			self::$post = $_POST;
+            self::$get = $_GET;
+            self::$post = $_POST;
 			
-			$this->statics = array(
-				'subfolders' => self::$subfolders,
-				'requestUri' => self::$requestUri,
-				'relativeUri' => self::$relativeUri,
-				'queryString' => self::$queryString,
-				'requestParameters' => self::$requestParameters,
-				'post' => self::$post,
-				'get' => self::$get
-			);
-		}
-	}
+            $this->statics = array(
+                'subfolders' => self::$subfolders,
+                'requestUri' => self::$requestUri,
+                'relativeUri' => self::$relativeUri,
+                'queryString' => self::$queryString,
+                'requestParameters' => self::$requestParameters,
+                'post' => self::$post,
+                'get' => self::$get
+            );
+        }
+    }
 }
\ No newline at end of file

src/cc/errortemplates/errorviewcli.php

Spacing +10 added lines, -10 removed lines

@@ -2,21 +2,21 @@ 
 | THE FOLLOWING ERROR OCCURED                                                                                                                  |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
- <?php echo $message . PHP_EOL; ?>
+ <?php echo $message.PHP_EOL; ?>
 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 | IN FILE                                                                                                                                      |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
- <?php echo $file . ':' . $line . PHP_EOL; ?>
+ <?php echo $file.':'.$line.PHP_EOL; ?>
 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 | CONTENTS OF THE FILE                                                                                                                         |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($lines as $nr => $currentLine) {
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+foreach ($lines as $nr => $currentLine) {
+	echo ($nr == $line ? '* ' : '  ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine;
 }
 ?>
 
@@ -25,11 +25,11 @@ 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($trace as $row) {
-	echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-		. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-		. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-		. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-		. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+foreach ($trace as $row) {
+	echo (isset($row['file']) ? basename($row['file']) : '').':'
+		. (isset($row['line']) ? $row['line'] : '')."\t\t\t"
+		. (isset($row['class']) ? $row['class'] : ' ')."\t\t\t"
+		. (isset($row['type']) ? $row['type'] : ' ')."\t\t\t"
+		. (isset($row['function']) ? $row['function'] : ' ').PHP_EOL;
 }
 ?>
\ No newline at end of file

Indentation +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
 
 <?php
 foreach($lines as $nr => $currentLine) {
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+    echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
 }
 ?>
 
@@ -26,10 +26,10 @@ 
 
 <?php
 foreach($trace as $row) {
-	echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-		. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-		. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-		. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-		. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+    echo (isset($row['file']) ? basename($row['file']) : '') . ':'
+        . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
+        . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
+        . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
+        . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
 }
 ?>
\ No newline at end of file

src/cc/StringUtil.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 	public static function slugify($str, $replace = array(), $delimiter = '-')
 	{
 		if (!empty($replace)) {
-			$str = str_replace((array)$replace, ' ', $str);
+			$str = str_replace((array) $replace, ' ', $str);
 		}
 
 		$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
@@ -79,13 +79,13 @@ 
 	public static function humanFileSize($size, $unit = "")
 	{
 		if ((!$unit && $size >= 1 << 30) || $unit == "GB")
-			return number_format($size / (1 << 30), 2) . "GB";
+			return number_format($size / (1 << 30), 2)."GB";
 		if ((!$unit && $size >= 1 << 20) || $unit == "MB")
-			return number_format($size / (1 << 20), 2) . "MB";
+			return number_format($size / (1 << 20), 2)."MB";
 		if ((!$unit && $size >= 1 << 10) || $unit == "KB")
-			return number_format($size / (1 << 10), 2) . "KB";
+			return number_format($size / (1 << 10), 2)."KB";
 
-		return number_format($size) . " bytes";
+		return number_format($size)." bytes";
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 			if ($d >= 1) {
 				$r = round($d);
 
-				return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+				return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago';
 			}
 		}
 

Indentation +119 added lines, -119 removed lines

@@ -8,123 +8,123 @@
 
 class StringUtil
 {
-	/**
-	 * Convert a string to url friendly slug
-	 *
-	 * @param string $str
-	 * @param array  $replace
-	 * @param string $delimiter
-	 *
-	 * @return mixed|string
-	 */
-	public static function slugify($str, $replace = array(), $delimiter = '-')
-	{
-		if (!empty($replace)) {
-			$str = str_replace((array)$replace, ' ', $str);
-		}
-
-		$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
-		$clean = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $clean);
-		$clean = strtolower(trim($clean, '-'));
-		$clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean);
-
-		return $clean;
-	}
-
-	/**
-	 * Selects the right font-awesome icon for each filetype
-	 *
-	 * @param $fileType
-	 *
-	 * @return string
-	 */
-	public static function iconByFileType($fileType)
-	{
-		$fileTypeIcons = array(
-			'image'                                                                   => 'file-image-o',
-			'pdf'                                                                     => 'file-pdf-o',
-			'audio'                                                                   => 'file-audio-o',
-			'x-msdownload'                                                            => 'windows',
-			'application/vnd.ms-excel'                                                => 'file-excel-o',
-			'application/msexcel'                                                     => 'file-excel-o',
-			'application/xls'                                                         => 'file-excel-o',
-			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'       => 'file-excel-o',
-			'application/vnd.google-apps.spreadsheet'                                 => 'file-excel-o',
-			'application/msword'                                                      => 'file-word-o',
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'file-word-o',
-			'application/x-rar-compressed'                                            => 'file-archive-o',
-			'application/x-zip-compressed'                                            => 'file-archive-o',
-			'application/zip'                                                         => 'file-archive-o',
-			'text'                                                                    => 'file-text-o',
-		);
-
-		foreach ($fileTypeIcons as $needle => $icon) {
-			if (strpos($fileType, $needle) !== false) {
-				return $icon;
-			}
-		}
-
-		return 'file-o';
-	}
-
-	/**
-	 * Converts an amount of bytes to a human readable
-	 * format
-	 *
-	 * @param        $size
-	 * @param string $unit
-	 *
-	 * @return string
-	 */
-	public static function humanFileSize($size, $unit = "")
-	{
-		if ((!$unit && $size >= 1 << 30) || $unit == "GB")
-			return number_format($size / (1 << 30), 2) . "GB";
-		if ((!$unit && $size >= 1 << 20) || $unit == "MB")
-			return number_format($size / (1 << 20), 2) . "MB";
-		if ((!$unit && $size >= 1 << 10) || $unit == "KB")
-			return number_format($size / (1 << 10), 2) . "KB";
-
-		return number_format($size) . " bytes";
-	}
-
-	/**
-	 * @param $ptime
-	 *
-	 * @return string
-	 */
-	public static function timeElapsedString($ptime)
-	{
-		$etime = time() - $ptime;
-
-		if ($etime < 1) {
-			return '0 seconds';
-		}
-
-		$a = array(365 * 24 * 60 * 60 => 'year',
-				   30 * 24 * 60 * 60  => 'month',
-				   24 * 60 * 60       => 'day',
-				   60 * 60            => 'hour',
-				   60                 => 'minute',
-				   1                  => 'second'
-		);
-		$a_plural = array('year'   => 'years',
-						  'month'  => 'months',
-						  'day'    => 'days',
-						  'hour'   => 'hours',
-						  'minute' => 'minutes',
-						  'second' => 'seconds'
-		);
-
-		foreach ($a as $secs => $str) {
-			$d = $etime / $secs;
-			if ($d >= 1) {
-				$r = round($d);
-
-				return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
-			}
-		}
-
-		return 0;
-	}
+    /**
+     * Convert a string to url friendly slug
+     *
+     * @param string $str
+     * @param array  $replace
+     * @param string $delimiter
+     *
+     * @return mixed|string
+     */
+    public static function slugify($str, $replace = array(), $delimiter = '-')
+    {
+        if (!empty($replace)) {
+            $str = str_replace((array)$replace, ' ', $str);
+        }
+
+        $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
+        $clean = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $clean);
+        $clean = strtolower(trim($clean, '-'));
+        $clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean);
+
+        return $clean;
+    }
+
+    /**
+     * Selects the right font-awesome icon for each filetype
+     *
+     * @param $fileType
+     *
+     * @return string
+     */
+    public static function iconByFileType($fileType)
+    {
+        $fileTypeIcons = array(
+            'image'                                                                   => 'file-image-o',
+            'pdf'                                                                     => 'file-pdf-o',
+            'audio'                                                                   => 'file-audio-o',
+            'x-msdownload'                                                            => 'windows',
+            'application/vnd.ms-excel'                                                => 'file-excel-o',
+            'application/msexcel'                                                     => 'file-excel-o',
+            'application/xls'                                                         => 'file-excel-o',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'       => 'file-excel-o',
+            'application/vnd.google-apps.spreadsheet'                                 => 'file-excel-o',
+            'application/msword'                                                      => 'file-word-o',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'file-word-o',
+            'application/x-rar-compressed'                                            => 'file-archive-o',
+            'application/x-zip-compressed'                                            => 'file-archive-o',
+            'application/zip'                                                         => 'file-archive-o',
+            'text'                                                                    => 'file-text-o',
+        );
+
+        foreach ($fileTypeIcons as $needle => $icon) {
+            if (strpos($fileType, $needle) !== false) {
+                return $icon;
+            }
+        }
+
+        return 'file-o';
+    }
+
+    /**
+     * Converts an amount of bytes to a human readable
+     * format
+     *
+     * @param        $size
+     * @param string $unit
+     *
+     * @return string
+     */
+    public static function humanFileSize($size, $unit = "")
+    {
+        if ((!$unit && $size >= 1 << 30) || $unit == "GB")
+            return number_format($size / (1 << 30), 2) . "GB";
+        if ((!$unit && $size >= 1 << 20) || $unit == "MB")
+            return number_format($size / (1 << 20), 2) . "MB";
+        if ((!$unit && $size >= 1 << 10) || $unit == "KB")
+            return number_format($size / (1 << 10), 2) . "KB";
+
+        return number_format($size) . " bytes";
+    }
+
+    /**
+     * @param $ptime
+     *
+     * @return string
+     */
+    public static function timeElapsedString($ptime)
+    {
+        $etime = time() - $ptime;
+
+        if ($etime < 1) {
+            return '0 seconds';
+        }
+
+        $a = array(365 * 24 * 60 * 60 => 'year',
+                    30 * 24 * 60 * 60  => 'month',
+                    24 * 60 * 60       => 'day',
+                    60 * 60            => 'hour',
+                    60                 => 'minute',
+                    1                  => 'second'
+        );
+        $a_plural = array('year'   => 'years',
+                            'month'  => 'months',
+                            'day'    => 'days',
+                            'hour'   => 'hours',
+                            'minute' => 'minutes',
+                            'second' => 'seconds'
+        );
+
+        foreach ($a as $secs => $str) {
+            $d = $etime / $secs;
+            if ($d >= 1) {
+                $r = round($d);
+
+                return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+            }
+        }
+
+        return 0;
+    }
 }
\ No newline at end of file

src/templates/documents/function.renderDocument.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 { ?>
   <div class="grid-box-10">
     <h3>
-      <a class="btn documentTitle" href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/documents/edit-document?slug=<?= $slugPrefix . $document->slug ?>" title="Edit">
+      <a class="btn documentTitle" href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/documents/edit-document?slug=<?= $slugPrefix.$document->slug ?>" title="Edit">
         <i class="fa fa-file-text-o"></i>
         <small class="state <?= strtolower($document->state) ?>">
           <i class="fa <?= $document->state == 'published' ? 'fa-check-circle-o' : 'fa-times-circle-o' ?>"></i></small>
@@ -32,23 +32,23 @@ 
       <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
           <? renderAction('Publish',
               'publish',
-              $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
+              $request::$subfolders.$cmsPrefix.'/documents/publish-document?slug='.$slugPrefix.$document->slug,
               'check'); ?>
       <? endif ?>
       <? if ($document->state == 'published') : ?>
           <? renderAction('Unpublish',
               'unpublish',
-              $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
+              $request::$subfolders.$cmsPrefix.'/documents/unpublish-document?slug='.$slugPrefix.$document->slug,
               'times'); ?>
       <? endif ?>
       <? renderAction('Edit',
           '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
+          $request::$subfolders.$cmsPrefix.'/documents/edit-document?slug='.$slugPrefix.$document->slug,
           'pencil'); ?>
       <? if ($document->state == 'unpublished') : ?>
           <? renderAction('Delete',
               'error',
-              $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
+              $request::$subfolders.$cmsPrefix.'/documents/delete-document?slug='.$slugPrefix.$document->slug,
               'trash',
               'return confirm(\'Are you sure you want to delete this document?\');'); ?>
       <? endif ?>

Indentation +13 added lines, -13 removed lines

@@ -31,26 +31,26 @@
   <div class="documentActions grid-box-2">
       <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
           <? renderAction('Publish',
-              'publish',
-              $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
-              'check'); ?>
+                'publish',
+                $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
+                'check'); ?>
       <? endif ?>
       <? if ($document->state == 'published') : ?>
           <? renderAction('Unpublish',
-              'unpublish',
-              $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
-              'times'); ?>
+                'unpublish',
+                $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
+                'times'); ?>
       <? endif ?>
       <? renderAction('Edit',
-          '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
-          'pencil'); ?>
+            '',
+            $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
+            'pencil'); ?>
       <? if ($document->state == 'unpublished') : ?>
           <? renderAction('Delete',
-              'error',
-              $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
-              'trash',
-              'return confirm(\'Are you sure you want to delete this document?\');'); ?>
+                'error',
+                $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
+                'trash',
+                'return confirm(\'Are you sure you want to delete this document?\');'); ?>
       <? endif ?>
   </div>
 <? } ?>

src/templates/documents/brick.php

Spacing +8 added lines, -8 removed lines

@@ -4,9 +4,9 @@ 
 </div>
 <label><?= $brick->title ?></label>
 <? if ($static == true) {
-    $fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]';
+    $fieldPrefix = 'bricks['.$myBrickSlug.']['.str_replace('.', '', str_replace(' ', '', microtime())).'][fields]';
 } else {
-    $fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']';
+    $fieldPrefix = 'dynamicBricks['.$brick->slug.']['.str_replace('.', '', str_replace(' ', '', microtime())).']';
 } ?>
 <? foreach ($brick->fields as $field) : ?>
 			<div class="form-element">
@@ -31,7 +31,7 @@ 
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
 				<? endif ?>
-					<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+					<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 							</div>
@@ -53,7 +53,7 @@ 
 						<li class="grid-container">
 							<div class="grid-box-10">
 								<div class="grid-inner form-element">
-									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+									<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 								</div>
 							</div>
 							<div class="grid-box-2">
@@ -63,7 +63,7 @@ 
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -80,10 +80,10 @@ 
 							<a class="btn error js-deletemultiple"><i class="fa fa-trash"></i></a>
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
-							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+							<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 					<? endforeach ?>
 					<? endif ?>
 					</div>
@@ -92,5 +92,5 @@ 
 				<a class="btn js-addrtemultiple">+</a>
 				<? endif ?>
 			</div>
-			<?$value='';?>
+			<?$value = ''; ?>
 		<? endforeach ?>

Indentation +13 added lines, -13 removed lines

@@ -12,11 +12,11 @@ 
 			<div class="form-element">
 				<label for="<?=$field->slug?>"><?=$field->title?></label>
 				<? if (isset($dynamicBrick)) :
-					$fieldSlug = $field->slug;
-					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
-				else :
-					$value = '';
-				endif ?>
+                    $fieldSlug = $field->slug;
+                    $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
+                else :
+                    $value = '';
+                endif ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 				<ul class="grid-wrapper sortable">
 					<li class="grid-container">
@@ -44,10 +44,10 @@ 
 						</div>
 					</li>
 					<? if (isset($dynamicBrick)) :
-						$fieldSlug = $field->slug;
-						$iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
-						array_shift($iterable);
-						?>
+                        $fieldSlug = $field->slug;
+                        $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
+                        array_shift($iterable);
+                        ?>
 						<? foreach ($iterable as $value) : ?>
 
 						<li class="grid-container">
@@ -70,10 +70,10 @@ 
 				<a class="btn js-addmultiple">+</a>
 				<? elseif ($field->multiple == true) : ?>
 					<? if (isset($dynamicBrick)) :
-						$fieldSlug = $field->slug;
-						$iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
-						array_shift($iterable);
-						?>
+                        $fieldSlug = $field->slug;
+                        $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
+                        array_shift($iterable);
+                        ?>
 						<? foreach ($iterable as $value) : ?>
 
 						<li>