jenskooij / cloudcontrol

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/images/ImageResizer.php

Doc Comments +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 		}
 
 		/**
-		 * @param $imagePath
+		 * @param string $imagePath
 		 *
 		 * @return array
 		 * @throws \Exception
@@ -112,7 +112,7 @@ 
 		}
 
 		/**
-		 * @param        $imagePath
+		 * @param        string $imagePath
 		 * @param string $modifier
 		 *
 		 * @return string

Spacing +16 added lines, -16 removed lines

@@ -47,13 +47,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();
@@ -67,13 +67,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();
@@ -87,13 +87,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();
@@ -107,7 +107,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);
 			}
 		}
 
@@ -117,7 +117,7 @@ 
 		 *
 		 * @return string
 		 */
-		private function modifyName($imagePath, $modifier='')
+		private function modifyName($imagePath, $modifier = '')
 		{
 			$filename = basename($imagePath);
 			$path = dirname($imagePath);
@@ -127,25 +127,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/Crop.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);