jenskooij / cloudcontrol

src/search/CharacterFilter.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 		$string = strip_tags($string);
 		$string = trim($string);
 		$string = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $string); // Remove special alphanumeric characters
-		$string = str_replace(array('+', '=', '!', ',', '.',';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
+		$string = str_replace(array('+', '=', '!', ',', '.', ';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
 		$string = preg_replace("/[\r\n]+/", " ", $string); // Replace multiple newlines with a single space.
 		$string = preg_replace("/[\t]+/", " ", $string); // Replace multiple tabs with a single space.
 		$string = preg_replace("/[^a-zA-Z0-9 ]/", '', $string); // Filter out everything that is not alphanumeric or a space
@@ -66,7 +66,7 @@ 
 	{
 		$encoding = mb_detect_encoding($string, mb_detect_order(), false);
 
-		if($encoding == "UTF-8") {
+		if ($encoding == "UTF-8") {
 			$string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
 		}
 

Indentation +65 added lines, -65 removed lines

@@ -9,76 +9,76 @@
 
 class CharacterFilter
 {
-	protected $originalString;
-	protected $filteredString = '';
+    protected $originalString;
+    protected $filteredString = '';
 
-	/**
-	 * CharacterFilter constructor.
-	 *
-	 * @param $string
-	 */
-	public function __construct($string)
-	{
-		$this->originalString = $string;
-		$string = $this->convertToUTF8($string);
-		$string = mb_strtolower($string);
-		$string = $this->filterSpecialCharacters($string);
-		$this->filteredString = $string;
-	}
+    /**
+     * CharacterFilter constructor.
+     *
+     * @param $string
+     */
+    public function __construct($string)
+    {
+        $this->originalString = $string;
+        $string = $this->convertToUTF8($string);
+        $string = mb_strtolower($string);
+        $string = $this->filterSpecialCharacters($string);
+        $this->filteredString = $string;
+    }
 
-	/**
-	 * Returns the filtered string
-	 * @return string|void
-	 */
-	public function __toString()
-	{
-		return $this->filteredString;
-	}
+    /**
+     * Returns the filtered string
+     * @return string|void
+     */
+    public function __toString()
+    {
+        return $this->filteredString;
+    }
 
-	/**
-	 * Filter out all special characters, like punctuation and characters with accents
-	 *
-	 * @param $string
-	 *
-	 * @return mixed|string
-	 */
-	private function filterSpecialCharacters($string)
-	{
-		$string = str_replace('<', ' <', $string); // This is need, otherwise this: <h1>something</h1><h2>something</h2> will result in somethingsomething
-		$string = strip_tags($string);
-		$string = trim($string);
-		$string = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $string); // Remove special alphanumeric characters
-		$string = str_replace(array('+', '=', '!', ',', '.',';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
-		$string = preg_replace("/[\r\n]+/", " ", $string); // Replace multiple newlines with a single space.
-		$string = preg_replace("/[\t]+/", " ", $string); // Replace multiple tabs with a single space.
-		$string = preg_replace("/[^a-zA-Z0-9 ]/", '', $string); // Filter out everything that is not alphanumeric or a space
-		$string = preg_replace('!\s+!', ' ', $string); // Replace multiple spaces with a single space
-		return $string;
-	}
+    /**
+     * Filter out all special characters, like punctuation and characters with accents
+     *
+     * @param $string
+     *
+     * @return mixed|string
+     */
+    private function filterSpecialCharacters($string)
+    {
+        $string = str_replace('<', ' <', $string); // This is need, otherwise this: <h1>something</h1><h2>something</h2> will result in somethingsomething
+        $string = strip_tags($string);
+        $string = trim($string);
+        $string = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $string); // Remove special alphanumeric characters
+        $string = str_replace(array('+', '=', '!', ',', '.',';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
+        $string = preg_replace("/[\r\n]+/", " ", $string); // Replace multiple newlines with a single space.
+        $string = preg_replace("/[\t]+/", " ", $string); // Replace multiple tabs with a single space.
+        $string = preg_replace("/[^a-zA-Z0-9 ]/", '', $string); // Filter out everything that is not alphanumeric or a space
+        $string = preg_replace('!\s+!', ' ', $string); // Replace multiple spaces with a single space
+        return $string;
+    }
 
-	/**
-	 * Convert the string to UTF-8 encoding
-	 * @param $string
-	 *
-	 * @return string
-	 */
-	private function convertToUTF8($string)
-	{
-		$encoding = mb_detect_encoding($string, mb_detect_order(), false);
+    /**
+     * Convert the string to UTF-8 encoding
+     * @param $string
+     *
+     * @return string
+     */
+    private function convertToUTF8($string)
+    {
+        $encoding = mb_detect_encoding($string, mb_detect_order(), false);
 
-		if($encoding == "UTF-8") {
-			$string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
-		}
+        if($encoding == "UTF-8") {
+            $string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
+        }
 
-		$out = iconv(mb_detect_encoding($string, mb_detect_order(), false), "UTF-8//IGNORE", $string);
-		return $out;
-	}
+        $out = iconv(mb_detect_encoding($string, mb_detect_order(), false), "UTF-8//IGNORE", $string);
+        return $out;
+    }
 
-	/**
-	 * @return mixed|string
-	 */
-	public function getFilteredString()
-	{
-		return $this->filteredString;
-	}
+    /**
+     * @return mixed|string
+     */
+    public function getFilteredString()
+    {
+        return $this->filteredString;
+    }
 }
\ No newline at end of file

src/images/IMethod.php

Indentation +10 added lines, -10 removed lines

@@ -10,14 +10,14 @@
  
 namespace CloudControl\Cms\images
 {
-	abstract class IMethod
-	{
-		/**
-		 * Method stub, use for executing the manipulation
-		 * 
-		 * @param  resource $imageResource
-		 * @return resource
-		 */
-		abstract public function Execute($imageResource);
-	}
+    abstract class IMethod
+    {
+        /**
+         * Method stub, use for executing the manipulation
+         * 
+         * @param  resource $imageResource
+         * @return resource
+         */
+        abstract public function Execute($imageResource);
+    }
 }
\ No newline at end of file

src/images/ImageResizer.php

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

Spacing +8 added lines, -8 removed lines

@@ -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);
+			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);
+			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);
+			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,7 +104,7 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+				$filename = $fileNameWithoutExtension . $modifier . '.' . $extension;
 			} else {
 				$filename = StringUtil::slugify($filename);
 			}

src/images/methods/Watermark.php

Indentation +145 added lines, -145 removed lines

@@ -16,174 +16,174 @@
     use CloudControl\Cms\images\IMethod;
 
     class Watermark extends IMethod
-	{
-		protected $_x = 0;
-		protected $_y = 0;
-		protected $_transparency = 100;
+    {
+        protected $_x = 0;
+        protected $_y = 0;
+        protected $_transparency = 100;
 		
-		/**
-		 * @var Image
-		 */
-		protected $_watermark;
+        /**
+         * @var Image
+         */
+        protected $_watermark;
 	
-		protected function init()
-		{}
+        protected function init()
+        {}
 		
-		/**
-		 * Sets transparency for watermark
-		 *
-		 * @param  int $transparency
-		 * @return self
-		 */
-		public function SetTransparency($transparency)
-		{
-			$this->_transparency = intval($transparency);
-			return $this;
-		}
+        /**
+         * Sets transparency for watermark
+         *
+         * @param  int $transparency
+         * @return self
+         */
+        public function SetTransparency($transparency)
+        {
+            $this->_transparency = intval($transparency);
+            return $this;
+        }
 		
-		/**
-		 * Use build-in logic to position the watermark
-		 *
-		 * @param 	string $x
-		 * @param 	string $y
-		 * @return 	self
-		 */
-		public function SetPosition($x, $y)
-		{
-			$this->SetX($x);
-			$this->SetY($y);
-			return $this;
-		}
+        /**
+         * Use build-in logic to position the watermark
+         *
+         * @param 	string $x
+         * @param 	string $y
+         * @return 	self
+         */
+        public function SetPosition($x, $y)
+        {
+            $this->SetX($x);
+            $this->SetY($y);
+            return $this;
+        }
 		
-		/**
-		 * Use build-in logic to position the x of watermark
-		 *
-		 * @param 	resource $imageResource
-		 * @return 	self
-		 */
-		protected function calculateX($imageResource)
-		{
-			if (intval($this->_x) === $this->_x) return $this->_x;
+        /**
+         * Use build-in logic to position the x of watermark
+         *
+         * @param 	resource $imageResource
+         * @return 	self
+         */
+        protected function calculateX($imageResource)
+        {
+            if (intval($this->_x) === $this->_x) return $this->_x;
 			
-			$x = strtolower($this->_x);
+            $x = strtolower($this->_x);
 			
-			$imageWidth = imagesx($imageResource);
-			$watermarkWidth = imagesx($this->GetWatermark()->getImageResource());
+            $imageWidth = imagesx($imageResource);
+            $watermarkWidth = imagesx($this->GetWatermark()->getImageResource());
 			
-			if ($x == 'left') {
-				$x = 0;
-			} elseif ($x == 'center') {
-				$x = $imageWidth / 2 - ($watermarkWidth / 2);
-			} elseif ($x == 'right') {
-				$x = $imageWidth - $watermarkWidth;
-			}
-			return intval($x);
-		}
+            if ($x == 'left') {
+                $x = 0;
+            } elseif ($x == 'center') {
+                $x = $imageWidth / 2 - ($watermarkWidth / 2);
+            } elseif ($x == 'right') {
+                $x = $imageWidth - $watermarkWidth;
+            }
+            return intval($x);
+        }
 		
-		/**
-		 * Use build-in logic to position the y of watermark
-		 *
-		 * @param 	resource $imageResource
-		 * @return 	self
-		 */
-		public function calculateY($imageResource)
-		{
-			if (intval($this->_y) === $this->_y) return $this->_y;
+        /**
+         * Use build-in logic to position the y of watermark
+         *
+         * @param 	resource $imageResource
+         * @return 	self
+         */
+        public function calculateY($imageResource)
+        {
+            if (intval($this->_y) === $this->_y) return $this->_y;
 		
-			$y = strtolower($this->_y);
+            $y = strtolower($this->_y);
 			
-			$imageHeight = imagesy($imageResource);
-			$watermarkHeight = imagesy($this->GetWatermark()->getImageResource());
+            $imageHeight = imagesy($imageResource);
+            $watermarkHeight = imagesy($this->GetWatermark()->getImageResource());
 			
-			if ($y == 'top') {
-				$y = 0;
-			} elseif ($y == 'center') {
-				$y = $imageHeight / 2 - ($watermarkHeight / 2);
-			} elseif ($y == 'bottom') {
-				$y = $imageHeight - $watermarkHeight;
-			}
-			return intval($y);
-		}
+            if ($y == 'top') {
+                $y = 0;
+            } elseif ($y == 'center') {
+                $y = $imageHeight / 2 - ($watermarkHeight / 2);
+            } elseif ($y == 'bottom') {
+                $y = $imageHeight - $watermarkHeight;
+            }
+            return intval($y);
+        }
 
-		/**
-		 * Sets the image that will be used as watermark
-		 *
-		 * @param Image $image
-		 * @return Watermark
-		 */
-		public function SetWatermark(Image $image)
-		{
-			$this->_watermark = $image;
-			return $this;
-		}
+        /**
+         * Sets the image that will be used as watermark
+         *
+         * @param Image $image
+         * @return Watermark
+         */
+        public function SetWatermark(Image $image)
+        {
+            $this->_watermark = $image;
+            return $this;
+        }
 
-		/**
-		 * Returns the watermark.
-		 * Throws an Exception if it's not set or if it's not an \CloudControl\Cms\image\Image
-		 * @return \images\Image
-		 * @throws \Exception
-		 */
-		public function GetWatermark()
-		{
-			if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
-			return $this->_watermark;
-		}
+        /**
+         * Returns the watermark.
+         * Throws an Exception if it's not set or if it's not an \CloudControl\Cms\image\Image
+         * @return \images\Image
+         * @throws \Exception
+         */
+        public function GetWatermark()
+        {
+            if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
+            return $this->_watermark;
+        }
 		
-		/**
-		 * Set the x
-		 *
-		 * @param  int | string $x
-		 * @return self
-		 */
-		public function SetX($x)
-		{
-			$this->_x = $x;
-			return $this;
-		}
+        /**
+         * Set the x
+         *
+         * @param  int | string $x
+         * @return self
+         */
+        public function SetX($x)
+        {
+            $this->_x = $x;
+            return $this;
+        }
 		
-		/**
-		 * Set the y
-		 *
-		 * @param  int | string $y
-		 * @return self
-		 */
-		public function SetY($y)
-		{
-			$this->_y = $y;
-			return $this;
-		}
+        /**
+         * Set the y
+         *
+         * @param  int | string $y
+         * @return self
+         */
+        public function SetY($y)
+        {
+            $this->_y = $y;
+            return $this;
+        }
 		
-		public function Execute($imageResource)
-		{
-			$watermark = $this->GetWatermark();
-			$watermarkWidth  = imagesx($watermark->getImageResource());
-			$watermarkHeight = imagesy($watermark->getImageResource());
+        public function Execute($imageResource)
+        {
+            $watermark = $this->GetWatermark();
+            $watermarkWidth  = imagesx($watermark->getImageResource());
+            $watermarkHeight = imagesy($watermark->getImageResource());
 			
-			$x = $this->calculateX($imageResource);
-			$y = $this->calculateY($imageResource);
+            $x = $this->calculateX($imageResource);
+            $y = $this->calculateY($imageResource);
 			
-			$imageWidth = imagesx($imageResource);
-			$imageHeight = imagesy($imageResource);
+            $imageWidth = imagesx($imageResource);
+            $imageHeight = imagesy($imageResource);
 			
-			$new = imagecreatetruecolor($imageWidth, $imageHeight);
+            $new = imagecreatetruecolor($imageWidth, $imageHeight);
 			
-			// Preserve transparency of the image
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-			imagealphablending($new, false);
-			imagesavealpha($new, true);
+            // Preserve transparency of the image
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            imagealphablending($new, false);
+            imagesavealpha($new, true);
 			
-			// Preserve transparency of the watermark
-			imagecolortransparent($watermark->getImageResource(), imagecolorallocatealpha($watermark->getImageResource(), 0, 0, 0, 127));
-			imagealphablending($watermark->getImageResource(), false);
-			imagesavealpha($watermark->getImageResource(), true);
+            // Preserve transparency of the watermark
+            imagecolortransparent($watermark->getImageResource(), imagecolorallocatealpha($watermark->getImageResource(), 0, 0, 0, 127));
+            imagealphablending($watermark->getImageResource(), false);
+            imagesavealpha($watermark->getImageResource(), true);
 			
-			imagealphablending($new, true);
-			imagealphablending($watermark->getImageResource(), true);
+            imagealphablending($new, true);
+            imagealphablending($watermark->getImageResource(), true);
 			
-			imagecopy($new, $imageResource, 0, 0, 0, 0, $imageWidth, $imageHeight);
-			imagecopymerge($new, $watermark->getImageResource(), $x, $y, 0, 0, $watermarkWidth, $watermarkHeight, $this->_transparency);
+            imagecopy($new, $imageResource, 0, 0, 0, 0, $imageWidth, $imageHeight);
+            imagecopymerge($new, $watermark->getImageResource(), $x, $y, 0, 0, $watermarkWidth, $watermarkHeight, $this->_transparency);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

Braces +9 added lines, -3 removed lines

@@ -63,7 +63,9 @@ 
 		 */
 		protected function calculateX($imageResource)
 		{
-			if (intval($this->_x) === $this->_x) return $this->_x;
+			if (intval($this->_x) === $this->_x) {
+			    return $this->_x;
+			}
 			
 			$x = strtolower($this->_x);
 			
@@ -88,7 +90,9 @@ 
 		 */
 		public function calculateY($imageResource)
 		{
-			if (intval($this->_y) === $this->_y) return $this->_y;
+			if (intval($this->_y) === $this->_y) {
+			    return $this->_y;
+			}
 		
 			$y = strtolower($this->_y);
 			
@@ -125,7 +129,9 @@ 
 		 */
 		public function GetWatermark()
 		{
-			if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
+			if ($this->_watermark == null) {
+			    throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
+			}
 			return $this->_watermark;
 		}
 		

src/images/methods/Crop.php

Indentation +95 added lines, -95 removed lines

@@ -14,114 +14,114 @@
     use CloudControl\Cms\images\IMethod;
 
     class Crop extends IMethod
-	{
-		protected $_width;
-		protected $_height;
-		protected $_x;
-		protected $_y;
+    {
+        protected $_width;
+        protected $_height;
+        protected $_x;
+        protected $_y;
 		
-		protected $_destWidth;
-		protected $_destHeight;
-		protected $_destX = 0.0;
-		protected $_destY = 0.0;
+        protected $_destWidth;
+        protected $_destHeight;
+        protected $_destX = 0.0;
+        protected $_destY = 0.0;
 
-		/**
-		 * @var null|array
-		 */
-		protected $_backgroundColor = null;
+        /**
+         * @var null|array
+         */
+        protected $_backgroundColor = null;
 	
-		public function init()
-		{}
+        public function init()
+        {}
 		
-		/**
-		 * Set the width
-		 *
-		 * @param  int $width
-		 * @return self
-		 */
-		public function SetWidth($width)
-		{
-			$this->_width = intval($width);
-			$this->_destWidth = intval($width);
-			return $this;
-		}
+        /**
+         * Set the width
+         *
+         * @param  int $width
+         * @return self
+         */
+        public function SetWidth($width)
+        {
+            $this->_width = intval($width);
+            $this->_destWidth = intval($width);
+            return $this;
+        }
 		
-		/**
-		 * Set the height
-		 *
-		 * @param  int $height
-		 * @return self
-		 */
-		public function SetHeight($height)
-		{
-			$this->_height = intval($height);
-			$this->_destHeight = intval($height);
-			return $this;
-		}
+        /**
+         * Set the height
+         *
+         * @param  int $height
+         * @return self
+         */
+        public function SetHeight($height)
+        {
+            $this->_height = intval($height);
+            $this->_destHeight = intval($height);
+            return $this;
+        }
 		
-		/**
-		 * Set the x
-		 *
-		 * @param  int $x
-		 * @return self
-		 */
-		public function SetX($x)
-		{
-			$this->_x = $x;
-			return $this;
-		}
+        /**
+         * Set the x
+         *
+         * @param  int $x
+         * @return self
+         */
+        public function SetX($x)
+        {
+            $this->_x = $x;
+            return $this;
+        }
 		
-		/**
-		 * Set the y
-		 *
-		 * @param  int $y
-		 * @return self
-		 */
-		public function SetY($y)
-		{
-			$this->_y = $y;
-			return $this;
-		}
+        /**
+         * Set the y
+         *
+         * @param  int $y
+         * @return self
+         */
+        public function SetY($y)
+        {
+            $this->_y = $y;
+            return $this;
+        }
 
-		/**
-		 * If neccesary, fill the background color
-		 * with this color
-		 *
-		 * @param int $r Red
-		 * @param int $g Green
-		 * @param int $b Blue
-		 *
-		 * @return $this
-		 */
-		public function FillBackground($r, $g, $b)
-		{
-			$this->_backgroundColor = array(intval($r), intval($g), intval($b));
-			return $this;
-		}
+        /**
+         * If neccesary, fill the background color
+         * with this color
+         *
+         * @param int $r Red
+         * @param int $g Green
+         * @param int $b Blue
+         *
+         * @return $this
+         */
+        public function FillBackground($r, $g, $b)
+        {
+            $this->_backgroundColor = array(intval($r), intval($g), intval($b));
+            return $this;
+        }
 
-		/**
-		 * @param resource $imageResource
-		 *
-		 * @return resource
-		 */
-		public function Execute($imageResource)
-		{
-			// Create the new image
-			$new = imagecreatetruecolor($this->_width, $this->_height);
+        /**
+         * @param resource $imageResource
+         *
+         * @return resource
+         */
+        public function Execute($imageResource)
+        {
+            // Create the new image
+            $new = imagecreatetruecolor($this->_width, $this->_height);
 			
-			if ($this->_backgroundColor !== null) {
-				$fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
-				imagefill($new, 0, 0, $fill);
-			}
+            if ($this->_backgroundColor !== null) {
+                $fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
+                imagefill($new, 0, 0, $fill);
+            }
 
-			// Preserve transparency
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            // Preserve transparency
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
             imagealphablending($new, false);
             imagesavealpha($new, true);
 			
-			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight);
+            imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

src/images/methods/SmartCrop.php

Indentation +46 added lines, -46 removed lines

@@ -10,62 +10,62 @@
  
 namespace CloudControl\Cms\images\methods
 {
-	class SmartCrop extends Crop
-	{
-		/**
-		 * Use build-in logic to position the smartcrop
-		 *
-		 * @param 	string $x
-		 * @param 	string $y
-		 * @return 	self
-		 */
-		public function SetPosition($x, $y)
-		{
-			$this->SetX($x);
-			$this->SetY($y);
-			return $this;
-		}
+    class SmartCrop extends Crop
+    {
+        /**
+         * Use build-in logic to position the smartcrop
+         *
+         * @param 	string $x
+         * @param 	string $y
+         * @return 	self
+         */
+        public function SetPosition($x, $y)
+        {
+            $this->SetX($x);
+            $this->SetY($y);
+            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 ratios
-			$wRatio = $originalWidth / $this->_width;
-			$hRatio = $originalHeight / $this->_height;
+            // Define the ratios
+            $wRatio = $originalWidth / $this->_width;
+            $hRatio = $originalHeight / $this->_height;
 			
-			// Define which ratio will be used, depending on which is the biggest side
-			$ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
-			if ($ratio < 1) $ratio = 1;
+            // Define which ratio will be used, depending on which is the biggest side
+            $ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
+            if ($ratio < 1) $ratio = 1;
 			
-			// Calculate the destination width, height, x and y
-			$this->_destWidth = $originalWidth / $ratio;
-			$this->_destHeight = $originalHeight / $ratio;
-			$this->_destX = ($this->_width - $this->_destWidth) / 2;
-			$this->_destY = ($this->_height - $this->_destHeight) / 2;
+            // Calculate the destination width, height, x and y
+            $this->_destWidth = $originalWidth / $ratio;
+            $this->_destHeight = $originalHeight / $ratio;
+            $this->_destX = ($this->_width - $this->_destWidth) / 2;
+            $this->_destY = ($this->_height - $this->_destHeight) / 2;
 			
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Create the new image
-			$new = imagecreatetruecolor($this->_width, $this->_height);
+            // Create the new image
+            $new = imagecreatetruecolor($this->_width, $this->_height);
 			
-			if ($this->_backgroundColor !== null) {
-				$fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
-				imagefill($new, 0, 0, $fill);
-			}
+            if ($this->_backgroundColor !== null) {
+                $fill = imagecolorallocate($new, $this->_backgroundColor[0], $this->_backgroundColor[1], $this->_backgroundColor[2]);
+                imagefill($new, 0, 0, $fill);
+            }
 
-			// Preserve transparency
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            // Preserve transparency
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
             imagealphablending($new, false);
             imagesavealpha($new, true);
 			
-			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
+            imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 			
 			// Define which ratio will be used, depending on which is the biggest side
 			$ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
-			if ($ratio < 1) $ratio = 1;
+			if ($ratio < 1) {
+			    $ratio = 1;
+			}
 			
 			// Calculate the destination width, height, x and y
 			$this->_destWidth = $originalWidth / $ratio;

src/images/methods/Grayscale.php

Indentation +12 added lines, -12 removed lines

@@ -12,18 +12,18 @@
     use CloudControl\Cms\images\IMethod;
 
     class Grayscale extends IMethod
-	{		
-		public function Execute($imageResource)
-		{			
-			// Preserve transparency
-			imagecolortransparent($imageResource, imagecolorallocatealpha($imageResource, 0, 0, 0, 127));
-			imagealphablending($imageResource, false);
-			imagesavealpha($imageResource, true);
+    {		
+        public function Execute($imageResource)
+        {			
+            // Preserve transparency
+            imagecolortransparent($imageResource, imagecolorallocatealpha($imageResource, 0, 0, 0, 127));
+            imagealphablending($imageResource, false);
+            imagesavealpha($imageResource, true);
 			
-			// Make grayscale
-			imagefilter($imageResource, IMG_FILTER_GRAYSCALE);
+            // Make grayscale
+            imagefilter($imageResource, IMG_FILTER_GRAYSCALE);
 			
-			return $imageResource;
-		}
-	}
+            return $imageResource;
+        }
+    }
 }
\ No newline at end of file

src/templates/documents/brick.php

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>

Braces +3 added lines, -1 removed lines

@@ -14,8 +14,10 @@
 				<? if (isset($dynamicBrick)) :
 					$fieldSlug = $field->slug;
 					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
-				else :
+				else {
+				    :
 					$value = '';
+				}
 				endif ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 				<ul class="grid-wrapper sortable">

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -83,7 +83,7 @@ 
 							<? 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 ?>

src/templates/documents/function.renderDocument.php

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