jenskooij / cloudcontrol

src/images/methods/SmartCrop.php

Indentation +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $originalWidth, $originalHeight);
 			

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,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/BoxCrop.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		/**
 		 * @param resource $imageResource
 		 * @return resource
-         */
+		 */
 		public function Execute($imageResource)
 		{
 			// Define the origial width and height

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

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 			
 			// 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);

src/images/methods/Grayscale.php

Indentation +2 added lines, -2 removed lines

@@ -9,9 +9,9 @@
 namespace CloudControl\Cms\images\methods
 {
 
-    use CloudControl\Cms\images\IMethod;
+	use CloudControl\Cms\images\IMethod;
 
-    class Grayscale extends IMethod
+	class Grayscale extends IMethod
 	{		
 		public function Execute($imageResource)
 		{			

src/images/ImageResizer.php

Indentation +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 namespace CloudControl\Cms\images
 {
 
-    use CloudControl\Cms\cc\StringUtil;
+	use CloudControl\Cms\cc\StringUtil;
 
-    /**
+	/**
 	 * Class ImageResizer
 	 * @package CloudControl\Cms\images
 	 */

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

src/cc/Request.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 namespace CloudControl\Cms\cc
 {
-    /**
-     * Class Request
-     * @package CloudControl\Cms\cc
-     */
+	/**
+	 * Class Request
+	 * @package CloudControl\Cms\cc
+	 */
 	class Request {
 
 		/**
@@ -45,7 +45,7 @@ 
 		 */
 		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('//', '/', self::$subfolders);

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

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

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

Braces +9 added lines, -6 removed lines

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

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

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

src/templates/documents/brick.php

Indentation +2 added lines, -2 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">

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

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">