cadmium-org / cadmium-cms

www/engine/Framework/Exception.php

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 
 		public function __construct(string $message = '') {
 
-			if ('' !== $message) $this->message = $message;
+			if ('' !== $message) {
+				$this->message = $message;
+			}
 		}
 	}
 

Spacing +4 added lines, -4 removed lines

@@ -37,22 +37,22 @@
 		}
 	}
 
-	class ClassLoad extends Exception  {
+	class ClassLoad extends Exception {
 
 		protected $message = 'Class \'$value$\' not found';
 	}
 
-	class DBConnect extends Exception  {
+	class DBConnect extends Exception {
 
 		protected $message = 'Unable to connect to database';
 	}
 
-	class DBCharset extends Exception  {
+	class DBCharset extends Exception {
 
 		protected $message = 'Unable to set database charset';
 	}
 
-	class DBSelect extends Exception  {
+	class DBSelect extends Exception {
 
 		protected $message = 'Unable to select database';
 	}

www/engine/Main.php

Braces +12 added lines, -6 removed lines

@@ -2,7 +2,9 @@ 
 
 # Check PHP version
 
-if (version_compare(PHP_VERSION, '7.0.0') < 0) exit('PHP version 7 or higher is required.');
+if (version_compare(PHP_VERSION, '7.0.0') < 0) {
+	exit('PHP version 7 or higher is required.');
+}
 
 # Set error reporting
 
@@ -37,9 +39,11 @@ 
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
-
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	} else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	}
 
 	# Check if class exists
 
@@ -50,5 +54,7 @@ 
 
 	# Call autoload method
 
-	if (method_exists($class_name, '__autoload')) $class_name::__autoload();
-});
+	if (method_exists($class_name, '__autoload')) {
+		$class_name::__autoload();
+	}
+	});

Spacing +9 added lines, -9 removed lines

@@ -17,22 +17,22 @@ 
 
 # Define constants
 
-define('DIR_ENGINE',        (dirname(__FILE__) . '/'));
+define('DIR_ENGINE', (dirname(__FILE__).'/'));
 
-define('DIR_WWW',           (DIR_ENGINE . '../'));
-define('DIR_UPLOADS',       (DIR_ENGINE . '../uploads/'));
+define('DIR_WWW', (DIR_ENGINE.'../'));
+define('DIR_UPLOADS', (DIR_ENGINE.'../uploads/'));
 
 # Require framework main file
 
-require_once(DIR_ENGINE . 'Framework/Main.php');
+require_once(DIR_ENGINE.'Framework/Main.php');
 
 # Require system main file
 
-require_once(DIR_ENGINE . 'System/Main.php');
+require_once(DIR_ENGINE.'System/Main.php');
 
 # Register classes autoloader
 
