cadmium-org / cadmium-cms

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

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.')') : ''));
 		}
 	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
 
 			# Build query
 
-			$this->query = ('SELECT ' . $selection . ' FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : '') .
+			$this->query = ('SELECT '.$selection.' FROM '.$table.($condition ? (' WHERE ('.$condition.')') : '').
 
-				($order ? (' ORDER BY ' .  $order) : '') . ($limit ? (' LIMIT ' .  $limit) : ''));
+				($order ? (' ORDER BY '.$order) : '').($limit ? (' LIMIT '.$limit) : ''));
 		}
 	}
 }

www/engine/System/Classes/Modules/Profile/Handler/Edit.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 			if ($this->form_personal->handle($controller_personal) || $this->form_password->handle($controller_password)) {
 
-				Request::redirect(INSTALL_PATH . '/profile/edit?submitted');
+				Request::redirect(INSTALL_PATH.'/profile/edit?submitted');
 			}
 
 			# Display success message

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::set('success', Language::get('USER_SUCCESS_EDIT'));
+			if (false !== Request::get('submitted')) {
+				Messages::set('success', Language::get('USER_SUCCESS_EDIT'));
+			}
 
 			# ------------------------