jenskooij / cloudcontrol

cloudcontrol/library/cc/Application.php

Doc Comments +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 		 * Loop through sitemap items and see if one matches the requestUri.
 		 * If it does, add it tot the matchedSitemapItems array
 		 *
-		 * @param $request
+		 * @param Request $request
 		 */
 		private function sitemapMatching($request)
 		{
@@ -150,7 +150,7 @@ 
 		 * @param string $template
 		 * @param array  $parameters
 		 *
-		 * @return mixed
+		 * @return Component
 		 * @throws \Exception
 		 */
 		private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem)

Spacing +7 added lines, -7 removed lines

@@ -65,12 +65,12 @@ 
 		 */
 		private function config()
 		{
-			$configPath = __DIR__ . '/../../config.json';
+			$configPath = __DIR__.'/../../config.json';
 			if (realpath($configPath) !== false) {
 				$json = file_get_contents($configPath);
 				$this->config = json_decode($json);
 			} else {
-				throw new \Exception('Couldn\'t find config file in path ' . $configPath);
+				throw new \Exception('Couldn\'t find config file in path '.$configPath);
 			}
 		}
 
@@ -93,7 +93,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -153,17 +153,17 @@ 
 		 * @return mixed
 		 * @throws \Exception
 		 */
-		private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem)
+		private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
 		{
-			$libraryComponentName = '\\library\\components\\' . $class;
-			$userComponentName = '\\components\\' . $class;
+			$libraryComponentName = '\\library\\components\\'.$class;
+			$userComponentName = '\\components\\'.$class;
 			
 			if (\autoLoad($libraryComponentName, false)) {
 				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} elseif (\autoLoad($userComponentName, false)) {
 				$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} else {
-				throw new \Exception('Could not load component ' . $class);
+				throw new \Exception('Could not load component '.$class);
 			}
 			
 			if (!$component instanceof Component) {

cloudcontrol/library/cc/cc.php

Doc Comments +1 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
  * @param array  $replace
  * @param string $delimiter
  *
- * @return mixed|string
+ * @return string
  */
 function slugify($str, $replace=array(), $delimiter='-') {
 	if( !empty($replace) ) {
@@ -130,7 +130,6 @@ 
  * Dumps a var_dump of the passed arguments with <pre> tags surrounding it.
  * Dies afterwards
  *
- * @param mixed $data    The data to be displayed
  */
 function dump()
 {

Spacing +15 added lines, -15 removed lines

@@ -34,14 +34,14 @@ 
 		return '0 seconds';
 	}
 
-	$a = array( 365 * 24 * 60 * 60  =>  'year',
+	$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',
+	$a_plural = array('year'   => 'years',
 					   'month'  => 'months',
 					   'day'    => 'days',
 					   'hour'   => 'hours',
@@ -55,18 +55,18 @@ 
 		if ($d >= 1)
 		{
 			$r = round($d);
-			return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+			return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago';
 		}
 	}
 }
 
-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";
+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";
 }
 
@@ -113,9 +113,9 @@ 
  *
  * @return mixed|string
  */
-function slugify($str, $replace=array(), $delimiter='-') {
-	if( !empty($replace) ) {
-		$str = str_replace((array)$replace, ' ', $str);
+function slugify($str, $replace = array(), $delimiter = '-') {
+	if (!empty($replace)) {
+		$str = str_replace((array) $replace, ' ', $str);
 	}
 
 	$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
@@ -136,13 +136,13 @@ 
 {
 	$debug_backtrace = current(debug_backtrace());
 	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
 		foreach (func_get_args() as $data) {
 			var_dump($data);
 		}
 	} else {
 		ob_clean();
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
 		echo '<pre>';
 		foreach (func_get_args() as $data) {
 			echo "<code>";

Braces +9 added lines, -6 removed lines

@@ -61,12 +61,15 @@
 }
 
 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";
+	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";
 }
 

cloudcontrol/library/images/Image.php

Doc Comments +2 added lines, -1 removed lines

@@ -73,6 +73,7 @@ 
 		 * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
 		 * @param string 	$imagePath
 		 * @param bool 		$getExtension
+		 * @return integer
 		 */
 		public function GetImageMimeType($imagePath, $getExtension = false)
 		{
@@ -93,7 +94,7 @@ 
 		 *
 		 * @see 	http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
 		 * @author 	alexander at alexauto dot nl 
-		 * @param	string		$imagePath
+		 * @param string $p_sFile
 		 * @return  resource
 		 */
 		public function CreateImageFromBmp($p_sFile)

Spacing +34 added lines, -34 removed lines

@@ -32,10 +32,10 @@ 
 					$imageContent = file_get_contents($imageContainer);
 					$this->_imageResource = imagecreatefromstring($imageContent);
 				}
-			} elseif(is_string($imageContainer)) {
+			} 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>');
 			}
 		}
 		
@@ -55,10 +55,10 @@ 
 			
 			if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
 				return imagegif($imageResource, $path);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG)  {
+			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
 				return imagejpeg($imageResource, $path, $quality);
 			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
-				return imagepng($imageResource, $path, (intval($quality / 10) -1));
+				return imagepng($imageResource, $path, (intval($quality / 10) - 1));
 			}
 			else {
 				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
@@ -79,7 +79,7 @@ 
 			if (function_exists('exif_imagetype')) {
 				$exif = exif_imagetype($imagePath);
 			} else {
-				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false ) {
+				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
 					$exif = $type;
 				} else {
 					$exif = false;
@@ -99,84 +99,84 @@ 
 		public function CreateImageFromBmp($p_sFile)
 		{
 			//    Load the image into a string 
-			$file    =    fopen($p_sFile,"rb"); 
-			$read    =    fread($file,10); 
-			while(!feof($file)&&($read<>"")) 
-				$read    .=    fread($file,1024); 
+			$file    = fopen($p_sFile, "rb"); 
+			$read    = fread($file, 10); 
+			while (!feof($file) && ($read <> "")) 
+				$read .= fread($file, 1024); 
 			
-			$temp    =    unpack("H*",$read); 
-			$hex    =    $temp[1]; 
-			$header    =    substr($hex,0,108); 
+			$temp = unpack("H*", $read); 
+			$hex = $temp[1]; 
+			$header = substr($hex, 0, 108); 
 			
 			//    Process the header 
 			//    Structure: http://www.fastgraph.com/help/bmp_header_format.html 
-			if (substr($header,0,4)=="424d") 
+			if (substr($header, 0, 4) == "424d") 
 			{ 
 				//    Cut it in parts of 2 bytes 
-				$header_parts    =    str_split($header,2); 
+				$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); 
 			} 
 			
 			//    Define starting X and Y 
-			$x                =    0; 
-			$y                =    1; 
+			$x                = 0; 
+			$y                = 1; 
 			
 			//    Create newimage 
-			$image            =    imagecreatetruecolor($width,$height); 
+			$image            = imagecreatetruecolor($width, $height); 
 			
 			//    Grab the body from the image 
-			$body            =    substr($hex,108); 
+			$body = substr($hex, 108); 
 
 			//    Calculate if padding at the end-line is needed 
 			//    Divided by two to keep overview. 
 			//    1 byte = 2 HEX-chars 
-			$body_size        =    (strlen($body)/2); 
-			$header_size    =    ($width*$height); 
+			$body_size = (strlen($body) / 2); 
+			$header_size = ($width * $height); 
 
 			//    Use end-line padding? Only when needed 
-			$usePadding        =    ($body_size>($header_size*3)+4); 
+			$usePadding = ($body_size > ($header_size * 3) + 4); 
 			
 			//    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption 
 			//    Calculate the next DWORD-position in the body 
-			for ($i=0;$i<$body_size;$i+=3) 
+			for ($i = 0; $i < $body_size; $i += 3) 
 			{ 
 				//    Calculate line-ending and padding 
-				if ($x>=$width) 
+				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; 
+						$i += $width % 4; 
 					
 					//    Reset horizontal position 
-					$x    =    0; 
+					$x = 0; 
 					
 					//    Raise the height-position (bottom-up) 
 					$y++; 
 					
 					//    Reached the image-height? Break the for-loop 
-					if ($y>$height) 
+					if ($y > $height) 
 						break; 
 				} 
 				
 				//    Calculation of the RGB-pixel (defined as BGR in image-data) 
 				//    Define $i_pos as absolute position in the body 
-				$i_pos    =    $i*2; 
-				$r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]); 
-				$g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]); 
-				$b        =    hexdec($body[$i_pos].$body[$i_pos+1]); 
+				$i_pos    = $i * 2; 
+				$r        = hexdec($body[$i_pos + 4].$body[$i_pos + 5]); 
+				$g        = hexdec($body[$i_pos + 2].$body[$i_pos + 3]); 
+				$b        = hexdec($body[$i_pos].$body[$i_pos + 1]); 
 				
 				//    Calculate and draw the pixel 
