cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Utils/Listview.php

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, DB;
+	use Modules\Entitizer;
+	use DB;
 
 	abstract class Entity extends Entitizer {
 

Indentation +9 added lines, -9 removed lines

@@ -12,13 +12,13 @@ 
 
 			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . " ") .
 
-			       ("FROM " . static::$table . " ent ") .
+				   ("FROM " . static::$table . " ent ") .
 
 				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
 
 				   ("ORDER BY " . $this->getOrderBy($order_by) . " ") .
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+				   (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
 		}
 
 		# Get nesting select query
@@ -27,9 +27,9 @@ 
 
 			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . ", COUNT(chd.descendant) as children ") .
 
-			       ("FROM " . static::$table . " ent ") .
+				   ("FROM " . static::$table . " ent ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " chd ON chd.ancestor = ent.id AND chd.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " chd ON chd.ancestor = ent.id AND chd.depth = 1 ") .
 
 				   ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
 
@@ -39,7 +39,7 @@ 
 
 				   ("GROUP BY ent.id ORDER BY " . $this->getOrderBy($order_by) . " ") .
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+				   (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
 		}
 
 		# Get default count query
@@ -48,7 +48,7 @@ 
 
 			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
 		}
 
 		# Get nesting count query
@@ -57,11 +57,11 @@ 
 
 			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
 
-			       ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
+				   ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition) : "");
+				   (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition) : "");
 		}
 
 		# Select entries from DB

Spacing +21 added lines, -25 removed lines

@@ -10,58 +10,58 @@ 
 
 		private function getDefaultSelectQuery(array $config, array $order_by, int $index, int $display) {
 
-			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . " ") .
+			return ("SELECT SQL_CALC_FOUND_ROWS ".$this->getSelection()." ").
 
-			       ("FROM " . static::$table . " ent ") .
+			       ("FROM ".static::$table." ent ").
 
-				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition." ") : "").
 
-				   ("ORDER BY " . $this->getOrderBy($order_by) . " ") .
+				   ("ORDER BY ".$this->getOrderBy($order_by)." ").
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+			       (($index > 0) ? ("LIMIT ".((($index - 1) * $display).", ".$display)) : "");
 		}
 
 		# Get nesting select query
 
 		private function getNestingSelectQuery(int $parent_id, array $config, array $order_by, int $index, int $display) {
 
-			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . ", COUNT(chd.descendant) as children ") .
+			return ("SELECT SQL_CALC_FOUND_ROWS ".$this->getSelection().", COUNT(chd.descendant) as children ").
 
-			       ("FROM " . static::$table . " ent ") .
+			       ("FROM ".static::$table." ent ").
 
-			       ("LEFT JOIN " . static::$table_relations . " chd ON chd.ancestor = ent.id AND chd.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." chd ON chd.ancestor = ent.id AND chd.depth = 1 ").
 
-				   ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+				   ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
 
-				   ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
+				   ("WHERE COALESCE(rel.ancestor, 0) = ".$parent_id." ").
 
-				   (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("AND ".$condition." ") : "").
 
-				   ("GROUP BY ent.id ORDER BY " . $this->getOrderBy($order_by) . " ") .
+				   ("GROUP BY ent.id ORDER BY ".$this->getOrderBy($order_by)." ").
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+			       (($index > 0) ? ("LIMIT ".((($index - 1) * $display).", ".$display)) : "");
 		}
 
 		# Get default count query
 
 		private function getDefaultCountQuery(array $config) {
 
-			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(ent.id) as count FROM ".static::$table." ent ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
+			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition) : "");
 		}
 
 		# Get nesting count query
 
 		private function getNestingCountQuery(int $parent_id, array $config) {
 
-			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(ent.id) as count FROM ".static::$table." ent ").
 
-			       ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
 
-			       ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
+			       ("WHERE COALESCE(rel.ancestor, 0) = ".$parent_id." ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition) : "");
+			       (('' !== ($condition = $this->getCondition($config))) ? ("AND ".$condition) : "");
 		}
 
 		# Select entries from DB
@@ -74,9 +74,7 @@ 
 
 			# Select entities
 
-			$query = ((null === $parent_id) ? $this->getDefaultSelectQuery($config, $order_by, $index, $display) :
-
-				$this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
+			$query = ((null === $parent_id) ? $this->getDefaultSelectQuery($config, $order_by, $index, $display) : $this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -113,9 +111,7 @@ 
 
 			# Count entities
 
-			$query = ((null === $parent_id) ? $this->getDefaultCountQuery($config) :
-
-				$this->getNestingCountQuery($parent_id, $config));
+			$query = ((null === $parent_id) ? $this->getDefaultCountQuery($config) : $this->getNestingCountQuery($parent_id, $config));
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Braces +24 added lines, -8 removed lines

@@ -68,9 +68,13 @@ 
 
 		private function select(int $parent_id = null, array $config = [], array $order_by = [], int $index = 0, int $display = 0) {
 
-			if (!((null === $parent_id) || ($parent_id >= 0))) return false;
+			if (!((null === $parent_id) || ($parent_id >= 0))) {
+				return false;
+			}
 
-			if (!(($index >= 0) && ($display >= 0))) return false;
+			if (!(($index >= 0) && ($display >= 0))) {
+				return false;
+			}
 
 			# Select entities
 
@@ -78,7 +82,9 @@ 
 
 				$this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -90,7 +96,9 @@ 
 
 				$items['list'][$entity->id] = ['entity' => $entity];
 
-				if (null !== $parent_id) $items['list'][$entity->id]['children'] = intval($data['children']);
+				if (null !== $parent_id) {
+					$items['list'][$entity->id]['children'] = intval($data['children']);
+				}
 			}
 
 			# Count total
@@ -109,7 +117,9 @@ 
 
 		private function count(int $parent_id = null, array $config = []) {
 
-			if (!((null === $parent_id) || ($parent_id >= 0))) return false;
+			if (!((null === $parent_id) || ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Count entities
 
@@ -117,7 +127,9 @@ 
 
 				$this->getNestingCountQuery($parent_id, $config));
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -142,7 +154,9 @@ 
 
 		public function children(int $parent_id = 0, array $config = [], array $order_by = [], int $index = 0, int $display = 0) {
 
-			if (!static::$nesting) return false;
+			if (!static::$nesting) {
+				return false;
+			}
 
 			return $this->select(...func_get_args());
 		}
@@ -151,7 +165,9 @@ 
 
 		public function childrenCount(int $parent_id = 0, array $config = []) {
 
-			if (!static::$nesting) return false;
+			if (!static::$nesting) {
+				return false;
+			}
 
 			return $this->count(...func_get_args());
 		}

www/engine/System/Classes/Modules/Entitizer/Utils/View.php

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, Config;
+	use Modules\Entitizer;
+	use Config;
 
 	abstract class View {
 

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.'.$field);
 
 			# ------------------------
 
@@ -45,7 +45,7 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.'.$field.' '.$direction);
 
 			# ------------------------
 

Braces +9 added lines, -3 removed lines

@@ -16,7 +16,9 @@ 
 
 			foreach ($data as $field => $direction) {
 
-				if (false === ($param = $this->definition->param($field))) continue;
+				if (false === ($param = $this->definition->param($field))) {
+					continue;
+				}
 
 				$order_by[$param->name] = ((strtoupper($direction) !== 'DESC') ? 'ASC' : 'DESC');
 			}
@@ -32,7 +34,9 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) {
+				$selection[] = ('ent.' . $field);
+			}
 
 			# ------------------------
 
@@ -45,7 +49,9 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) {
+				$order_by[] = ('ent.' . $field . ' ' . $direction);
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Handler/Lister.php

Unused Use Statements +9 added lines, -2 removed lines

@@ -2,8 +2,15 @@
 
 namespace Modules\Filemanager\Handler {
 
-	use Modules\Filemanager, Utils\Messages, Utils\Pagination, Utils\Uploader, Utils\View;
-	use Ajax, Arr, Explorer, Language, Number, Request, Template, Url;
+	use Modules\Filemanager;
+	use Utils\Pagination;
+	use Utils\Uploader;
+	use Utils\View;
+	use Arr;
+	use Number;
+	use Request;
+	use Template;
+	use Url;
 
 	class Listview {
 

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
 
 			$dirs = []; $files = [];
 
-			$prefix = (('' !== $this->parent->path()) ? ($this->parent->path() . '/') : '');
+			$prefix = (('' !== $this->parent->path()) ? ($this->parent->path().'/') : '');
 
 			# Read parent directory contents
 
@@ -25,7 +25,7 @@ 
 
 					if (in_array($name, ['.', '..', '.empty'], true)) continue;
 
-					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
+					$path = ($prefix.$name); $path_full = ($this->parent->pathFull().$name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
@@ -112,9 +112,9 @@ 
 
 		private function getPaginationBlock() {
 
-			$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+			$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-			$url = new Url(INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$url = new Url(INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# ------------------------
 
@@ -137,9 +137,9 @@ 
 
 			# Set link
 
-			$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+			$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-			$contents->link = (INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$contents->link = (INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# Implement form
 
@@ -180,9 +180,9 @@ 
 
 			if ($upload || $this->form->handle(new Filemanager\Controller\Create($this->parent))) {
 
-				$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+				$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager' . $query);
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager'.$query);
 			}
 
 			# Get index

Braces +16 added lines, -8 removed lines

@@ -23,15 +23,19 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (in_array($name, ['.', '..', '.empty'], true)) continue;
+					if (in_array($name, ['.', '..', '.empty'], true)) {
+						continue;
+					}
 
 					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
-					if (@is_dir($path_full)) $dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
-
-					else if (@is_file($path_full)) $files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					if (@is_dir($path_full)) {
+						$dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
+					} else if (@is_file($path_full)) {
+						$files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					}
 				}
 
 				closedir($handler);
@@ -98,9 +102,11 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ($item['type'] === FILEMANAGER_TYPE_DIR) $items->add($this->getDirItemBlock($item));
-
-				else if ($item['type'] === FILEMANAGER_TYPE_FILE) $items->add($this->getFileItemBlock($item));
+				if ($item['type'] === FILEMANAGER_TYPE_DIR) {
+					$items->add($this->getDirItemBlock($item));
+				} else if ($item['type'] === FILEMANAGER_TYPE_FILE) {
+					$items->add($this->getFileItemBlock($item));
+				}
 			}
 
 			# ------------------------
@@ -149,7 +155,9 @@ 
 
 			$items = $this->getItemsBlock();
 
-			if ($items->count() > 0) $contents->items = $items;
+			if ($items->count() > 0) {
+				$contents->items = $items;
+			}
 
 			# Set pagination
 

www/engine/Framework/Classes/Range/Range.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		protected static function init(string $file_name) {
 
-			if (is_array($range = Explorer::php($file_name))) static::$range = $range;
+			if (is_array($range = Explorer::php($file_name))) {
+				static::$range = $range;
+			}
 		}
 
 		# Check if item exists

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

Braces +20 added lines, -5 removed lines

@@ -10,7 +10,12 @@ 
 
 			$value = false;
 
-			foreach ($path as $item) if (isset($array[$item])) $value = ($array = $array[$item]); else return false;
+			foreach ($path as $item) {
+				if (isset($array[$item])) $value = ($array = $array[$item]);
+			}
+			else {
+				return false;
+			}
 
 			# ------------------------
 
@@ -23,10 +28,12 @@ 
 
 			$result = [];
 
-			foreach ($keys as $key) if (is_scalar($key)) {
+			foreach ($keys as $key) {
+				if (is_scalar($key)) {
 
 				$result[$key] = ((isset($array[$key]) && is_scalar($array[$key])) ? $array[$key] : false);
 			}
+			}
 
 			# ------------------------
 
@@ -39,7 +46,9 @@ 
 
 			$result = [];
 
-			foreach ($array as $key => $value) $result[] = [$key_name => $key, $value_name => $value];
+			foreach ($array as $key => $value) {
+				$result[] = [$key_name => $key, $value_name => $value];
+			}
 
 			# ------------------------
 
@@ -57,9 +66,15 @@ 
 
 			$result = []; $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) $result[$key] = $array[$key];
+			foreach (array_keys($column) as $key) {
+				$result[$key] = $array[$key];
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		public function set(string $name, $value) {
 
-			if (is_scalar($value)) $this->data[$name] = $value;
+			if (is_scalar($value)) {
+				$this->data[$name] = $value;
+			}
 
 			return $this;
 		}

www/engine/System/Includes/Tables.php

Spacing +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 
 # Database tables
 
-define('TABLE_PAGES',                               'pages');
-define('TABLE_PAGES_RELATIONS',                     'pages_relations');
+define('TABLE_PAGES', 'pages');
+define('TABLE_PAGES_RELATIONS', 'pages_relations');
 
-define('TABLE_MENU',                                'menu');
-define('TABLE_MENU_RELATIONS',                      'menu_relations');
+define('TABLE_MENU', 'menu');
+define('TABLE_MENU_RELATIONS', 'menu_relations');
 
-define('TABLE_VARIABLES',                           'variables');
-define('TABLE_WIDGETS',                             'widgets');
+define('TABLE_VARIABLES', 'variables');
+define('TABLE_WIDGETS', 'widgets');
 
-define('TABLE_USERS',                               'users');
-define('TABLE_USERS_SECRETS',                       'users_secrets');
-define('TABLE_USERS_SESSIONS',                      'users_sessions');
+define('TABLE_USERS', 'users');
+define('TABLE_USERS_SECRETS', 'users_secrets');
+define('TABLE_USERS_SESSIONS', 'users_sessions');

www/engine/System/Includes/Config.php

Spacing +61 added lines, -61 removed lines

@@ -2,126 +2,126 @@
 
 # Admin ip
 
-define('CONFIG_ADMIN_IP',                           '');
+define('CONFIG_ADMIN_IP', '');
 
 # Session
 
-define('CONFIG_SESSION_NAME',                       '_sessid');
-define('CONFIG_SESSION_LIFETIME',                   2592000);       # 30 days
+define('CONFIG_SESSION_NAME', '_sessid');
+define('CONFIG_SESSION_LIFETIME', 2592000); # 30 days
 
 # Language
 
-define('CONFIG_LANGUAGE_COOKIE_EXPIRES',            30758400);      # 356 days
+define('CONFIG_LANGUAGE_COOKIE_EXPIRES', 30758400); # 356 days
 
 # Template
 
-define('CONFIG_TEMPLATE_COOKIE_EXPIRES',            30758400);      # 356 days
+define('CONFIG_TEMPLATE_COOKIE_EXPIRES', 30758400); # 356 days
 
 # Entitizer
 
-define('CONFIG_ENTITIZER_MAX_DEPTH',                6);
+define('CONFIG_ENTITIZER_MAX_DEPTH', 6);
 
 # Page
 
-define('CONFIG_PAGE_TITLE_MAX_LENGTH',              255);
-define('CONFIG_PAGE_NAME_MAX_LENGTH',               40);
-define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH',        512);
-define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH',           512);
+define('CONFIG_PAGE_TITLE_MAX_LENGTH', 255);
+define('CONFIG_PAGE_NAME_MAX_LENGTH', 40);
+define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH', 512);
+define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH', 512);
 
 # Menuitem
 
-define('CONFIG_MENUITEM_TEXT_MAX_LENGTH',           255);
-define('CONFIG_MENUITEM_SLUG_MAX_LENGTH',           255);
-define('CONFIG_MENUITEM_POSITION_MAX_LENGTH',       2);
+define('CONFIG_MENUITEM_TEXT_MAX_LENGTH', 255);
+define('CONFIG_MENUITEM_SLUG_MAX_LENGTH', 255);
+define('CONFIG_MENUITEM_POSITION_MAX_LENGTH', 2);
 
 # Variables
 
-define('CONFIG_VARIABLE_TITLE_MAX_LENGTH',          64);
-define('CONFIG_VARIABLE_NAME_MAX_LENGTH',           32);
-define('CONFIG_VARIABLE_VALUE_MAX_LENGTH',          255);
+define('CONFIG_VARIABLE_TITLE_MAX_LENGTH', 64);
+define('CONFIG_VARIABLE_NAME_MAX_LENGTH', 32);
+define('CONFIG_VARIABLE_VALUE_MAX_LENGTH', 255);
 
 # Widgets
 
-define('CONFIG_WIDGET_TITLE_MAX_LENGTH',            64);
-define('CONFIG_WIDGET_NAME_MAX_LENGTH',             32);
+define('CONFIG_WIDGET_TITLE_MAX_LENGTH', 64);
+define('CONFIG_WIDGET_NAME_MAX_LENGTH', 32);
 
 # Filemanager
 
-define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH',        128);
+define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128);
 
 # User
 
-define('CONFIG_USER_SESSION_LIFETIME',              604800);        # 7 days
-define('CONFIG_USER_SECRET_LIFETIME',               86400);         # 1 day
+define('CONFIG_USER_SESSION_LIFETIME', 604800); # 7 days
+define('CONFIG_USER_SECRET_LIFETIME', 86400); # 1 day
 
-define('CONFIG_USER_NAME_MIN_LENGTH',               4);
-define('CONFIG_USER_NAME_MAX_LENGTH',               16);
+define('CONFIG_USER_NAME_MIN_LENGTH', 4);
+define('CONFIG_USER_NAME_MAX_LENGTH', 16);
 
-define('CONFIG_USER_PASSWORD_MIN_LENGTH',           4);
-define('CONFIG_USER_PASSWORD_MAX_LENGTH',           32);
+define('CONFIG_USER_PASSWORD_MIN_LENGTH', 4);
+define('CONFIG_USER_PASSWORD_MAX_LENGTH', 32);
 
-define('CONFIG_USER_EMAIL_MAX_LENGTH',              128);
+define('CONFIG_USER_EMAIL_MAX_LENGTH', 128);
 
-define('CONFIG_USER_FIRST_NAME_MAX_LENGTH',         32);
-define('CONFIG_USER_LAST_NAME_MAX_LENGTH',          32);
+define('CONFIG_USER_FIRST_NAME_MAX_LENGTH', 32);
+define('CONFIG_USER_LAST_NAME_MAX_LENGTH', 32);
 
-define('CONFIG_USER_CITY_MAX_LENGTH',               32);
+define('CONFIG_USER_CITY_MAX_LENGTH', 32);
 
-define('CONFIG_USER_CAPTCHA_MAX_LENGTH',            16);
+define('CONFIG_USER_CAPTCHA_MAX_LENGTH', 16);
 
 # Captcha
 
-define('CONFIG_CAPTCHA_LENGTH',                     5);
+define('CONFIG_CAPTCHA_LENGTH', 5);
 
-define('CONFIG_CAPTCHA_WIDTH',                      150);
-define('CONFIG_CAPTCHA_HEIGHT',                     40);
+define('CONFIG_CAPTCHA_WIDTH', 150);
+define('CONFIG_CAPTCHA_HEIGHT', 40);
 
-define('CONFIG_CAPTCHA_FONT',                       'Fonts/airstrip.ttf');
-define('CONFIG_CAPTCHA_FONT_SIZE',                  20);
+define('CONFIG_CAPTCHA_FONT', 'Fonts/airstrip.ttf');
+define('CONFIG_CAPTCHA_FONT_SIZE', 20);
 
-define('CONFIG_CAPTCHA_TEXT_INDENT',                15);
-define('CONFIG_CAPTCHA_TEXT_STEP',                  25);
+define('CONFIG_CAPTCHA_TEXT_INDENT', 15);
+define('CONFIG_CAPTCHA_TEXT_STEP', 25);
 
 # Admin
 
-define('CONFIG_ADMIN_LANGUAGE_DEFAULT',             'en-US');
-define('CONFIG_ADMIN_TEMPLATE_DEFAULT',             'Default');
+define('CONFIG_ADMIN_LANGUAGE_DEFAULT', 'en-US');
+define('CONFIG_ADMIN_TEMPLATE_DEFAULT', 'Default');
 
-define('CONFIG_ADMIN_PAGES_DISPLAY',                50);
-define('CONFIG_ADMIN_MENUITEMS_DISPLAY',            50);
-define('CONFIG_ADMIN_VARIABLES_DISPLAY',            50);
-define('CONFIG_ADMIN_WIDGETS_DISPLAY',              50);
-define('CONFIG_ADMIN_USERS_DISPLAY',                50);
+define('CONFIG_ADMIN_PAGES_DISPLAY', 50);
+define('CONFIG_ADMIN_MENUITEMS_DISPLAY', 50);
+define('CONFIG_ADMIN_VARIABLES_DISPLAY', 50);
+define('CONFIG_ADMIN_WIDGETS_DISPLAY', 50);
+define('CONFIG_ADMIN_USERS_DISPLAY', 50);
 
-define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY',    50);
+define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY', 50);
 
 # Site
 
-define('CONFIG_SITE_LANGUAGE_DEFAULT',              'en-US');
-define('CONFIG_SITE_TEMPLATE_DEFAULT',              'Default');
+define('CONFIG_SITE_LANGUAGE_DEFAULT', 'en-US');
+define('CONFIG_SITE_TEMPLATE_DEFAULT', 'Default');
 
-define('CONFIG_SITE_TITLE_DEFAULT',                 'Demo Site');
-define('CONFIG_SITE_SLOGAN_DEFAULT',                'A place for site slogan');
+define('CONFIG_SITE_TITLE_DEFAULT', 'Demo Site');
+define('CONFIG_SITE_SLOGAN_DEFAULT', 'A place for site slogan');
 
-define('CONFIG_SITE_TITLE_MAX_LENGTH',              128);
-define('CONFIG_SITE_SLOGAN_MAX_LENGTH',             255);
-define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH',        512);
-define('CONFIG_SITE_KEYWORDS_MAX_LENGTH',           512);
+define('CONFIG_SITE_TITLE_MAX_LENGTH', 128);
+define('CONFIG_SITE_SLOGAN_MAX_LENGTH', 255);
+define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH', 512);
+define('CONFIG_SITE_KEYWORDS_MAX_LENGTH', 512);
 
 # System
 
-define('CONFIG_SYSTEM_URL_MAX_LENGTH',              128);
-define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH',            128);
+define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128);
+define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128);
 
-define('CONFIG_SYSTEM_TIMEZONE_DEFAULT',            'UTC');
+define('CONFIG_SYSTEM_TIMEZONE_DEFAULT', 'UTC');
 
 # Database
 
-define('CONFIG_DATABASE_SERVER_MAX_LENGTH',         128);
-define('CONFIG_DATABASE_USER_MAX_LENGTH',           64);
-define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH',       64);
-define('CONFIG_DATABASE_NAME_MAX_LENGTH',           64);
+define('CONFIG_DATABASE_SERVER_MAX_LENGTH', 128);
+define('CONFIG_DATABASE_USER_MAX_LENGTH', 64);
+define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH', 64);
+define('CONFIG_DATABASE_NAME_MAX_LENGTH', 64);
 
 # Other
 
-define('CONFIG_UPLOADS_MAX_SIZE',                   104857600);  # 100 MB
+define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB

www/engine/System/Classes/Utils/Menu.php

Braces +9 added lines, -3 removed lines

@@ -20,7 +20,9 @@ 
 
 				$item->children = ($children = Template::group());
 
-				foreach ($this->menu[$id]['children'] as $child) $children->add($this->parseItem($child));
+				foreach ($this->menu[$id]['children'] as $child) {
+					$children->add($this->parseItem($child));
+				}
 
 			} else {
 
@@ -44,7 +46,9 @@ 
 
 			$menu = Entitizer::treeview(TABLE_MENU)->subtree(0, ['active' => true]);
 
-			if (false !== $menu) $this->menu = $menu;
+			if (false !== $menu) {
+				$this->menu = $menu;
+			}
 		}
 
 		# Get block
@@ -53,7 +57,9 @@ 
 
 			$menu = Template::group();
 
-			foreach ($this->menu[0]['children'] as $id) $menu->add($this->parseItem($id));
+			foreach ($this->menu[0]['children'] as $id) {
+				$menu->add($this->parseItem($id));
+			}
 
 			# ------------------------