cadmium-org / cadmium-cms

www/engine/Framework/Classes/Headers/Headers.php

Braces +12 added lines, -4 removed lines

@@ -117,7 +117,9 @@ 
 
 		public static function status(string $code) {
 
-			if (self::isStatusCode($code)) header(getenv('SERVER_PROTOCOL') . ' ' . self::$status_codes[$code]);
+			if (self::isStatusCode($code)) {
+				header(getenv('SERVER_PROTOCOL') . ' ' . self::$status_codes[$code]);
+			}
 		}
 
 		# Send content header
@@ -139,9 +141,13 @@ 
 
 		public static function cache(string $limiter, int $expires) {
 
-			if (self::$cache_send) return;
+			if (self::$cache_send) {
+				return;
+			}
 
-			if (!in_array($limiter, [CACHE_LIMITER_PRIVATE, CACHE_LIMITER_PUBLIC], true)) return;
+			if (!in_array($limiter, [CACHE_LIMITER_PRIVATE, CACHE_LIMITER_PUBLIC], true)) {
+				return;
+			}
 
 			header('Expires: ' . gmdate('D, d M Y H:i:s', (REQUEST_TIME + $expires)) . ' GMT');
 
@@ -160,7 +166,9 @@ 
 
 		public static function nocache() {
 
-			if (self::$cache_send) return;
+			if (self::$cache_send) {
+				return;
+			}
 
 			header('Expires: ' . gmdate('D, d M Y H:i:s', strtotime('-1 day')) . ' GMT');
 

www/engine/Framework/Classes/Ajax/Utils/Response.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		public function error(string $value = null) {
 
-			if (null !== $value) $this->set('error', $value);
+			if (null !== $value) {
+				$this->set('error', $value);
+			}
 
 			$this->status = false;
 

www/engine/Framework/Classes/Str/Str.php

Spacing +19 added lines, -19 removed lines

@@ -53,25 +53,25 @@
 
 			$pattern = [
 
-				'А' => 'A',     'Б' => 'B',     'В' => 'V',     'Г' => 'G',
-				'Д' => 'D',     'Е' => 'E',     'Ж' => 'ZH',    'З' => 'Z',
-				'И' => 'I',     'Й' => 'J',     'К' => 'K',     'Л' => 'L',
-				'М' => 'M',     'Н' => 'N',     'О' => 'O',     'П' => 'P',
-				'Р' => 'R',     'С' => 'S',     'Т' => 'T',     'У' => 'U',
-				'Ф' => 'F',     'Х' => 'H',     'Ц' => 'C',     'Ч' => 'CH',
-				'Ш' => 'SH',    'Щ' => 'SCH',   'Ъ' => '',      'Ь' => '',
-				'Ы' => 'Y',     'Э' => 'E',     'Ю' => 'JU',    'Я' => 'JA',
-				'І' => 'I',     'Ї' => 'JI',    'Ё' => 'JO',
-
-				'а' => 'a',     'б' => 'b',     'в' => 'v',     'г' => 'g',
-				'д' => 'd',     'е' => 'e',     'ж' => 'zh',    'з' => 'z',
-				'и' => 'i',     'й' => 'j',     'к' => 'k',     'л' => 'l',
-				'м' => 'm',     'н' => 'n',     'о' => 'o',     'п' => 'p',
-				'р' => 'r',     'с' => 's',     'т' => 't',     'у' => 'u',
-				'ф' => 'f',     'х' => 'h',     'ц' => 'c',     'ч' => 'ch',
-				'ш' => 'sh',    'щ' => 'sch',   'ъ' => '',      'ь' => '',
-				'ы' => 'y',     'э' => 'e',     'ю' => 'ju',    'я' => 'ja',
-				'і' => 'i',     'ї' => 'ji',    'ё' => 'jo'
+				'А' => 'A', 'Б' => 'B', 'В' => 'V', 'Г' => 'G',
+				'Д' => 'D', 'Е' => 'E', 'Ж' => 'ZH', 'З' => 'Z',
+				'И' => 'I', 'Й' => 'J', 'К' => 'K', 'Л' => 'L',
+				'М' => 'M', 'Н' => 'N', 'О' => 'O', 'П' => 'P',
+				'Р' => 'R', 'С' => 'S', 'Т' => 'T', 'У' => 'U',
+				'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C', 'Ч' => 'CH',
+				'Ш' => 'SH', 'Щ' => 'SCH', 'Ъ' => '', 'Ь' => '',
+				'Ы' => 'Y', 'Э' => 'E', 'Ю' => 'JU', 'Я' => 'JA',
+				'І' => 'I', 'Ї' => 'JI', 'Ё' => 'JO',
+
+				'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g',
+				'д' => 'd', 'е' => 'e', 'ж' => 'zh', 'з' => 'z',
+				'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l',
+				'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p',
+				'р' => 'r', 'с' => 's', 'т' => 't', 'у' => 'u',
+				'ф' => 'f', 'х' => 'h', 'ц' => 'c', 'ч' => 'ch',
+				'ш' => 'sh', 'щ' => 'sch', 'ъ' => '', 'ь' => '',
+				'ы' => 'y', 'э' => 'e', 'ю' => 'ju', 'я' => 'ja',
+				'і' => 'i', 'ї' => 'ji', 'ё' => 'jo'
 			];
 
 			# ------------------------

Braces +19 added lines, -9 removed lines

@@ -10,14 +10,18 @@ 
 
 			foreach (($string = explode("\n", $string)) as $key => $line) {
 
-				if ($multiline && $codestyle) $string[$key] = rtrim(preg_replace('/[\r\0\x0B]+/', '', $line));
-
-				else $string[$key] = trim(preg_replace(['/[ \t]+/', '/[\r\0\x0B]+/'], [' ', ''], $line));
+				if ($multiline && $codestyle) {
+					$string[$key] = rtrim(preg_replace('/[\r\0\x0B]+/', '', $line));
+				} else {
+					$string[$key] = trim(preg_replace(['/[ \t]+/', '/[\r\0\x0B]+/'], [' ', ''], $line));
+				}
 			}
 
-			if (!$multiline) $string = preg_replace('/ {2,}/', ' ', trim(implode(' ', $string), ' '));
-
-			else $string = preg_replace('/(\r\n){3,}/', "\r\n\r\n", trim(implode("\r\n", $string), "\r\n"));
+			if (!$multiline) {
+				$string = preg_replace('/ {2,}/', ' ', trim(implode(' ', $string), ' '));
+			} else {
+				$string = preg_replace('/(\r\n){3,}/', "\r\n\r\n", trim(implode("\r\n", $string), "\r\n"));
+			}
 
 			# ------------------------
 
@@ -136,7 +140,9 @@ 
 
 		public static function cut(string $string, int $maxlength, bool $ellipsis = false) {
 
-			if (($maxlength < 1) || (self::length($string = trim($string)) <= $maxlength)) return $string;
+			if (($maxlength < 1) || (self::length($string = trim($string)) <= $maxlength)) {
+				return $string;
+			}
 
 			$string = (rtrim(self::substr($string, 0, $maxlength)) . ($ellipsis ? '...' : ''));
 
@@ -149,9 +155,13 @@ 
 
 		public static function random(int $length, string $pool = STR_POOL_DEFAULT) {
 
-			if (($length < 1) || (0 === ($pool_length = self::length($pool)))) return '';
+			if (($length < 1) || (0 === ($pool_length = self::length($pool)))) {
+				return '';
+			}
 
-			$string = ''; for ($i = 0; $i < $length; $i++) $string .= self::substr($pool, random_int(0, ($pool_length - 1)), 1);
+			$string = ''; for ($i = 0; $i < $length; $i++) {
+				$string .= self::substr($pool, random_int(0, ($pool_length - 1)), 1);
+			}
 
 			# ------------------------
 

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');
+			}
 
 			# ------------------------