cadmium-org / cadmium-cms

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

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/Dataset/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -19,17 +19,17 @@
 
 			# Check basic types
 
-			if (is_string   ($default)) return function(string      $value) { return $value; };
+			if (is_string($default)) return function(string      $value) { return $value; };
 
-			if (is_bool     ($default)) return function(bool        $value) { return $value; };
+			if (is_bool($default)) return function(bool        $value) { return $value; };
 
-			if (is_int      ($default)) return function(int         $value) { return $value; };
+			if (is_int($default)) return function(int         $value) { return $value; };
 
-			if (is_float    ($default)) return function(float       $value) { return $value; };
+			if (is_float($default)) return function(float       $value) { return $value; };
 
-			if (is_array    ($default)) return function(array       $value) { return $value; };
+			if (is_array($default)) return function(array       $value) { return $value; };
 
-			if (is_callable ($default)) return function(callable    $value) { return $value; };
+			if (is_callable($default)) return function(callable    $value) { return $value; };
 
 			# Check object type
 

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 			# Build query
 
-			$this->query = ('UPDATE ' . $table . ' SET ' . $set . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('UPDATE '.$table.' SET '.$set.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }

www/engine/Framework/Classes/Template/Block.php

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
 
 				if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) continue;
 
-				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
+				$this->contents = str_replace($match, ('{ '.$type.':'.$name.' / }'), $this->contents);
 
 				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
 
@@ -51,9 +51,9 @@ 
 
 		private function parseElementaries() {
 
-			$variables = ['pattern' => REGEX_TEMPLATE_VARIABLE, 'stack' => &$this->variables ];
+			$variables = ['pattern' => REGEX_TEMPLATE_VARIABLE, 'stack' => &$this->variables];
 
-			$phrases = ['pattern' => REGEX_TEMPLATE_PHRASE, 'stack' => &$this->phrases ];
+			$phrases = ['pattern' => REGEX_TEMPLATE_PHRASE, 'stack' => &$this->phrases];
 
 			foreach ([$variables, $phrases] as $elementaries) {
 
@@ -80,14 +80,14 @@ 
 
 			foreach ($this->blocks as $name => $block) {
 
-				$insertions['{ block:' . $name . ' / }'] = $block->getContents();
+				$insertions['{ block:'.$name.' / }'] = $block->getContents();
 			}
 
 			# Process loops
 
 			foreach ($this->loops as $name => $loop) {
 
-				$insertions['{ for:' . $name . ' / }'] = $loop->getContents();
+				$insertions['{ for:'.$name.' / }'] = $loop->getContents();
 			}
 
 			# Process widgets
@@ -98,7 +98,7 @@ 
 
 				$contents = ((false !== $widget) ? $widget->getContents() : '');
 
-				$insertions['{ widget:' . $name . ' / }'] = $contents;
+				$insertions['{ widget:'.$name.' / }'] = $contents;
 			}
 
 			# Process variables
@@ -107,7 +107,7 @@ 
 
 				$value = ((false === $value) ? Template::getGlobal($name) : $value);
 
-				$insertions['$' . $name . '$'] = Str::formatOutput($value);
+				$insertions['$'.$name.'$'] = Str::formatOutput($value);
 			}
 
 			# Process phrases
@@ -116,7 +116,7 @@ 
 
 				$value = Language::get($name);
 
-				$insertions['%' . $name . '%'] = Str::formatOutput($value);
+				$insertions['%'.$name.'%'] = Str::formatOutput($value);
 			}
 
 			# Process insertions

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

Spacing +21 added lines, -21 removed lines

@@ -73,25 +73,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'
 			];
 
 			# ------------------------
@@ -176,7 +176,7 @@ 
 
 			if (($maxlength < 1) || (self::length($string = trim($string)) <= $maxlength)) return $string;
 
-			$string = (rtrim(self::substr($string, 0, $maxlength)) . ($ellipsis ? '...' : ''));
+			$string = (rtrim(self::substr($string, 0, $maxlength)).($ellipsis ? '...' : ''));
 
 			# ------------------------
 
@@ -204,7 +204,7 @@ 
 
 		public static function encode(string $salt, string $string) {
 
-			return sha1($salt . substr(sha1($string), 8, 32));
+			return sha1($salt.substr(sha1($string), 8, 32));
 		}
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 
 			foreach ($this->fields as $field) {
 
-				$block->setBlock(('field_' . $field->getName()), $field->getBlock());
+				$block->setBlock(('field_'.$field->getName()), $field->getBlock());
 			}
 		}
 	}

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

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