cadmium-org / cadmium-cms

www/engine/Framework/Classes/Agent/Agent.php

Braces +12 added lines, -4 removed lines

@@ -10,9 +10,13 @@ 
 
 		private static function search(array &$list) {
 
-			if (empty($agent = getenv('HTTP_USER_AGENT'))) return false;
+			if (empty($agent = getenv('HTTP_USER_AGENT'))) {
+				return false;
+			}
 
-			foreach ($list as $item) if (false !== stripos($agent, $item)) return true;
+			foreach ($list as $item) {
+				if (false !== stripos($agent, $item)) return true;
+			}
 
 			# ------------------------
 
@@ -27,9 +31,13 @@ 
 
 			$file_robots = (DIR_DATA . 'Agent/Robots.php');
 
-			if (is_array($mobiles = Explorer::php($file_mobiles))) self::$mobiles = $mobiles;
+			if (is_array($mobiles = Explorer::php($file_mobiles))) {
+				self::$mobiles = $mobiles;
+			}
 
-			if (is_array($robots = Explorer::php($file_robots))) self::$robots = $robots;
+			if (is_array($robots = Explorer::php($file_robots))) {
+				self::$robots = $robots;
+			}
 		}
 
 		# Check if user agent is mobile

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

Braces +33 added lines, -11 removed lines

@@ -8,11 +8,17 @@ 
 
 		public static function format($number, int $min = 0, int $max = 0) {
 
-			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;
+			}
 
 			# ------------------------
 
@@ -23,11 +29,17 @@ 
 
 		public static function formatFloat($number, float $min = 0, float $max = 0, int $decimals = 0) {
 
-			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, '.', ''));
 
@@ -42,9 +54,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);
 			}
@@ -62,13 +76,21 @@ 
 
 			$last_1 = substr($number, ($length - 1), 1); $last_2 = substr($number, ($length - 2), 2);
 
-			if (($last_2 >= 11) && ($last_2 <= 20)) return $variant_5;
+			if (($last_2 >= 11) && ($last_2 <= 20)) {
+				return $variant_5;
+			}
 
-			if ($last_1 == 1) return $variant_1;
+			if ($last_1 == 1) {
+				return $variant_1;
+			}
 
-			if (($last_1 >= 2) && ($last_1 <= 4)) return $variant_3;
+			if (($last_1 >= 2) && ($last_1 <= 4)) {
+				return $variant_3;
+			}
 
-			if (($last_1 >= 5) || ($last_1 == 0)) return $variant_5;
+			if (($last_1 >= 5) || ($last_1 == 0)) {
+				return $variant_5;
+			}
 		}
 	}
 }

www/engine/Framework/Classes/Form/Form.php

Braces +20 added lines, -6 removed lines

@@ -10,7 +10,9 @@ 
 
 		private function addField(Form\Utils\Field $field) {
 
-			if ($this->posted || ('' === ($key = $field->key()))) return false;
+			if ($this->posted || ('' === ($key = $field->key()))) {
+				return false;
+			}
 
 			$this->fields[$key] = $field;
 
@@ -23,7 +25,9 @@ 
 
 		public function __construct(string $name = '') {
 
-			if (preg_match(REGEX_FORM_NAME, $name)) $this->name = $name;
+			if (preg_match(REGEX_FORM_NAME, $name)) {
+				$this->name = $name;
+			}
 		}
 
 		# Add text field
@@ -65,9 +69,15 @@ 
 
 			foreach ($this->fields as $field) {
 
-				if (($field instanceof Form\Field\Checkbox) || $field->disabled()) continue;
+				if (($field instanceof Form\Field\Checkbox) || $field->disabled()) {
+					continue;
+				}
 
-				if (false !== Request::post($field->name())) $check = true; else return false;
+				if (false !== Request::post($field->name())) {
+					$check = true;
+				} else {
+					return false;
+				}
 			}
 
 			# ------------------------
@@ -79,7 +89,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || !$this->check()) return false;
+			if ($this->posted || !$this->check()) {
+				return false;
+			}
 
 			$errors = false; $post = [];
 
@@ -87,7 +99,9 @@ 
 
 				$field->post(); $post[$field->key()] = $field->value();
 
-				if ($field->error()) $errors = true;
+				if ($field->error()) {
+					$errors = true;
+				}
 			}
 
 			$this->posted = true; $this->errors = $errors;