-spl_autoload_register(function ($class_name) {
+spl_autoload_register(function($class_name) {
 
 	$path = explode('\\', $class_name); $last = $path[count($path) - 1];
 
@@ -40,13 +40,13 @@ 
 
 	$system_classes = ['Addons', 'Frames', 'Modules', 'Schemas', 'Utils', 'Dispatcher', 'Installer'];
 
-	$path = ((in_array($path[0], $system_classes, true) ? DIR_SYSTEM_CLASSES : DIR_CLASSES) . implode('/', $path));
+	$path = ((in_array($path[0], $system_classes, true) ? DIR_SYSTEM_CLASSES : DIR_CLASSES).implode('/', $path));
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path.'.php')) && @is_file($file_name)) require_once $file_name;
 
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	else if (@file_exists($file_name = ($path.'/'.$last.'.php')) && @is_file($file_name)) require_once $file_name;
 
 	# Check if class exists
 

www/engine/System/Classes/Utils/Validate.php

Braces +6 added lines, -2 removed lines

@@ -49,9 +49,13 @@
 
 		public static function url(string $value) {
 
-			if (false === ($value = parent::url($value))) return false;
+			if (false === ($value = parent::url($value))) {
+				return false;
+			}
 
-			if (!preg_match('/^https?:\/\//', $value)) return false;
+			if (!preg_match('/^https?:\/\//', $value)) {
+				return false;
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Number/Number.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 				$number = number_format(($number / pow(1024, $exponent)), (($exponent < 2) ? $exponent : 2));
 
-				return (floatval($number) . ' ' . $text);
+				return (floatval($number).' '.$text);
 			}
 
 			# ------------------------

Braces +33 added lines, -11 removed lines

@@ -17,11 +17,17 @@ 
 
 		public static function forceInt($number, int $min = 0, int $max = 0) : int {
 
-			if (!is_numeric($number) || (($number = intval($number)) < 0)) $number = 0;
+			if (!is_numeric($number) || (($number = intval($number)) < 0)) {
+				$number = 0;
+			}
 
-			if (($min > 0) && ($number < $min)) return $min;
+			if (($min > 0) && ($number < $min)) {
+				return $min;
+			}
 
-			if (($max > 0) && ($number > $max)) return $max;
+			if (($max > 0) && ($number > $max)) {
+				return $max;
+			}
 
 			# ------------------------
 
@@ -34,11 +40,17 @@ 
 
 		public static function forceFloat($number, float $min = 0, float $max = 0, int $decimals = 0) : float {
 
-			if (!is_numeric($number) || (($number = floatval($number)) < 0)) $number = 0;
+			if (!is_numeric($number) || (($number = floatval($number)) < 0)) {
+				$number = 0;
+			}
 
-			if (($min > 0) && ($number < $min)) $number = $min;
+			if (($min > 0) && ($number < $min)) {
+				$number = $min;
+			}
 
-			if (($max > 0) && ($number > $max)) $number = $max;
+			if (($max > 0) && ($number > $max)) {
+				$number = $max;
+			}
 
 			$number = floatval(number_format($number, $decimals, '.', ''));
 
@@ -55,9 +67,11 @@ 
 
 			$number = (($number >= 0) ? $number : 0); $exponents = [0 => 'Bytes', 'KB', 'MB', 'GB', 'TB'];
 
-			foreach ($exponents as $exponent => $text) if ($number < pow(1024, ($exponent + 1))) {
+			foreach ($exponents as $exponent => $text) {
+				if ($number < pow(1024, ($exponent + 1))) {
 
 				$number = number_format(($number / pow(1024, $exponent)), (($exponent < 2) ? $exponent : 2));
+			}
 
 				return (floatval($number) . ' ' . $text);
 			}
@@ -79,13 +93,21 @@ 
 
 			$last_1 = substr($number, ($length - 1), 1); $last_2 = substr($number, ($length - 2), 2);
 
-			if (($last_2 >= 11) && ($last_2 <= 20)) return $form_5;
+			if (($last_2 >= 11) && ($last_2 <= 20)) {
+				return $form_5;
+			}
 
-			if ($last_1 == 1) return $form_1;
+			if ($last_1 == 1) {
+				return $form_1;
+			}
 
-			if (($last_1 >= 2) && ($last_1 <= 4)) return $form_3;
+			if (($last_1 >= 2) && ($last_1 <= 4)) {
+				return $form_3;
+			}
 
-			if (($last_1 >= 5) || ($last_1 == 0)) return $form_5;
+			if (($last_1 >= 5) || ($last_1 == 0)) {
+				return $form_5;
+			}
 		}
 	}
 }

www/engine/Framework/Classes/Geo/Country.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Geo/Countries.php');
+			self::init(DIR_DATA.'Geo/Countries.php');
 		}
 	}
 }

www/engine/Framework/Classes/Geo/Timezone.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Geo/Timezones.php');
+			self::init(DIR_DATA.'Geo/Timezones.php');
 		}
 	}
 }

www/engine/Framework/Classes/Request/Request.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 		public static function redirect(string $url) {
 
-			header("Location: " . $url); exit();
+			header("Location: ".$url); exit();
 		}
 	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 		/**
 		 * Get a FILE-param value
 		 *
-		 * @return array|false : the array with file info or false if the param does not exist
+		 * @return string : the array with file info or false if the param does not exist
 		 */
 
 		public static function file(string $name) {

www/engine/Framework/Classes/Mailer/Mailer.php

Spacing +4 added lines, -4 removed lines

@@ -12,13 +12,13 @@
 
 			# Set headers
 
-			$headers  = ('MIME-Version: 1.0' . "\r\n");
+			$headers  = ('MIME-Version: 1.0'."\r\n");
 
-			$headers .= ('Content-Type: ' . ($is_html ? 'text/html' : 'text/plain') . '; charset=UTF-8' . "\r\n");
+			$headers .= ('Content-Type: '.($is_html ? 'text/html' : 'text/plain').'; charset=UTF-8'."\r\n");
 
-			$headers .= ('From: ' . $sender . ' <' . $from . '>' . "\r\n" . 'Reply-To: ' . $reply_to . "\r\n");
+			$headers .= ('From: '.$sender.' <'.$from.'>'."\r\n".'Reply-To: '.$reply_to."\r\n");
 
-			$headers .= ('X-Mailer: PHP/' . phpversion() . "\r\n");
+			$headers .= ('X-Mailer: PHP/'.phpversion()."\r\n");
 
 			# Send message
 

www/engine/Framework/Classes/DB/Query/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 			# Build query
 
-			$this->query = ('DELETE FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('DELETE FROM '.$table.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }