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

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

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/Template.php

Braces +3 added lines, -1 removed lines

@@ -95,7 +95,9 @@
 
 		public static function output(Template\Block $block, int $status = STATUS_CODE_200) {
 
-			if (!Headers::isStatusCode($status)) $status = STATUS_CODE_200;
+			if (!Headers::isStatusCode($status)) {
+				$status = STATUS_CODE_200;
+			}
 
 			Headers::sendNoCache(); Headers::sendStatus($status); Headers::sendContent(MIME_TYPE_HTML);
 

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

Braces +47 added lines, -21 removed lines

@@ -23,7 +23,9 @@ 
 
 		private function registerWidget(string $name) {
 
-			if (false === Template::getWidget($name)) Template::setWidget($name, new Block);
+			if (false === Template::getWidget($name)) {
+				Template::setWidget($name, new Block);
+			}
 		}
 
 		/**
@@ -40,15 +42,19 @@ 
 
 				$type = $matches[2][$key]; $name = $matches[3][$key]; $contents = ($matches[4][$key] ?? '');
 
-				if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) continue;
+				if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) {
+					continue;
+				}
 
 				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
 
-				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
-
-				else if ($type === 'for') $this->loops[$name] = new Loop($contents);
-
-				else if ($type === 'widget') $this->registerWidget($this->widgets[] = $name);
+				if ($type === 'block') {
+					$this->blocks[$name] = (new Block($contents))->$toggle();
+				} else if ($type === 'for') {
+					$this->loops[$name] = new Loop($contents);
+				} else if ($type === 'widget') {
+					$this->registerWidget($this->widgets[] = $name);
+				}
 			}
 		}
 
@@ -68,7 +74,9 @@ 
 
 				foreach ($matches[1] as $index => $name) {
 
-					if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) continue;
+					if (!preg_match(REGEX_TEMPLATE_COMPONENT_NAME, $name)) {
+						continue;
+					}
 
 					$elementaries['stack'][$name] = false;
 				}
@@ -152,11 +160,17 @@ 
 
 		public function __clone() {
 
-			foreach ($this->blocks as $name => $block) $this->blocks[$name] = clone $block;
+			foreach ($this->blocks as $name => $block) {
+				$this->blocks[$name] = clone $block;
+			}
 
-			foreach ($this->loops as $name => $loop) $this->loops[$name] = clone $loop;
+			foreach ($this->loops as $name => $loop) {
+				$this->loops[$name] = clone $loop;
+			}
 
-			foreach ($this->items as $name => $item) $this->items[$name] = clone $item;
+			foreach ($this->items as $name => $item) {
+				$this->items[$name] = clone $item;
+			}
 		}
 
 		/**
@@ -167,11 +181,13 @@ 
 
 		public function set(string $name, $value) : Block {
 
-			if ($value instanceof Block) $this->setBlock($name, $value);
-
-			else if (is_array($value)) $this->setLoop($name, $value);
-
-			else if (is_scalar($value)) $this->setVar($name, $value);
+			if ($value instanceof Block) {
+				$this->setBlock($name, $value);
+			} else if (is_array($value)) {
+				$this->setLoop($name, $value);
+			} else if (is_scalar($value)) {
+				$this->setVar($name, $value);
+			}
 
 			# ------------------------
 
@@ -186,7 +202,9 @@ 
 
 		public function setArray(array $components) : Block {
 
-			foreach ($components as $name => $component) $this->set($name, $component);
+			foreach ($components as $name => $component) {
+				$this->set($name, $component);
+			}
 
 			return $this;
 		}
@@ -199,7 +217,9 @@ 
 
 		public function setBlock(string $name, Block $block) : Block {
 
-			if (isset($this->blocks[$name])) $this->blocks[$name] = $block;
+			if (isset($this->blocks[$name])) {
+				$this->blocks[$name] = $block;
+			}
 
 			return $this;
 		}
@@ -212,7 +232,9 @@ 
 
 		public function setLoop(string $name, array $items) : Block {
 
-			if (isset($this->loops[$name])) $this->loops[$name]->setItems($items);
+			if (isset($this->loops[$name])) {
+				$this->loops[$name]->setItems($items);
+			}
 
 			return $this;
 		}
@@ -225,7 +247,9 @@ 
 
 		public function setVar(string $name, string $value) : Block {
 
-			if (isset($this->variables[$name])) $this->variables[$name] = $value;
+			if (isset($this->variables[$name])) {
+				$this->variables[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -307,7 +331,9 @@ 
 
 		public function getContents() : string {
 
-			if (!$this->enabled) return '';
+			if (!$this->enabled) {
+				return '';
+			}
 
 			# Lock the block
 

www/engine/Framework/Classes/Arr/Arr.php

Braces +20 added lines, -5 removed lines

@@ -22,7 +22,12 @@ 
 
 			$value = null;
 
-			foreach ($path as $item) if (isset($array[$item])) $value = ($array = $array[$item]); else return null;
+			foreach ($path as $item) {
+				if (isset($array[$item])) $value = ($array = $array[$item]);
+			}
+			else {
+				return null;
+			}
 
 			# ------------------------
 
@@ -38,7 +43,9 @@ 
 
 			$selected = array_intersect_key($array, array_flip($keys));
 
-			if (null !== $filter) $selected = array_filter($array, $filter);
+			if (null !== $filter) {
+				$selected = array_filter($array, $filter);
+			}
 
 			# ------------------------
 
@@ -54,7 +61,9 @@ 
 
 			$indexed = [];
 
-			foreach ($array as $key => $value) $indexed[] = [$key_name => $key, $value_name => $value];
+			foreach ($array as $key => $value) {
+				$indexed[] = [$key_name => $key, $value_name => $value];
+			}
 
 			# ------------------------
 
@@ -71,9 +80,15 @@ 
 
 			$sorted = []; $column = array_map($select_key, $array);
 
-			if (!$descending) asort($column); else arsort($column);
+			if (!$descending) {
+				asort($column);
+			} else {
+				arsort($column);
+			}
 
-			foreach (array_keys($column) as $key) $sorted[$key] = $array[$key];
+			foreach (array_keys($column) as $key) {
+				$sorted[$key] = $array[$key];
+			}
 
 			# ------------------------
 

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
 		public static function sortby(array $array, $sub_key, bool $descending = false) : array {
 
-			$select_key = function ($element) use ($sub_key) { return ($element[$sub_key] ?? false); };
+			$select_key = function($element) use ($sub_key) { return ($element[$sub_key] ?? false); };
 
 			$sorted = []; $column = array_map($select_key, $array);