www/engine/Framework/Classes/Form/Field/Select.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
 		public function __construct(Form $form, string $key, string $value = '',
 
-		    array $options = [], string $default = null, array $config = []) {
+			array $options = [], string $default = null, array $config = []) {
 
 			# Init field
 

Braces +6 added lines, -2 removed lines

@@ -92,9 +92,13 @@
 
 			$tag = $this->getTag('select');
 
-			if ($this->config['search']) $tag->set('data-search', 'search');
+			if ($this->config['search']) {
+				$tag->set('data-search', 'search');
+			}
 
-			if ($this->config['auto']) $tag->set('data-auto', 'auto');
+			if ($this->config['auto']) {
+				$tag->set('data-auto', 'auto');
+			}
 
 			$tag->contents($this->getOptions());
 

www/engine/Framework/Classes/Form/Field/Checkbox.php

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 
 			$tag->set('type', 'checkbox');
 
-			if (false !== $this->value) $tag->set('checked', 'checked');
+			if (false !== $this->value) {
+				$tag->set('checked', 'checked');
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Form/Field/Text.php

Indentation +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 
 		public function __construct(Form $form, string $key, string $value = '',
 
-		    string $type = FORM_FIELD_TEXT, int $maxlength = 0, array $config = []) {
+			string $type = FORM_FIELD_TEXT, int $maxlength = 0, array $config = []) {
 
 			# Init field
 

Braces +53 added lines, -27 removed lines

@@ -65,9 +65,13 @@ 
 
 			$tag = $this->getTag('textarea', [], $this->value);
 
-			if ($this->config['rows'] > 0) $tag->set('rows', $this->config['rows']);
+			if ($this->config['rows'] > 0) {
+				$tag->set('rows', $this->config['rows']);
+			}
 
-			if ($this->config['cols'] > 0) $tag->set('cols', $this->config['cols']);
+			if ($this->config['cols'] > 0) {
+				$tag->set('cols', $this->config['cols']);
+			}
 
 			# ------------------------
 
@@ -78,27 +82,33 @@ 
 
 		private function processSpaces() {
 
-			if ($this->config['spaces'] === 'strip') $this->value = Str::stripSpaces($this->value);
-
-			else if ($this->config['spaces'] === 'single') $this->value = Str::singleSpaces($this->value);
+			if ($this->config['spaces'] === 'strip') {
+				$this->value = Str::stripSpaces($this->value);
+			} else if ($this->config['spaces'] === 'single') {
+				$this->value = Str::singleSpaces($this->value);
+			}
 		}
 
 		# Process convert
 
 		private function processConvert() {
 
-			if ($this->config['convert'] === 'url') $this->value = Str::toUrl($this->value, $this->maxlength);
-
-			else if ($this->config['convert'] === 'var') $this->value = Str::toVar($this->value, $this->maxlength);
+			if ($this->config['convert'] === 'url') {
+				$this->value = Str::toUrl($this->value, $this->maxlength);
+			} else if ($this->config['convert'] === 'var') {
+				$this->value = Str::toVar($this->value, $this->maxlength);
+			}
 		}
 
 		# Process transform
 
 		private function processTransform() {
 
-			if ($this->config['transform'] === 'lower') $this->value = Str::toLower($this->value);
-
-			else if ($this->config['transform'] === 'upper') $this->value = Str::toUpper($this->value);
+			if ($this->config['transform'] === 'lower') {
+				$this->value = Str::toLower($this->value);
+			} else if ($this->config['transform'] === 'upper') {
+				$this->value = Str::toUpper($this->value);
+			}
 		}
 
 		# Constructor
@@ -164,7 +174,9 @@ 
 
 		public function spaces(string $value) {
 
-			if (!in_array($value, ['strip', 'single'], true)) $value = '';
+			if (!in_array($value, ['strip', 'single'], true)) {
+				$value = '';
+			}
 
 			$this->config['spaces'] = $value;
 		}
@@ -173,7 +185,9 @@ 
 
 		public function convert(string $value) {
 
-			if (!in_array($value, ['url', 'var'], true)) $value = '';
+			if (!in_array($value, ['url', 'var'], true)) {
+				$value = '';
+			}
 
 			$this->config['convert'] = $value;
 		}
@@ -182,7 +196,9 @@ 
 
 		public function transform(string $value) {
 
-			if (!in_array($value, ['upper', 'lower'], true)) $value = '';
+			if (!in_array($value, ['upper', 'lower'], true)) {
+				$value = '';
+			}
 
 			$this->config['transform'] = $value;
 		}
@@ -226,25 +242,35 @@ 
 
 		public function block() {
 
-			if ($this->type === FORM_FIELD_HIDDEN) return $this->getHidden()->block();
-
-			else if ($this->type === FORM_FIELD_PASSWORD) $tag = $this->getPassword();
-
-			else if ($this->type === FORM_FIELD_CAPTCHA) $tag = $this->getCaptcha();
-
-			else if ($this->type === FORM_FIELD_TEXTAREA) $tag = $this->getTextarea();
-
-			else $tag = $this->getText();
+			if ($this->type === FORM_FIELD_HIDDEN) {
+				return $this->getHidden()->block();
+			} else if ($this->type === FORM_FIELD_PASSWORD) {
+				$tag = $this->getPassword();
+			} else if ($this->type === FORM_FIELD_CAPTCHA) {
+				$tag = $this->getCaptcha();
+			} else if ($this->type === FORM_FIELD_TEXTAREA) {
+				$tag = $this->getTextarea();
+			} else {
+				$tag = $this->getText();
+			}
 
 			# Set appearance
 
-			if ($this->maxlength > 0) $tag->set('maxlength', $this->maxlength);
+			if ($this->maxlength > 0) {
+				$tag->set('maxlength', $this->maxlength);
+			}
 
-			if ('' !== $this->config['placeholder']) $tag->set('placeholder', $this->config['placeholder']);
+			if ('' !== $this->config['placeholder']) {
+				$tag->set('placeholder', $this->config['placeholder']);
+			}
 
-			if ($this->config['readonly']) $tag->set('readonly', 'readonly');
+			if ($this->config['readonly']) {
+				$tag->set('readonly', 'readonly');
+			}
 
-			if ($this->config['autofocus']) $tag->set('autofocus', 'autofocus');
+			if ($this->config['autofocus']) {
+				$tag->set('autofocus', 'autofocus');
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Form/Utils/Field.php

Braces +24 added lines, -8 removed lines

@@ -24,11 +24,17 @@ 
 
 			# Set config
 
-			if ($this->disabled) $tag->set('disabled', 'disabled');
+			if ($this->disabled) {
+				$tag->set('disabled', 'disabled');
+			}
 
-			if ($this->required) $tag->set('data-required', 'required');
+			if ($this->required) {
+				$tag->set('data-required', 'required');
+			}
 
-			if ($this->error) $tag->set('data-error', 'error');
+			if ($this->error) {
+				$tag->set('data-error', 'error');
+			}
 
 			# ------------------------
 
@@ -54,11 +60,15 @@ 
 
 			$params = array_merge(['disabled' => false, 'required' => false], $this->config);
 
-			foreach ($params as $name => $default) if (isset($config[$name])) {
+			foreach ($params as $name => $default) {
+				if (isset($config[$name])) {
 
 				$checker = ((0 === $default) ? 'is_numeric' : 'is_scalar');
+			}
 
-				if ($checker($config[$name])) $this->$name($config[$name]);
+				if ($checker($config[$name])) {
+					$this->$name($config[$name]);
+				}
 			}
 		}
 
@@ -66,7 +76,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || $this->disabled || ('' === $this->key)) return false;
+			if ($this->posted || $this->disabled || ('' === $this->key)) {
+				return false;
+			}
 
 			$this->error = (!$this->set(Request::post($this->name)) && $this->required);
 
@@ -100,7 +112,9 @@ 
 
 		public function disabled(bool $value = null) {
 
-			if (null === $value) return $this->disabled;
+			if (null === $value) {
+				return $this->disabled;
+			}
 
 			$this->disabled = $value;
 		}
@@ -109,7 +123,9 @@ 
 
 		public function required(bool $value = null) {
 
-			if (null === $value) return $this->required;
+			if (null === $value) {
+				return $this->required;
+			}
 
 			$this->required = $value;
 		}

www/engine/Framework/Classes/Tag/Tag.php

Braces +8 added lines, -4 removed lines

@@ -23,7 +23,9 @@ 
 
 			$this->name = $name;
 
-			foreach ($attributes as $name => $value) $this->set($name, $value);
+			foreach ($attributes as $name => $value) {
+				$this->set($name, $value);
+			}
 
 			$this->contents($contents);
 		}
@@ -41,9 +43,11 @@ 
 
 		public function contents($contents) {
 
-			if ((null === $contents) || Template::isBlock($contents)) $this->contents = $contents;
-
-			else if (is_scalar($contents)) $this->contents = Template::block('$contents$')->set('contents', $contents);
+			if ((null === $contents) || Template::isBlock($contents)) {
+				$this->contents = $contents;
+			} else if (is_scalar($contents)) {
+				$this->contents = Template::block('$contents$')->set('contents', $contents);
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Date/Date.php

Braces +9 added lines, -3 removed lines

@@ -8,9 +8,13 @@ 
 
 		public static function validate(string $date, string $format) {
 
-			if (false === ($date_object = date_create_from_format($format, $date))) return false;
+			if (false === ($date_object = date_create_from_format($format, $date))) {
+				return false;
+			}
 
-			if (false === ($date_formatted = $date_object->format($format))) return false;
+			if (false === ($date_formatted = $date_object->format($format))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -35,7 +39,9 @@ 
 
 		public static function validateYear(int $year) {
 
-			if (false === ($year = self::validate($year, 'Y'))) return false;
+			if (false === ($year = self::validate($year, 'Y'))) {
+				return false;
+			}
 
 			return (($year > '1900') ? (($year > self::year()) ? self::year() : $year) : '1900');
 		}