-				$color    =    imagecolorallocate($image,$r,$g,$b); 
-				imagesetpixel($image,$x,$height-$y,$color); 
+				$color    = imagecolorallocate($image, $r, $g, $b); 
+				imagesetpixel($image, $x, $height - $y, $color); 
 				
 				//    Raise the horizontal position 
 				$x++; 

Braces +10 added lines, -8 removed lines

@@ -59,8 +59,7 @@ 
 				return imagejpeg($imageResource, $path, $quality);
 			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
 				return imagepng($imageResource, $path, (intval($quality / 10) -1));
-			}
-			else {
+			} else {
 				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
 			}
 			return false;
@@ -101,8 +100,9 @@ 
 			//    Load the image into a string 
 			$file    =    fopen($p_sFile,"rb"); 
 			$read    =    fread($file,10); 
-			while(!feof($file)&&($read<>"")) 
-				$read    .=    fread($file,1024); 
+			while(!feof($file)&&($read<>"")) {
+							$read    .=    fread($file,1024);
+			}
 			
 			$temp    =    unpack("H*",$read); 
 			$hex    =    $temp[1]; 
@@ -153,8 +153,9 @@ 
 				{ 
 					//    If padding needed, ignore image-padding 
 					//    Shift i to the ending of the current 32-bit-block 
-					if ($usePadding) 
-						$i    +=    $width%4; 
+					if ($usePadding) {
+											$i    +=    $width%4;
+					}
 					
 					//    Reset horizontal position 
 					$x    =    0; 
@@ -163,8 +164,9 @@ 
 					$y++; 
 					
 					//    Reached the image-height? Break the for-loop 
-					if ($y>$height) 
-						break; 
+					if ($y>$height) {
+											break;
+					}
 				} 
 				
 				//    Calculation of the RGB-pixel (defined as BGR in image-data) 

cloudcontrol/library/images/ImageResizer.php

Doc Comments +9 added lines

@@ -24,6 +24,9 @@ 
 			$this->imageSet = $imageSet;
 		}
 
+		/**
+		 * @param string $imagePath
+		 */
 		public function applyImageSetToImage($imagePath)
 		{
 			$returnFileNames = array();
@@ -104,6 +107,12 @@ 
 			}
 		}
 
+		/**
+		 * @param string $imagePath
+		 * @param string $modifier
+		 *
+		 * @return string
+		 */
 		private function modifyName($imagePath, $modifier)
 		{
 			$filename = basename($imagePath);

Spacing +15 added lines, -15 removed lines

@@ -40,13 +40,13 @@ 
 				}
 				return $returnFileNames;
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 
-		public function resize($imagePath='', $width='',$height='')
+		public function resize($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-r' . $width . 'x' . $height;
+			$modifier = '-r'.$width.'x'.$height;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -60,13 +60,13 @@ 
 				$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);
 			}
 		}
 
-		public function smartcrop($imagePath='', $width='',$height='')
+		public function smartcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-s' . $width . 'x' . $height;
+			$modifier = '-s'.$width.'x'.$height;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -80,13 +80,13 @@ 
 				$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);
 			}
 		}
 
-		public function boxcrop($imagePath='', $width='',$height='')
+		public function boxcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-b' . $width . 'x' . $height;
+			$modifier = '-b'.$width.'x'.$height;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -100,7 +100,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);
 			}
 		}
 
