cadmium-org / cadmium-cms

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

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 		/**
 		 * Catch a POST value by the field key
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public function post() {

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
 
 			if (preg_match(REGEX_FORM_FIELD_KEY, $key)) {
 
-				$prefix = (('' !== $this->form->getName()) ? ($this->form->getName() . '_') : '');
+				$prefix = (('' !== $this->form->getName()) ? ($this->form->getName().'_') : '');
 
-				$this->key = $key; $this->name = ($prefix . $key); $this->id = str_replace('_', '-', $this->name);
+				$this->key = $key; $this->name = ($prefix.$key); $this->id = str_replace('_', '-', $this->name);
 			}
 
 			# Set configuration

Braces +12 added lines, -4 removed lines

@@ -57,11 +57,17 @@ 
 
 			# Set appearance
 
-			if ($this->disabled)    $data['disabled']           = 'disabled';
+			if ($this->disabled) {
+				$data['disabled']           = 'disabled';
+			}
 
-			if ($this->required)    $data['data-required']      = 'required';
+			if ($this->required) {
+				$data['data-required']      = 'required';
+			}
 
-			if ($this->error)       $data['data-error']         = 'error';
+			if ($this->error) {
+				$data['data-error']         = 'error';
+			}
 
 			# ------------------------
 
@@ -76,7 +82,9 @@ 
 
 		public function post() : bool {
 
-			if ($this->posted || $this->disabled || ('' === $this->key)) return false;
+			if ($this->posted || $this->disabled || ('' === $this->key)) {
+				return false;
+			}
 
 			$this->error = (!$this->setValue(Request::post($this->name)) && $this->required);
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 		/**
 		 * Set a value
 		 *
-		 * @return true if the result value is not empty, otherwise false
+		 * @return boolean if the result value is not empty, otherwise false
 		 */
 
 		public function setValue(string $value) {

Braces +45 added lines, -23 removed lines

@@ -82,9 +82,13 @@ 
 
 			$tag = $this->getTag('textarea', [], $this->value);
 
-			if ($this->rows > 0) $tag->setAttribute('rows', $this->rows);
+			if ($this->rows > 0) {
+				$tag->setAttribute('rows', $this->rows);
+			}
 
-			if ($this->cols > 0) $tag->setAttribute('cols', $this->cols);
+			if ($this->cols > 0) {
+				$tag->setAttribute('cols', $this->cols);
+			}
 
 			# ------------------------
 
@@ -97,9 +101,11 @@ 
 
 		private function processSpaces() {
 
-			if ($this->spaces === 'strip') $this->value = Str::stripSpaces($this->value);
-
-			else if ($this->spaces === 'single') $this->value = Str::singleSpaces($this->value);
+			if ($this->spaces === 'strip') {
+				$this->value = Str::stripSpaces($this->value);
+			} else if ($this->spaces === 'single') {
+				$this->value = Str::singleSpaces($this->value);
+			}
 		}
 
 		/**
@@ -108,9 +114,11 @@ 
 
 		private function processConvert() {
 
-			if ($this->convert === 'url') $this->value = Str::toUrl($this->value, $this->maxlength);
-
-			else if ($this->convert === 'var') $this->value = Str::toVar($this->value, $this->maxlength);
+			if ($this->convert === 'url') {
+				$this->value = Str::toUrl($this->value, $this->maxlength);
+			} else if ($this->convert === 'var') {
+				$this->value = Str::toVar($this->value, $this->maxlength);
+			}
 		}
 
 		/**
@@ -119,9 +127,11 @@ 
 
 		private function processTransform() {
 
-			if ($this->transform === 'lower') $this->value = Str::toLower($this->value);
-
-			else if ($this->transform === 'upper') $this->value = Str::toUpper($this->value);
+			if ($this->transform === 'lower') {
+				$this->value = Str::toLower($this->value);
+			} else if ($this->transform === 'upper') {
+				$this->value = Str::toUpper($this->value);
+			}
 		}
 
 		/**
@@ -183,27 +193,39 @@ 
 
 			# Process hidden field
 
-			if ($this->type === FORM_FIELD_HIDDEN) return $this->getHidden()->getBlock();
+			if ($this->type === FORM_FIELD_HIDDEN) {
+				return $this->getHidden()->getBlock();
+			}
 
 			# Process visible field
 
-			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();
+			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->setAttribute('maxlength', $this->maxlength);
+			if ($this->maxlength > 0) {
+				$tag->setAttribute('maxlength', $this->maxlength);
+			}
 
-			if ('' !== $this->placeholder) $tag->setAttribute('placeholder', $this->placeholder);
+			if ('' !== $this->placeholder) {
+				$tag->setAttribute('placeholder', $this->placeholder);
+			}
 
-			if ($this->readonly) $tag->setAttribute('readonly', 'readonly');
+			if ($this->readonly) {
+				$tag->setAttribute('readonly', 'readonly');
+			}
 
-			if ($this->autofocus) $tag->setAttribute('autofocus', 'autofocus');
+			if ($this->autofocus) {
+				$tag->setAttribute('autofocus', 'autofocus');
+			}
 
 			# ------------------------
 

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

Doc Comments +1 added lines, -1 removed lines

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

www/engine/Framework/Includes/Constants.php

Spacing +14 added lines, -14 removed lines

@@ -2,23 +2,23 @@
 
 # Date formats
 
-define('DATE_FORMAT_STANDART',                      'd.m.Y');
-define('DATE_FORMAT_MYSQL',                         'Y-m-d');
-define('DATE_FORMAT_DATETIME',                      'd.m.Y, H:i');
-define('DATE_FORMAT_W3C',                           'Y-m-d\TH:i:sP');
+define('DATE_FORMAT_STANDART', 'd.m.Y');
+define('DATE_FORMAT_MYSQL', 'Y-m-d');
+define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i');
+define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP');
 
 # Form fields
 
-define('FORM_FIELD_HIDDEN',                         'hidden');
-define('FORM_FIELD_PASSWORD',                       'password');
-define('FORM_FIELD_CAPTCHA',                        'captcha');
-define('FORM_FIELD_TEXT',                           'text');
-define('FORM_FIELD_TEXTAREA',                       'textarea');
+define('FORM_FIELD_HIDDEN', 'hidden');
+define('FORM_FIELD_PASSWORD', 'password');
+define('FORM_FIELD_CAPTCHA', 'captcha');
+define('FORM_FIELD_TEXT', 'text');
+define('FORM_FIELD_TEXTAREA', 'textarea');
 
 # String pools
 
-define('STR_POOL_DEFAULT',                          'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
-define('STR_POOL_LATIN',                            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_LATIN_LOWER',                      'abcdefghijklmnopqrstuvwxyz');
-define('STR_POOL_LATIN_UPPER',                      'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_NUMERIC',                          '0123456789');
+define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz');
+define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_NUMERIC', '0123456789');

www/engine/Framework/Includes/Headers/Status.php

Spacing +53 added lines, -53 removed lines

@@ -2,60 +2,60 @@
 
 # Status codes
 
-define('STATUS_CODE_100',       100);
-define('STATUS_CODE_101',       101);
-define('STATUS_CODE_102',       102);
+define('STATUS_CODE_100', 100);
+define('STATUS_CODE_101', 101);
+define('STATUS_CODE_102', 102);
 
-define('STATUS_CODE_200',       200);
-define('STATUS_CODE_201',       201);
-define('STATUS_CODE_202',       202);
-define('STATUS_CODE_203',       203);
-define('STATUS_CODE_204',       204);
-define('STATUS_CODE_205',       205);
-define('STATUS_CODE_206',       206);
-define('STATUS_CODE_207',       207);
-define('STATUS_CODE_226',       226);
+define('STATUS_CODE_200', 200);
+define('STATUS_CODE_201', 201);
+define('STATUS_CODE_202', 202);
+define('STATUS_CODE_203', 203);
+define('STATUS_CODE_204', 204);
+define('STATUS_CODE_205', 205);
+define('STATUS_CODE_206', 206);
+define('STATUS_CODE_207', 207);
+define('STATUS_CODE_226', 226);
 
-define('STATUS_CODE_300',       300);
-define('STATUS_CODE_301',       301);
-define('STATUS_CODE_302',       302);
-define('STATUS_CODE_303',       303);
-define('STATUS_CODE_304',       304);
-define('STATUS_CODE_305',       305);
-define('STATUS_CODE_307',       307);
+define('STATUS_CODE_300', 300);
+define('STATUS_CODE_301', 301);
+define('STATUS_CODE_302', 302);
+define('STATUS_CODE_303', 303);
+define('STATUS_CODE_304', 304);
+define('STATUS_CODE_305', 305);
+define('STATUS_CODE_307', 307);
 
-define('STATUS_CODE_400',       400);
-define('STATUS_CODE_401',       401);
-define('STATUS_CODE_402',       402);
-define('STATUS_CODE_403',       403);
-define('STATUS_CODE_404',       404);
-define('STATUS_CODE_405',       405);
-define('STATUS_CODE_406',       406);
-define('STATUS_CODE_407',       407);
-define('STATUS_CODE_408',       408);
-define('STATUS_CODE_409',       409);
-define('STATUS_CODE_410',       410);
-define('STATUS_CODE_411',       411);
-define('STATUS_CODE_412',       412);
-define('STATUS_CODE_413',       413);
-define('STATUS_CODE_414',       414);
-define('STATUS_CODE_415',       415);
-define('STATUS_CODE_416',       416);
-define('STATUS_CODE_417',       417);
-define('STATUS_CODE_422',       422);
-define('STATUS_CODE_423',       423);
-define('STATUS_CODE_424',       424);
-define('STATUS_CODE_425',       425);
-define('STATUS_CODE_426',       426);
-define('STATUS_CODE_449',       449);
+define('STATUS_CODE_400', 400);
+define('STATUS_CODE_401', 401);
+define('STATUS_CODE_402', 402);
+define('STATUS_CODE_403', 403);
+define('STATUS_CODE_404', 404);
+define('STATUS_CODE_405', 405);
+define('STATUS_CODE_406', 406);
+define('STATUS_CODE_407', 407);
+define('STATUS_CODE_408', 408);
+define('STATUS_CODE_409', 409);
+define('STATUS_CODE_410', 410);
+define('STATUS_CODE_411', 411);
+define('STATUS_CODE_412', 412);
+define('STATUS_CODE_413', 413);
+define('STATUS_CODE_414', 414);
+define('STATUS_CODE_415', 415);
+define('STATUS_CODE_416', 416);
+define('STATUS_CODE_417', 417);
+define('STATUS_CODE_422', 422);
+define('STATUS_CODE_423', 423);
+define('STATUS_CODE_424', 424);
+define('STATUS_CODE_425', 425);
+define('STATUS_CODE_426', 426);
+define('STATUS_CODE_449', 449);
 
-define('STATUS_CODE_500',       500);
-define('STATUS_CODE_501',       501);
-define('STATUS_CODE_502',       502);
-define('STATUS_CODE_503',       503);
-define('STATUS_CODE_504',       504);
-define('STATUS_CODE_505',       505);
-define('STATUS_CODE_506',       506);
-define('STATUS_CODE_507',       507);
-define('STATUS_CODE_509',       509);
-define('STATUS_CODE_510',       510);
+define('STATUS_CODE_500', 500);
+define('STATUS_CODE_501', 501);
+define('STATUS_CODE_502', 502);
+define('STATUS_CODE_503', 503);
+define('STATUS_CODE_504', 504);
+define('STATUS_CODE_505', 505);
+define('STATUS_CODE_506', 506);
+define('STATUS_CODE_507', 507);
+define('STATUS_CODE_509', 509);
+define('STATUS_CODE_510', 510);

www/engine/Framework/Includes/Regex.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 define('REGEX_TEMPLATE_COMPONENT_NAME',             '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 define('REGEX_TEMPLATE_STRUCTURE',                  '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' .
-                                                    '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
+													'(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
 
 define('REGEX_TEMPLATE_VARIABLE',                   '/\$([a-zA-Z0-9_]+)\$/');
 define('REGEX_TEMPLATE_PHRASE',                     '/\%([a-zA-Z0-9_]+)\%/');

Spacing +7 added lines, -7 removed lines

@@ -2,19 +2,19 @@
 
 # Form expressions
 
-define('REGEX_FORM_NAME',                           '/^[a-zA-Z][a-zA-Z0-9]*$/');
-define('REGEX_FORM_FIELD_KEY',                      '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_FORM_NAME', '/^[a-zA-Z][a-zA-Z0-9]*$/');
+define('REGEX_FORM_FIELD_KEY', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 # Language expressions
 
-define('REGEX_LANGUAGE_PHRASE_NAME',                '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_LANGUAGE_PHRASE_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 # Template expressions
 
-define('REGEX_TEMPLATE_COMPONENT_NAME',             '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_TEMPLATE_COMPONENT_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
-define('REGEX_TEMPLATE_STRUCTURE',                  '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' .
+define('REGEX_TEMPLATE_STRUCTURE', '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*'.
                                                     '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
 
-define('REGEX_TEMPLATE_VARIABLE',                   '/\$([a-zA-Z0-9_]+)\$/');
-define('REGEX_TEMPLATE_PHRASE',                     '/\%([a-zA-Z0-9_]+)\%/');
+define('REGEX_TEMPLATE_VARIABLE', '/\$([a-zA-Z0-9_]+)\$/');
+define('REGEX_TEMPLATE_PHRASE', '/\%([a-zA-Z0-9_]+)\%/');

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

Braces +33 added lines, -11 removed lines

@@ -17,11 +17,17 @@ 
 
 		public static function forceInt($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;
+			}
 
 			# ------------------------
 
@@ -34,11 +40,17 @@ 
 
 		public static function forceFloat($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, '.', ''));
 
@@ -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/Range/Range.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		protected static function init(string $file_name) {
 
-			if (is_array($range = Explorer::include($file_name))) static::$range = $range;
+			if (is_array($range = Explorer::include($file_name))) {
+				static::$range = $range;
+			}
 		}
 
 		/**

www/engine/Framework/Classes/XML/XML.php

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 
 		public static function stringify(SimpleXMLElement $xml) {
 
-			if (false === ($xml = dom_import_simplexml($xml))) return false;
+			if (false === ($xml = dom_import_simplexml($xml))) {
+				return false;
+			}
 
 			$dom = $xml->ownerDocument; $dom->formatOutput = true;
 
@@ -47,7 +49,9 @@ 
 
 		public static function load(string $file_name) {
 
-			if (false === ($contents = Explorer::getContents($file_name))) return false;
+			if (false === ($contents = Explorer::getContents($file_name))) {
+				return false;
+			}
 
 			return self::parse($contents);
 		}
@@ -60,7 +64,9 @@ 
 
 		public static function save(string $file_name, SimpleXMLElement $xml) {
 
-			if (false === ($xml = self::stringify($xml))) return false;
+			if (false === ($xml = self::stringify($xml))) {
+				return false;
+			}
 
 			return Explorer::putContents($file_name, $xml);
 		}