cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Lister/Users.php

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

@@ -2,7 +2,10 @@
 
 namespace Modules\Entitizer\Lister {
 
-	use Modules\Auth, Modules\Entitizer, Utils\Range, Template;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Utils\Range;
+	use Template;
 
 	class Users extends Entitizer\Utils\Lister {
 

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 
 			$view->rank = Lister\Rank::get($user->rank);
 
-			if ($user->id === Auth::user()->id) $view->block('remove')->class = 'disabled';
+			if ($user->id === Auth::user()->id) {
+				$view->block('remove')->class = 'disabled';
+			}
 		}
 	}
 }

www/engine/System/Classes/Modules/Entitizer/Lister/Variables.php

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Listview {
 
-	use Modules\Entitizer, Template;
+	use Modules\Entitizer;
+	use Template;
 
 	class Variables extends Entitizer\Utils\Listview {
 

www/engine/System/Classes/Modules/Entitizer/Lister/Widgets.php

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Listview {
 
-	use Modules\Entitizer, Template;
+	use Modules\Entitizer;
+	use Template;
 
 	class Variables extends Entitizer\Utils\Listview {
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity.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 +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@
 
 			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
 
-			         ("FROM " . static::$table . " ent ") .
+					 ("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 ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+					 ("WHERE ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
 
 			# ------------------------
 

Spacing +6 added lines, -6 removed lines

@@ -18,17 +18,17 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) $selection[$key] = ('ent.'.$field);
 
 			# Process query
 
-			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
+			$query = ("SELECT ".implode(', ', $selection).", rel.ancestor as parent_id ").
 
-			         ("FROM " . static::$table . " ent ") .
+			         ("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 ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+			         ("WHERE ent.".$name." = '".addslashes($value)."' LIMIT 1");
 
 			# ------------------------
 
@@ -133,7 +133,7 @@ 
 
 			# Select entity from DB
 
-			$condition = ($name . " = '" . addslashes($value) . "' AND id != " . $this->id);
+			$condition = ($name." = '".addslashes($value)."' AND id != ".$this->id);
 
 			DB::select(static::$table, 'id', $condition, null, 1);
 

Braces +23 added lines, -7 removed lines

@@ -27,7 +27,9 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) {
+				$selection[$key] = ('ent.' . $field);
+			}
 
 			# Process query
 
@@ -87,13 +89,19 @@ 
 
 		public function init($value, string $name = 'id') {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->index($name))) return false;
+			if (false === ($index = $this->definition->index($name))) {
+				return false;
+			}
 
-			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) return false;
+			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) {
+				return false;
+			}
 
 			# Process name & value
 
@@ -101,7 +109,11 @@ 
 
 			# Select entity from DB
 
-			if (!static::$nesting) $this->selectDefault($name, $value); else $this->selectNesting($name, $value);
+			if (!static::$nesting) {
+				$this->selectDefault($name, $value);
+			} else {
+				$this->selectNesting($name, $value);
+			}
 
 			# ------------------------
 
@@ -114,9 +126,13 @@ 
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->index($name))) return false;
+			if (false === ($index = $this->definition->index($name))) {
+				return false;
+			}
 
-			if ($index->type !== 'UNIQUE') return false;
+			if ($index->type !== 'UNIQUE') {
+				return false;
+			}
 
 			# Process name & value
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Modify.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 +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@ 
 
 			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+					 ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
 
-			         ("LEFT JOIN " . static::$table_relations . " rlx ") .
+					 ("LEFT JOIN " . static::$table_relations . " rlx ") .
 
-			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+					 ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
 
-			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+					 ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -52,13 +52,13 @@ 
 
 			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+					 ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
 
-			         ("FROM " . static::$table_relations . " sup ") .
+					 ("FROM " . static::$table_relations . " sup ") .
 
-			         ("JOIN " . static::$table_relations . " sub ") .
+					 ("JOIN " . static::$table_relations . " sub ") .
 
-			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+					 ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Spacing +10 added lines, -10 removed lines