@@ -114,25 +114,25 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+				$filename = $fileNameWithoutExtension.$modifier.'.'.$extension;
 			} else {
 				$filename = 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 validateFilename($filename, $path)

cloudcontrol/library/images/methods/Watermark.php

Doc Comments +6 added lines, -4 removed lines

@@ -56,8 +56,8 @@ 
 		/**
 		 * Use build-in logic to position the x of watermark
 		 *
-		 * @param 	string $x
-		 * @return 	self
+		 * @param resource $imageResource
+		 * @return 	integer
 		 */
 		protected function calculateX($imageResource)
 		{
@@ -81,8 +81,8 @@ 
 		/**
 		 * Use build-in logic to position the y of watermark
 		 *
-		 * @param 	string $y
-		 * @return 	self
+		 * @param resource $imageResource
+		 * @return 	integer
 		 */
 		public function calculateY($imageResource)
 		{
@@ -131,6 +131,7 @@ 
 		 * Set the x
 		 *
 		 * @param  int | string $x
+		 * @param string $x
 		 * @return self
 		 */
 		public function SetX($x)
@@ -143,6 +144,7 @@ 
 		 * Set the y
 		 *
 		 * @param  int | string $y
+		 * @param string $y
 		 * @return self
 		 */
 		public function SetY($y)

Braces +9 added lines, -3 removed lines

@@ -61,7 +61,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);
 			
@@ -86,7 +88,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);
 			
@@ -123,7 +127,9 @@ 
 		 */
 		public function GetWatermark()
 		{
-			if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
+			if ($this->_watermark == null) {
+				throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
+			}
 			return $this->_watermark;
 		}
 		

cloudcontrol/library/storage/JsonStorage.php

Doc Comments +4 added lines, -1 removed lines

@@ -17,7 +17,7 @@ 
 		/**
 		 * JsonStorage constructor.
 		 *
-		 * @param $storagePath
+		 * @param string $storagePath
 		 */
 		public function __construct($storagePath)
 		{
@@ -837,6 +837,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $path
+		 */
 		private function validateFilename($filename, $path)
 		{
 			$fileParts = explode('.', $filename);

Spacing +34 added lines, -34 removed lines

@@ -33,14 +33,14 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . $this->storagePath;
+			$storagePath = __DIR__.$this->storagePath;
 			if (realpath($storagePath) !== false) {
 				$jsonString = file_get_contents($storagePath);
 				$this->repository = json_decode($jsonString);
 			} else {
 				// Here is some logic for the initialisation of a new clone of the framework
 				initFramework($storagePath);
-				throw new \Exception('Couldnt find storagePath ' . $storagePath);
+				throw new \Exception('Couldnt find storagePath '.$storagePath);
 			}
 		}
 
@@ -185,7 +185,7 @@ 
 
 		public function getDocumentBySlug($slug)
 		{
-			$documentContainer = $this->getDocumentContainerByPath('/' . $slug);
+			$documentContainer = $this->getDocumentContainerByPath('/'.$slug);
 			$indices = $documentContainer['indices'];
 
 			$folder = $this->repository->documents;
@@ -224,7 +224,7 @@ 
 				// Check for duplicates
 				foreach ($this->repository->documents as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'document') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[end($indices)] = $documentFolderObject;
@@ -232,10 +232,10 @@ 
 				// Check for duplicates
 				foreach ($previousFolder->content as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'document') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
-				$previousFolder->content[end($indices)] = $documentFolderObject ;
+				$previousFolder->content[end($indices)] = $documentFolderObject;
 			}
 
 			$this->save();
@@ -249,7 +249,7 @@ 
 				foreach ($this->repository->documents as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'document') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[] = $documentFolderObject;
@@ -271,7 +271,7 @@ 
 					foreach ($containerFolder->content as $document) {
 						if ($document->slug == $documentFolderObject->slug && $document->type == 'document') {
 							// TODO make it so it doesnt throw an exception, but instead shows a warning
-							throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+							throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 						}
 					}
 				}
@@ -354,7 +354,7 @@ 
 				foreach ($this->repository->documents as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'folder') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[] = $documentFolderObject;
@@ -375,7 +375,7 @@ 
 				foreach ($containerFolder->content as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'folder') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$folder->content[] = $documentFolderObject;
@@ -427,7 +427,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$documentContainer = $this->getDocumentContainerByPath('/' . $slug);
+			$documentContainer = $this->getDocumentContainerByPath('/'.$slug);
 			$indices = $documentContainer['indices'];
 
 			$folder = $this->repository->documents;
@@ -473,7 +473,7 @@ 
 				// Check for duplicates
 				foreach ($this->repository->documents as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'folder') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[end($indices)] = $documentFolderObject;
@@ -481,10 +481,10 @@ 
 				// Check for duplicates
 				foreach ($previousFolder->content as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'folder') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
-				$previousFolder->content[end($indices)] = $documentFolderObject ;
+				$previousFolder->content[end($indices)] = $documentFolderObject;
 			}
 
 			$this->save();
