jenskooij / cloudcontrol

cloudcontrol/library/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

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

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

cloudcontrol/library/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;

cloudcontrol/library/crypt/Crypt.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 				$output = '';
 				for ($i = 0; $i < $count; $i += 16) {
 					$random_state =
-						md5(microtime() . $random_state);
+						md5(microtime().$random_state);
 					$output .=
 						pack('H*', md5($random_state));
 				}

cloudcontrol/library/components/BaseComponent.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -86,9 +86,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='')
+		public function renderTemplate($template = '')
 		{
-			$templatePath = __DIR__ . '/../../templates/' . $template . '.php';
+			$templatePath = __DIR__.'/../../templates/'.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				ob_clean();
 				$this->parameters['request'] = $this->request;
@@ -96,7 +96,7 @@ 
 				include($templatePath);
 				return ob_get_contents();
 			} else {
-				throw new \Exception('Couldnt find template ' . $templatePath);
+				throw new \Exception('Couldnt find template '.$templatePath);
 			}
 		}
 	}

cloudcontrol/library/components/CmsComponent.php

Spacing +36 added lines, -36 removed lines

@@ -125,7 +125,7 @@ 
 				$this->parameters['mainNavClass'] = 'documents';
 				if (isset($request::$post['title'], $request::$post['path'])) {
 					$this->storage->addDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/documents/new-document' && isset($request::$get['path']) && in_array('documents', $userRights)) {
@@ -135,7 +135,7 @@ 
 				if (isset($request::$get['documentType'])) {
 					if (isset($request::$post['title'], $request::$get['documentType'], $request::$get['path'])) {
 						$this->storage->addDocument($request::$post);
-						header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+						header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 						exit;
 					}
 					$this->parameters['documentType'] = $this->storage->getDocumentTypeBySlug($request::$get['documentType'], true);
@@ -149,7 +149,7 @@ 
 				$this->parameters['smallestImage'] = $this->storage->getSmallestImageSet()->slug;
 				if (isset($request::$post['title'], $request::$get['slug'])) {
 					$this->storage->saveDocument($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 				$this->parameters['document'] = $this->storage->getDocumentBySlug($request::$get['slug']);
@@ -170,11 +170,11 @@ 
 				array_pop($path);
 				$path = implode('/', $path);
 
-				$request::$get['path'] = '/' . $path;
+				$request::$get['path'] = '/'.$path;
 
 				if (isset($request::$post['title'], $request::$post['content'])) {
 					$this->storage->saveDocumentFolder($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 					exit;
 				}
 
@@ -182,11 +182,11 @@ 
 				$this->parameters['folder'] = $folder;
 			} else if ($relativeCmsUri == '/documents/delete-document' && isset($request::$get['slug']) && in_array('documents', $userRights)) {
 				$this->storage->deleteDocumentBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			} else if ($relativeCmsUri == '/documents/delete-folder' && isset($request::$get['slug']) && in_array('documents', $userRights)) {
 				$this->storage->deleteDocumentFolderBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/documents');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/documents');
 				exit;
 			} elseif ($relativeCmsUri == '/sitemap' && in_array('sitemap', $userRights)) {
 				$template = 'cms/sitemap';
@@ -200,7 +200,7 @@ 
 				$this->parameters['mainNavClass'] = 'sitemap';
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->addSitemapItem($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get['slug']) && in_array('sitemap', $userRights)) {
@@ -209,13 +209,13 @@ 
 				$sitemapItem = $this->storage->getSitemapItemBySlug($request::$get['slug']);
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->saveSitemapItem($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 				$this->parameters['sitemapItem'] = $sitemapItem;
 			} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get['slug']) && in_array('sitemap', $userRights)) {
 				$this->storage->deleteSitemapItemBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 				exit;
 			} elseif ($relativeCmsUri == '/images' && in_array('images', $userRights)) {
 				$template = 'cms/images';
@@ -231,12 +231,12 @@ 
 				$this->parameters['mainNavClass'] = 'images';
 				if (isset($_FILES['file'])) {
 					$this->storage->addImage($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/images/delete' && isset($request::$get['file']) && in_array('images', $userRights)) {
 				$this->storage->deleteImageByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/images');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/images');
 				exit;
 			} elseif ($relativeCmsUri == '/images/show' && isset($request::$get['file']) && in_array('images', $userRights)) {
 				$template = 'cms/images/show';
@@ -255,30 +255,30 @@ 
 				$this->parameters['mainNavClass'] = 'files';
 				if (isset($_FILES['file'])) {
 					$this->storage->addFile($_FILES['file']);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/files/get' && isset($request::$get['file']) && in_array('files', $userRights)) {
 				$file = $this->storage->getFileByName($request::$get['file']);
-				$path = realpath(__DIR__ . '/../../www/files/');
-				$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-				$size   = filesize($path . '/' . $file->file);
+				$path = realpath(__DIR__.'/../../www/files/');
+				$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+				$size   = filesize($path.'/'.$file->file);
 
 				header('Content-Description: File Transfer');
-				header('Content-Type: ' . $file->type);
-				header('Content-Disposition: attachment; filename=' . $quoted);
+				header('Content-Type: '.$file->type);
+				header('Content-Disposition: attachment; filename='.$quoted);
 				header('Content-Transfer-Encoding: binary');
 				header('Connection: Keep-Alive');
 				header('Expires: 0');
 				header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 				header('Pragma: public');
-				header('Content-Length: ' . $size);
+				header('Content-Length: '.$size);
 
-				readfile($path . '/' . $file->file);
+				readfile($path.'/'.$file->file);
 				exit;
 			} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get['file']) && in_array('files', $userRights)) {
 				$this->storage->deleteFileByName($request::$get['file']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/files');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/files');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration' && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration';
@@ -292,12 +292,12 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($_POST['username'])) {
 					$this->storage->addUser($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/users/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteUserBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/users/edit' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration/users-form';
@@ -305,7 +305,7 @@ 
 				$this->parameters['user'] = $this->storage->getUserBySlug($request::$get['slug']);
 				if (isset($_POST['username'])) {
 					$this->storage->saveUser($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/users');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/users');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/document-types' && in_array('configuration', $userRights)) {
@@ -318,7 +318,7 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->addDocumentType($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['bricks'] = $bricks;
@@ -329,14 +329,14 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->saveDocumentType($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['documentType'] = $documentType;
 				$this->parameters['bricks'] = $bricks;
 			} elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteDocumentTypeBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/bricks' && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration/bricks';
@@ -347,7 +347,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addBrick($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
@@ -356,13 +356,13 @@ 
 				$brick = $this->storage->getBrickBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveBrick($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 				$this->parameters['brick'] = $brick;
 			} elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteBrickBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/image-set' && in_array('configuration', $userRights)) {
 				$template = 'cms/configuration/image-set';
@@ -374,7 +374,7 @@ 
 				$imageSet = $this->storage->getImageSetBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveImageSet($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 				$this->parameters['imageSet'] = $imageSet;
@@ -383,17 +383,17 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addImageSet($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/image-set/delete' && isset($request::$get['slug']) && in_array('configuration', $userRights)) {
 				$this->storage->deleteImageSetBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/image-set');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/image-set');
 				exit;
 			} elseif ($relativeCmsUri == '/log-off') {
 				$_SESSION['cloudcontrol'] = null;
 				unset($_SESSION['cloudcontrol']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix']);
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix']);
 				exit;
 			}
 
@@ -408,7 +408,7 @@ 
 				$whitelistIps = explode(',', $this->parameters['whitelistIps']);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -419,7 +419,7 @@ 
 				$blacklistIps = explode(',', $this->parameters['blacklistIps']);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}

cloudcontrol/library/cc/autoloader.php

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 spl_autoload_extensions('.php');
 spl_autoload_register("autoloader");
 
-$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 
 /**
  * The function to be registered as the default autoload functino
@@ -32,14 +32,14 @@ 
 	}
 	
 	global $rootPath;
-	$file = $rootPath . str_replace('\\', '/', $class) . ".php";
+	$file = $rootPath.str_replace('\\', '/', $class).".php";
 	$debug_backtrace = debug_backtrace();
 	
 	if (file_exists($file)) {
 		require_once($file);
 		if ($throwException) {
 			if (class_exists($class, false) == false && interface_exists($class, false) == false) {
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file);
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file);
 			} else {
 				return true;
 			}
@@ -48,13 +48,13 @@ 
 	} else {
 		if (isset($debug_backtrace[2]) && isset($debug_backtrace[2]['file']) && isset($debug_backtrace[2]['line'])) {			
 			if ($throwException) {
-				errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
+				errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
 			} else {
 				return false;
 			}			
 		} else {
 			if ($throwException) {
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.');
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.');
 			} else {
 				return false;
 			}

cloudcontrol/library/cc/errorhandler.php

Indentation +34 added lines, -34 removed lines

@@ -31,11 +31,11 @@ 
  */
 function shutdownHandler () {
 	$error = error_get_last(); 
-    if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
-        dump($error);
-    }
+	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
+		errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+	}elseif ($error['type'] == 1) {
+		dump($error);
+	}
 }
 
 /**
@@ -49,28 +49,28 @@ 
 	$jsonErrorNr = json_last_error();
 	$errstr = '';
 	switch ($jsonErrorNr) {
-        case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
-        break;
-        case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
-        break;
-        case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
-        break;
-        case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
-        break;
-        case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
-        break;
-        case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
-        break;
-        default:
-            $errstr = ' - Unknown error' . PHP_EOL;
-        break;
-    }
+		case JSON_ERROR_NONE:
+			$errstr .= ' - No errors' . PHP_EOL;
+		break;
+		case JSON_ERROR_DEPTH:
+			$errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+		break;
+		case JSON_ERROR_STATE_MISMATCH:
+			$errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+		break;
+		case JSON_ERROR_CTRL_CHAR:
+			$errstr .= ' - Unexpected control character found' . PHP_EOL;
+		break;
+		case JSON_ERROR_SYNTAX:
+			$errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+		break;
+		case JSON_ERROR_UTF8:
+			$errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+		break;
+		default:
+			$errstr = ' - Unknown error' . PHP_EOL;
+		break;
+	}
 	errorHandler ($jsonErrorNr, $errstr, $file, $line);
 }
 
@@ -86,14 +86,14 @@ 
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
 	$file_lines = file_exists($file) ? file($file) : array();
-    $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
-    $lines = array();
+	$range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
+	$lines = array();
 
-    foreach ($range as $line_number) {
-        if(isset($file_lines[$line_number-1])) {
-            $lines[$line_number] = $file_lines[$line_number-1];
-        }
-    }
+	foreach ($range as $line_number) {
+		if(isset($file_lines[$line_number-1])) {
+			$lines[$line_number] = $file_lines[$line_number-1];
+		}
+	}
 	if (ob_get_contents()) ob_end_clean();
 	$error = array(
 		'message' 		=> $message,

Spacing +19 added lines, -19 removed lines

@@ -9,8 +9,8 @@ 
  *
  * @param $e
  */
-function exceptionHandler ($e) {
-	renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
+function exceptionHandler($e) {
+	renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
 }
 
 /**
@@ -21,18 +21,18 @@ 
  * @param $errfile
  * @param $errline
  */
-function errorHandler ($errno, $errstr, $errfile, $errline) {
-	renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
+function errorHandler($errno, $errstr, $errfile, $errline) {
+	renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
 }
 
 /**
  * When an error occurs that kills the process, still try
  * to show it using a shutdownHandler.
  */
-function shutdownHandler () {
+function shutdownHandler() {
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+        errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
     }elseif ($error['type'] == 1) {
         dump($error);
     }
@@ -50,28 +50,28 @@ 
 	$errstr = '';
 	switch ($jsonErrorNr) {
         case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
+            $errstr .= ' - No errors'.PHP_EOL;
         break;
         case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+            $errstr .= ' - Maximum stack depth exceeded'.PHP_EOL;
         break;
         case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+            $errstr .= ' - Underflow or the modes mismatch'.PHP_EOL;
         break;
         case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
+            $errstr .= ' - Unexpected control character found'.PHP_EOL;
         break;
         case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+            $errstr .= ' - Syntax error, malformed JSON'.PHP_EOL;
         break;
         case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded'.PHP_EOL;
         break;
         default:
-            $errstr = ' - Unknown error' . PHP_EOL;
+            $errstr = ' - Unknown error'.PHP_EOL;
         break;
     }
-	errorHandler ($jsonErrorNr, $errstr, $file, $line);
+	errorHandler($jsonErrorNr, $errstr, $file, $line);
 }
 
 /**
@@ -84,14 +84,14 @@ 
  * @param array  $trace
  * @param string $httpHeader
  */
-function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
+function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
 	$file_lines = file_exists($file) ? file($file) : array();
     $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
     $lines = array();
 
     foreach ($range as $line_number) {
-        if(isset($file_lines[$line_number-1])) {
-            $lines[$line_number] = $file_lines[$line_number-1];
+        if (isset($file_lines[$line_number - 1])) {
+            $lines[$line_number] = $file_lines[$line_number - 1];
         }
     }
 	if (ob_get_contents()) ob_end_clean();
@@ -104,8 +104,8 @@ 
 		'trace' 		=> $trace,
 		'httpHeader' 	=> $httpHeader,
 	);
-	if (file_exists(realpath(__DIR__) . '/errorview.php')) {
-		include(realpath(__DIR__) . '/errorview.php');
+	if (file_exists(realpath(__DIR__).'/errorview.php')) {
+		include(realpath(__DIR__).'/errorview.php');
 	} else {
 		header('Content-type: application/json');
 		die(json_encode($error));

Braces +4 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
         errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
+    } elseif ($error['type'] == 1) {
         dump($error);
     }
 }
@@ -94,7 +94,9 @@ 
             $lines[$line_number] = $file_lines[$line_number-1];
         }
     }
-	if (ob_get_contents()) ob_end_clean();
+	if (ob_get_contents()) {
+		ob_end_clean();
+	}
 	$error = array(
 		'message' 		=> $message,
 		'file' 			=> $file,

cloudcontrol/library/cc/Request.php

Spacing +2 added lines, -2 removed lines

@@ -47,10 +47,10 @@
 		{
 			global $rootPath;
 			
-			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::$requestUri = $_SERVER['REQUEST_URI'];
 			self::$queryString = $_SERVER['QUERY_STRING'];
-			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);
 			
 			self::$get = $_GET;

cloudcontrol/library/cc/Application.php

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