@@ -25,15 +25,15 @@ 
 
 		private function disconnectSubtree() {
 
-			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
+			$query = ("DELETE rla FROM ".static::$table_relations." rla ").
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+			         ("JOIN ".static::$table_relations." rlb ON rlb.descendant = rla.descendant ").
 
-			         ("LEFT JOIN " . static::$table_relations . " rlx ") .
+			         ("LEFT JOIN ".static::$table_relations." rlx ").
 
-			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ").
 
-			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+			         ("WHERE rlb.ancestor = ".$this->id." AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -50,15 +50,15 @@ 
 
 		private function connectSubtree(int $parent_id) {
 
-			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
+			$query = ("INSERT INTO ".static::$table_relations." (ancestor, descendant, depth) ").
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ").
 
-			         ("FROM " . static::$table_relations . " sup ") .
+			         ("FROM ".static::$table_relations." sup ").
 
-			         ("JOIN " . static::$table_relations . " sub ") .
+			         ("JOIN ".static::$table_relations." sub ").
 
-			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+			         ("WHERE sub.ancestor = ".$this->id." AND sup.descendant = ".$parent_id);
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Braces +66 added lines, -22 removed lines

@@ -35,7 +35,9 @@ 
 
 			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Set path
 
@@ -60,7 +62,9 @@ 
 
 			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
-			if (!(DB::send($query) && (DB::last()->rows > 0))) return false;
+			if (!(DB::send($query) && (DB::last()->rows > 0))) {
+				return false;
+			}
 
 			# Set path
 
@@ -75,27 +79,37 @@ 
 
 		public function create(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (static::$auto_increment && isset($data['id'])) $data['id'] = 0;
+			if (static::$auto_increment && isset($data['id'])) {
+				$data['id'] = 0;
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $data);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Update data
 
-			if (static::$auto_increment) $data['id'] = DB::last()->id;
+			if (static::$auto_increment) {
+				$data['id'] = DB::last()->id;
+			}
 
 			$this->dataset->update($data);
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# Cache entity
 
@@ -110,17 +124,23 @@ 
 
 		public function edit(array $data) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (isset($data['id'])) unset($data['id']);
+			if (isset($data['id'])) {
+				unset($data['id']);
+			}
 
 			# Update entity
 
 			DB::update(static::$table, $data, ['id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Update data
 
@@ -128,7 +148,9 @@ 
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# ------------------------
 
@@ -139,30 +161,44 @@ 
 
 		public function move(int $parent_id) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Re-connect entity if not in tree
 
-			if (!$this->initSubtree()) return false;
+			if (!$this->initSubtree()) {
+				return false;
+			}
 
 			# Create parent entity
 
 			if (0 !== ($parent = Entitizer::get(static::$table, $parent_id))->id) {
 
-				if (false === ($path = $parent->path())) return false;
+				if (false === ($path = $parent->path())) {
+					return false;
+				}
 
-				if (false === ($depth = $this->subtreeDepth())) return false;
+				if (false === ($depth = $this->subtreeDepth())) {
+					return false;
+				}
 
-				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) return false;
+				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) {
+					return false;
+				}
 			}
 
 			# Disconnect subtree from current position
 
-			if (!$this->disconnectSubtree()) return false;
+			if (!$this->disconnectSubtree()) {
+				return false;
+			}
 
 			# Connect subtree under new position
 
-		 	if (0 !== $parent->id) $this->connectSubtree($parent->id);
+		 	if (0 !== $parent->id) {
+		 		$this->connectSubtree($parent->id);
+		 	}
 
 			# ------------------------
 
@@ -173,19 +209,27 @@ 
 
 		public function remove() {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Check if entity is removable
 
-			if (static::$super && ($this->id === 1)) return false;
+			if (static::$super && ($this->id === 1)) {
+				return false;
+			}
 
-			if (static::$nesting && (0 !== $this->subtreeCount())) return false;
+			if (static::$nesting && (0 !== $this->subtreeCount())) {
+				return false;
+			}
 
 			# Remove entity
 
 			DB::delete(static::$table, ['id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Uncache entity
 

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

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

@@ -2,7 +2,14 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, Utils\Pagination, Utils\View, Ajax, Number, Request, Template, Url;
+	use Modules\Entitizer;
+	use Utils\Pagination;
+	use Utils\View;
+	use Ajax;
+	use Number;
+	use Request;
+	use Template;
+	use Url;
 
 	abstract class Listview {
 

Spacing +2 added lines, -2 removed lines

@@ -65,9 +65,9 @@
 
 		private function getPaginationBlock() {
 
-			$query = (static::$nesting ? ('?parent_id=' . $this->parent->id) : '');
+			$query = (static::$nesting ? ('?parent_id='.$this->parent->id) : '');
 
-			$url = new Url(INSTALL_PATH . static::$link . $query);
+			$url = new Url(INSTALL_PATH.static::$link.$query);
 
 			# ------------------------
 

Braces +39 added lines, -17 removed lines

@@ -20,15 +20,15 @@ 
 
 			# Set create button
 
-			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->block('create')->id = $this->parent->id;
-
-			else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
+			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
+				$parent->block('create')->id = $this->parent->id;
+			} else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
 
 			# Set edit button
 
-			if (0 !== $this->parent->id) $parent->block('edit')->id = $this->parent->id;
-
-			else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->block('edit')->id = $this->parent->id;
+			} else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
 
 			# Add parent additional data
 
@@ -43,7 +43,9 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) continue;
+				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) {
+					continue;
+				}
 
 				$items->add($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
 
@@ -101,21 +103,29 @@ 
 
 			# Set path
 
-			if (static::$nesting) $contents->path = $this->path;
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			}
 
 			# Process parent block
 
-			if (static::$nesting && !$ajax) $this->processParent($contents->block('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->block('parent'));
+			}
 
 			# Set items
 
 			$items = $this->getItemsBlock($ajax);
 
-			if ($items->count() > 0) $contents->items = $items;
+			if ($items->count() > 0) {
+				$contents->items = $items;
+			}
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -140,15 +150,21 @@ 
 
 			# Get path and depth
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
-			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) $this->depth = $depth;
+			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) {
+				$this->depth = $depth;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items');
 
-			if (false !== ($items = $this->parent->$lister())) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister())) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 
@@ -159,7 +175,9 @@ 
 
 		public function handle() {
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			$this->index = Number::format(Request::get('index'), 1, 999999);
 
@@ -171,13 +189,17 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items'); $index = $this->index; $display = static::$display;
 
-			if (false !== ($items = $this->parent->$lister([], [], $index, $display))) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister([], [], $index, $display))) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 

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