@@ -534,7 +534,7 @@ 
 				if ($matched == true) {
 					$noMatches += 1;
 				} else {
-					throw new \Exception('Unknown folder "' . $slug . '" in path: ' . $path);
+					throw new \Exception('Unknown folder "'.$slug.'" in path: '.$path);
 				}
 				$i += 1;
 			}
@@ -546,7 +546,7 @@ 
 					'previousDocument' => $previousDocument
 				);
 			} else {
-				throw new \Exception('Invalid path: ' . $path);
+				throw new \Exception('Invalid path: '.$path);
 			}
 		}
 
@@ -730,13 +730,13 @@ 
 
 		public function addImage($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -758,15 +758,15 @@ 
 
 		public function deleteImageByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
-			$destination = $destinationPath . '/' . $filename;
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
+			$destination = $destinationPath.'/'.$filename;
 
 			$images = $this->getImages();
 
 			foreach ($images as $key => $image) {
 				if ($image->file == $filename) {
 					foreach ($image->set as $imageSetFilename) {
-						$destination = $destinationPath . '/' . $imageSetFilename;
+						$destination = $destinationPath.'/'.$imageSetFilename;
 						if (file_exists($destination)) {
 							unlink($destination);
 						} else {
@@ -803,7 +803,7 @@ 
 		 */
 		public function getFiles()
 		{
-			$files =  $this->repository->files;
+			$files = $this->repository->files;
 			usort($files, array($this, 'compareFiles'));
 			return $files;
 		}
@@ -815,13 +815,13 @@ 
 
 		public function addFile($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -845,23 +845,23 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . '.' . $extension;
+				$filename = $fileNameWithoutExtension.'.'.$extension;
 			} else {
 				$filename = 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->validateFilename($filename,$path);
+				return $this->validateFilename($filename, $path);
 			}
 			return $filename;
 		}
@@ -878,8 +878,8 @@ 
 
 		public function deleteFileByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
-			$destination = $destinationPath . '/' . $filename;
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
+			$destination = $destinationPath.'/'.$filename;
 
 			if (file_exists($destination)) {
 				$files = $this->getFiles();
@@ -1172,11 +1172,11 @@ 
 		 * @throws \Exception
 		 */
 		private function save() {
-			$storagePath = __DIR__ . $this->storagePath;
+			$storagePath = __DIR__.$this->storagePath;
 			if (realpath($storagePath) !== false) {
 				file_put_contents($storagePath, json_encode($this->repository));
 			} else {
-				throw new \Exception('Couldnt find storagePath ' . $storagePath);
+				throw new \Exception('Couldnt find storagePath '.$storagePath);
 			}
 		}
 

cloudcontrol/templates/cms/documents/brick.php

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 	<a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a>
 	<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 </div>
-<?$fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . time() . ']'?>
+<?$fieldPrefix = 'dynamicBricks['.$brick->slug.']['.time().']'?>
 <? foreach ($brick->fields as $field) : ?>
 			<div class="form-element">
 				<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -26,7 +26,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>
@@ -48,7 +48,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">
@@ -58,7 +58,7 @@ 
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -75,10 +75,10 @@ 
 							<a class="btn error js-deletemultiple"><i class="fa fa-times"></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>
@@ -87,5 +87,5 @@ 
 				<a class="btn js-addrtemultiple">+</a>
 				<? endif ?>
 			</div>
-			<?$value='';?>
+			<?$value = ''; ?>
 		<? endforeach ?>

Braces +3 added lines, -1 removed lines

@@ -9,8 +9,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">

cloudcontrol/templates/cms/documents/document-form.php

Spacing +17 added lines, -17 removed lines

@@ -3,7 +3,7 @@ 
 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js"></script>
 <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
 <script>var smallestImage = '<?=$smallestImage?>';</script>
-<?$copyable=''?>
+<?$copyable = ''?>
 <section class="documents">
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
 	<nav class="actions">
@@ -38,7 +38,7 @@ 
 				<label for="state">Published</label>
 				<input<?=isset($document) && $document->state == 'published' ? ' checked="checked"' : '' ?> type="checkbox" id="state" name="state" placeholder="State" />
 			</div>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix = 'fields'; ?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -62,7 +62,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>
@@ -84,7 +84,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">
@@ -94,7 +94,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -111,10 +111,10 @@ 
 								<a class="btn error js-deletemultiple"><i class="fa fa-times"></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>
@@ -123,13 +123,13 @@ 
 					<a class="btn js-addrtemultiple">+</a>
 					<? endif ?>
 				</div>
-				<?$value='';?>
+				<?$value = ''; ?>
 			<? endforeach ?>
 			<hr />
 			<? foreach ($documentType->bricks as $brick) : ?>
 			<div class="brick">
 				<label><?=$brick->title?></label>
-				<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+				<?$fieldPrefix = 'bricks['.$brick->slug.'][fields]'; ?>
 				<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 				<? foreach ($brick->structure->fields as $field) : ?>
 					<div class="form-element">
@@ -155,7 +155,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>
@@ -178,7 +178,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">
@@ -188,7 +188,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -206,10 +206,10 @@ 
 								<a class="btn error js-deletemultiple"><i class="fa fa-times"></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>
@@ -218,11 +218,11 @@ 
 					<a class="btn js-addrtemultiple">+</a>
 					<? endif ?>
 				</div>
-				<?$value='';?>
+				<?$value = ''; ?>
 				<? endforeach ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 			<? if (count($documentType->dynamicBricks) > 0) : ?>
 			<div class="dynamicBrickWrapper">
 				<label>Dynamic Bricks</label>
@@ -241,7 +241,7 @@ 
 						endforeach ?>
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
-							<?include(__DIR__ . '/brick.php')?>
+							<?include(__DIR__.'/brick.php')?>
 						</li>
 					<? endforeach ?>
 				<? endif ?>

Braces +6 added lines, -2 removed lines

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

cloudcontrol/templates/cms/documents/fieldTypes/Rich-Text.php

Spacing +2 added lines, -2 removed lines

@@ -6,12 +6,12 @@
 }
 ?>
 <div class="rte">
-	<div id="summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div>
+	<div id="summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div>
 </div>
 <textarea style="display:none;" id="summernote_<?=$field->slug?>_container_<?=$summernoteInstances?>" name="<?=$fieldPrefix?>[<?=$field->slug?>][]"></textarea>
 <script>
 	$(document).ready(function () {
-		$('#summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>').summernote({
+		$('#summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>').summernote({
 			height: 300,
 			toolbar: [
 				//[groupname, [button list]]