jenskooij / cloudcontrol

cloudcontrol/templates/cms/documents/brick.php

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

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/methods/Watermark.php

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

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/cc/cc.php

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

cloudcontrol/library/storage/JsonStorage.php

Indentation +3 added lines, -3 removed lines

@@ -786,7 +786,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getImageByName($filename)
 		{
 			$images = $this->getImages();
@@ -876,7 +876,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getFileByName($filename)
 		{
 			$files = $this->getFiles();
@@ -891,7 +891,7 @@ 
 		/**
 		 * @param $filename
 		 * @throws \Exception
-         */
+		 */
 		public function deleteFileByName($filename)
 		{
 			$destinationPath = realpath(__DIR__ . '/../../www/files/');

cloudcontrol/library/cc/errorhandler.php

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);
     }
 }
@@ -85,7 +85,9 @@ 
  * @param string $httpHeader
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
-    if (ob_get_contents()) ob_end_clean();
+    if (ob_get_contents()) {
+    	ob_end_clean();
+    }
     header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
     header('X-Error-Message: ' . $message);
     header('X-Error-File: ' . $file);

Indentation +112 added lines, -112 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);
 }
 
@@ -85,102 +85,102 @@ 
  * @param string $httpHeader
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
-    if (ob_get_contents()) ob_end_clean();
+	if (ob_get_contents()) ob_end_clean();
 
-    if (canShowError()) {
-        $file_lines = file_exists($file) ? file($file) : array();
-        $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
-        $lines = array();
+	if (canShowError()) {
+		$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];
-            }
-        }
+		foreach ($range as $line_number) {
+			if(isset($file_lines[$line_number-1])) {
+				$lines[$line_number] = $file_lines[$line_number-1];
+			}
+		}
 
-        $error = array(
-            'message' 		=> $message,
-            'file' 			=> $file,
-            'line' 			=> $line,
-            'code' 			=> $code,
-            'lines' 		=> $lines,
-            'trace' 		=> $trace,
-            'httpHeader' 	=> $httpHeader,
-        );
+		$error = array(
+			'message' 		=> $message,
+			'file' 			=> $file,
+			'line' 			=> $line,
+			'code' 			=> $code,
+			'lines' 		=> $lines,
+			'trace' 		=> $trace,
+			'httpHeader' 	=> $httpHeader,
+		);
 
-        if (PHP_SAPI === 'cli') {
-            renderCliException($message, $file, $line, $code, $trace, $lines);
-        }
+		if (PHP_SAPI === 'cli') {
+			renderCliException($message, $file, $line, $code, $trace, $lines);
+		}
 
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
-        } else {
-            header('Content-type: application/json');
-            die(json_encode($error));
-        }
-        exit;
-    } else {
-        header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-        header('X-Error-Message: ' . $message);
-        header('X-Error-File: ' . $file);
-        header('X-Error-Line: ' . $line);
-        if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
-            include(realpath(__DIR__) . '/errorviewcompact.php');
-        } else {
-            header('Content-type: application/json');
-            die(json_encode('An error occured.'));
-        }
-    }
+		if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
+			include(realpath(__DIR__) . '/errorviewdetailed.php');
+		} else {
+			header('Content-type: application/json');
+			die(json_encode($error));
+		}
+		exit;
+	} else {
+		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+		header('X-Error-Message: ' . $message);
+		header('X-Error-File: ' . $file);
+		header('X-Error-Line: ' . $line);
+		if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
+			include(realpath(__DIR__) . '/errorviewcompact.php');
+		} else {
+			header('Content-type: application/json');
+			die(json_encode('An error occured.'));
+		}
+	}
 }
 
 function canShowError()
 {
-    if (PHP_SAPI === 'cli') {
-        return true;
-    }
-    if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
-        $config = file_get_contents('../config.json');
-        $config = json_decode($config);
-        if (isset($config->showErrorsToAll)) {
-            return $config->showErrorsToAll;
-        }
-    } else {
-        return true;
-    }
+	if (PHP_SAPI === 'cli') {
+		return true;
+	}
+	if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
+		$config = file_get_contents('../config.json');
+		$config = json_decode($config);
+		if (isset($config->showErrorsToAll)) {
+			return $config->showErrorsToAll;
+		}
+	} else {
+		return true;
+	}
 }
 
 function renderCliException($message, $file, $line, $code, $trace, $lines)
 {
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    echo '  ' . $message . PHP_EOL;
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    echo '  ' . $file . ':' . $line . PHP_EOL;
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo PHP_EOL;
-    foreach($lines as $nr => $currentLine) {
-        echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
-    }
-    echo PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
-    echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
-    echo '------------------------------------------------------------------------------------------------------------------------------------------------' . 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;
-    }
-    exit;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| THE FOLLOWING ERROR OCCURED                                                                                                                  |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	echo '  ' . $message . PHP_EOL;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| IN FILE                                                                                                                                      |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	echo '  ' . $file . ':' . $line . PHP_EOL;
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| CONTENTS OF THE FILE                                                                                                                         |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo PHP_EOL;
+	foreach($lines as $nr => $currentLine) {
+		echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+	}
+	echo PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . PHP_EOL;
+	echo '| STACK TRACE                                                                                                                                  |' . PHP_EOL;
+	echo '------------------------------------------------------------------------------------------------------------------------------------------------' . 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;
+	}
+	exit;
 }
\ No newline at end of file