jenskooij / cloudcontrol

src/images/Image.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 			} elseif (is_string($imageContainer)) {
 				$this->_imageResource = imagecreatefromstring($imageContainer);
 			} else {
-				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>' . var_export($imageContainer, true) . '</pre>');
+				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>'.var_export($imageContainer, true).'</pre>');
 			}
 		}
 
@@ -179,9 +179,9 @@ 
 				//    Cut it in parts of 2 bytes
 				$header_parts = str_split($header, 2);
 				//    Get the width        4 bytes
-				$width = hexdec($header_parts[19] . $header_parts[18]);
+				$width = hexdec($header_parts[19].$header_parts[18]);
 				//    Get the height        4 bytes
-				$height = hexdec($header_parts[23] . $header_parts[22]);
+				$height = hexdec($header_parts[23].$header_parts[22]);
 				//    Unset the header params
 				unset($header_parts);
 
@@ -226,9 +226,9 @@ 
 				}
 				//    Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body
 				$iPos = $i * 2;
-				$r = hexdec($body[$iPos + 4] . $body[$iPos + 5]);
-				$g = hexdec($body[$iPos + 2] . $body[$iPos + 3]);
-				$b = hexdec($body[$iPos] . $body[$iPos + 1]);
+				$r = hexdec($body[$iPos + 4].$body[$iPos + 5]);
+				$g = hexdec($body[$iPos + 2].$body[$iPos + 3]);
+				$b = hexdec($body[$iPos].$body[$iPos + 1]);
 				//    Calculate and draw the pixel
 				$color = imagecolorallocate($image, $r, $g, $b);
 				imagesetpixel($image, $x, $height - $y, $color);

src/images/methods/Resize.php

Spacing +1 added lines, -1 removed lines

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

src/images/methods/BoxCrop.php

Spacing +2 added lines, -2 removed lines

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

src/images/ImageResizer.php

Spacing +18 added lines, -18 removed lines

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

src/cc/Application.php

Spacing +10 added lines, -10 removed lines

@@ -66,7 +66,7 @@ 
          */
         private function config()
         {
-            $configPath = __DIR__ . '/../../config.json';
+            $configPath = __DIR__.'/../../config.json';
             if (realpath($configPath) !== false) {
                 $json = file_get_contents($configPath);
                 $this->config = json_decode($json);
@@ -86,7 +86,7 @@ 
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($redirects as $redirect) {
                 if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
@@ -96,10 +96,10 @@ 
                     }
                     if ($redirect->type == '301') {
                         header('HTTP/1.1 301 Moved Permanently');
-                        header('Location: ' . $request::$subfolders . $toUrl);
+                        header('Location: '.$request::$subfolders.$toUrl);
                         exit;
                     } elseif ($redirect->type == '302') {
-                        header('Location: ' . $request::$subfolders . $toUrl, true, 302);
+                        header('Location: '.$request::$subfolders.$toUrl, true, 302);
                         exit;
                     } else {
                         throw new \Exception('Invalid redirect type.');
@@ -117,7 +117,7 @@ 
         private function sitemapMatching($request)
         {
             $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($sitemap as $sitemapItem) {
                 if ($sitemapItem->regex) {
@@ -182,15 +182,15 @@ 
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
         {
-            $libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
+            $libraryComponentName = '\\CloudControl\Cms\\components\\'.$class;
+            $userComponentName = '\\components\\'.$class;
 
             if (!class_exists($libraryComponentName, false)) {
                 $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } elseif (!class_exists($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) {
@@ -248,8 +248,8 @@ 
          */
         public function setCachingHeaders()
         {
-            header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-            header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+            header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
+            header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
         }
 
         /**

src/cc/Request.php

Spacing +5 added lines, -5 removed lines

@@ -45,23 +45,23 @@
 		 */
 		public function __construct() 
 		{
-            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$subfolders = str_replace('//', '/', self::$subfolders);
 			if (PHP_SAPI === 'cli') {
 				global $argv;
 				array_shift($argv);
 				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
+				self::$requestUri = self::$subfolders.implode('/', $argv);
 			} else {
 				self::$requestUri = $_SERVER['REQUEST_URI'];
 				self::$queryString = $_SERVER['QUERY_STRING'];
 			}
 			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
 			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			}
 
 			self::$requestParameters = explode('/', self::$relativeUri);

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

src/templates/documents/function.renderDocument.php

Spacing +5 added lines, -5 removed lines

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