cadmium-org / cadmium-cms

www/engine/System/Classes/Frames/Section.php

Braces +6 added lines, -2 removed lines

@@ -32,10 +32,12 @@ 
 
 			$phrases = array_merge(static::PHRASES, array_keys(Extend\Addons::items() ?? []));
 
-			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
+			foreach (array_unique($languages) as $path) {
+				foreach ($phrases as $name) {
 
 				Language::load($path . 'Phrases/' . $name . '.php');
 			}
+			}
 		}
 
 		/**
@@ -86,7 +88,9 @@ 
 
 			# Set timezone
 
-			if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) date_default_timezone_set($timezone);
+			if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) {
+				date_default_timezone_set($timezone);
+			}
 
 			# Init utils
 

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

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		protected function handle(bool $ajax = false) {
 
-			if (!$ajax) return false;
+			if (!$ajax) {
+				return false;
+			}
 
 			# Create response
 

www/engine/System/Classes/Modules/Filemanager/Controller/Rename.php

Braces +12 added lines, -4 removed lines

@@ -44,19 +44,27 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
-			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) {
+				return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			}
 
 			# Check if name is used
 
-			if (!$this->entity->check($name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (!$this->entity->check($name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Rename entity
 
-			if (!$this->entity->rename($name)) return (($this->entity->getType() === 'dir') ?
+			if (!$this->entity->rename($name)) {
+				return (($this->entity->getType() === 'dir') ?
 
 				'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Edit.php

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,9 @@
 
 			# Rename item
 
-			if (false === $this->entity->putContents($contents)) return 'FILEMANAGER_ERROR_FILE_EDIT';
+			if (false === $this->entity->putContents($contents)) {
+				return 'FILEMANAGER_ERROR_FILE_EDIT';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Create.php

Braces +12 added lines, -4 removed lines

@@ -44,9 +44,13 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
-			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) {
+				return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			}
 
 			# Get entity
 
@@ -54,11 +58,15 @@ 
 
 			# Check if name is used
 
-			if (!$entity->check($name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (!$entity->check($name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Create entity
 
-			if (!$entity->create($name, 'dir')) return 'FILEMANAGER_ERROR_DIR_CREATE';
+			if (!$entity->create($name, 'dir')) {
+				return 'FILEMANAGER_ERROR_DIR_CREATE';
+			}
 
 			# ------------------------
 

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

Braces +27 added lines, -13 removed lines

@@ -64,7 +64,9 @@ 
 
 			# Set parent
 
-			if (!$ajax) $contents->parent = $this->parent->getPath();
+			if (!$ajax) {
+				$contents->parent = $this->parent->getPath();
+			}
 
 			# Set origin and title
 
@@ -76,7 +78,9 @@ 
 
 			# Process bar
 
-			if (!$ajax) $this->processBar($contents->getBlock('bar'));
+			if (!$ajax) {
+				$this->processBar($contents->getBlock('bar'));
+			}
 
 			# Set items
 
@@ -84,14 +88,18 @@ 
 
 			foreach ($this->loader->getItems() as $entity) {
 
-				if ($entity->isDir()) $items->addItem(Lister\Dir::getBlock($entity, $ajax));
-
-				else $items->addItem(Lister\File::getBlock($entity, $ajax));
+				if ($entity->isDir()) {
+					$items->addItem(Lister\Dir::getBlock($entity, $ajax));
+				} else {
+					$items->addItem(Lister\File::getBlock($entity, $ajax));
+				}
 			}
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -127,7 +135,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# Create parent
 
@@ -141,9 +151,11 @@ 
 
 			if (static::$permissions['manage']) {
 
-				if (Uploader::submit('upload', $this->parent->getPathFull())) $submitted = 'upload';
-
-				else if ($this->form->handle(new Filemanager\Controller\Create($this->parent), true)) $submitted = 'create';
+				if (Uploader::submit('upload', $this->parent->getPathFull())) {
+					$submitted = 'upload';
+				} else if ($this->form->handle(new Filemanager\Controller\Create($this->parent), true)) {
+					$submitted = 'create';
+				}
 			}
 
 			if (isset($submitted)) {
@@ -155,9 +167,11 @@ 
 
 			# Display success message
 
-			if (Request::get('submitted') === 'upload') Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_UPLOAD'));
-
-			else if (Request::get('submitted') === 'create') Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_DIR_CREATE'));
+			if (Request::get('submitted') === 'upload') {
+				Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_UPLOAD'));
+			} else if (Request::get('submitted') === 'create') {
+				Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_DIR_CREATE'));
+			}
 
 			# Load items
 

www/engine/System/Classes/Modules/Filemanager/Utils/Loader.php

Braces +14 added lines, -4 removed lines

@@ -35,7 +35,9 @@ 
 
 		public function load(int $index = 0, int $display = 0) : Loader {
 
-			if (!(($index >= 0) && ($display >= 0))) return $this;
+			if (!(($index >= 0) && ($display >= 0))) {
+				return $this;
+			}
 
 			$dirs = []; $files = [];
 
@@ -43,9 +45,15 @@ 
 
 			foreach (Explorer::iterate($this->parent->getPathFull()) as $name) {
 
-				if (!($entity = new Entity($this->parent, $name))->isInited()) continue;
+				if (!($entity = new Entity($this->parent, $name))->isInited()) {
+					continue;
+				}
 
-				if ($entity->isDir()) $dirs[] = $entity; else $files[] = $entity;
+				if ($entity->isDir()) {
+					$dirs[] = $entity;
+				} else {
+					$files[] = $entity;
+				}
 			}
 
 			# Sort arrays
@@ -61,7 +69,9 @@ 
 
 			$items = array_merge($dirs, $files); $total = count($items);
 
-			if (($index > 0) && ($display > 0)) $items = array_splice($items, (($index - 1) * $display), $display);
+			if (($index > 0) && ($display > 0)) {
+				$items = array_splice($items, (($index - 1) * $display), $display);
+			}
 
 			# Set properties
 

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

Braces +14 added lines, -6 removed lines

@@ -45,7 +45,9 @@ 
 
 			# Implement forms
 
-			foreach ($this->forms as $form) $form->implement($contents);
+			foreach ($this->forms as $form) {
+				$form->implement($contents);
+			}
 
 			# Process info block
 
@@ -104,7 +106,9 @@ 
 
 			# Handle ajax request
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# Create parent
 
@@ -140,18 +144,22 @@ 
 
 			# Handle form
 
-			foreach ($this->forms as $name => $form) if ($form->handle($this->controllers[$name], true)) {
+			foreach ($this->forms as $name => $form) {
+				if ($form->handle($this->controllers[$name], true)) {
 
 				Request::redirect(INSTALL_PATH . '/admin/content/filemanager/' . static::$origin . '/' . static::$type .
 
 					'?parent=' . $this->parent->getPath() . '&name=' . $this->entity->getName() . '&submitted=' . $name);
 			}
+			}
 
 			# Display success message
 
-			if (Request::get('submitted') === 'rename') Popup::set('positive', Language::get(static::$message_success_rename));
-
-			else if (Request::get('submitted') === 'edit') Popup::set('positive', Language::get(static::$message_success_edit));
+			if (Request::get('submitted') === 'rename') {
+				Popup::set('positive', Language::get(static::$message_success_rename));
+			} else if (Request::get('submitted') === 'edit') {
+				Popup::set('positive', Language::get(static::$message_success_edit));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Utils/Entity.php

Braces +72 added lines, -24 removed lines

@@ -23,9 +23,13 @@ 
 
 		private function getPrototype(string $name) {
 
-			if (('' === $name) || preg_match('/[\/\\\\]/', $name)) return false;
+			if (('' === $name) || preg_match('/[\/\\\\]/', $name)) {
+				return false;
+			}
 
-			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) return false;
+			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) {
+				return false;
+			}
 
 			$path = (($this->parent->getPath() ? ($this->parent->getPath() . '/') : '') . $name);
 
@@ -53,17 +57,23 @@ 
 
 		public function init(string $name) : bool {
 
-			if (false === ($prototype = $this->getPrototype($name))) return false;
+			if (false === ($prototype = $this->getPrototype($name))) {
+				return false;
+			}
 
 			# Check type
 
 			$type = Explorer::getType($prototype['path_full']);
 
-			if (!in_array($type, ['dir', 'file'], true)) return false;
+			if (!in_array($type, ['dir', 'file'], true)) {
+				return false;
+			}
 
 			# Set data
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			$this->type = $type;
 
@@ -81,9 +91,13 @@ 
 
 		public function check(string $name) : bool {
 
-			if (false === ($prototype = $this->getPrototype($name))) return false;
+			if (false === ($prototype = $this->getPrototype($name))) {
+				return false;
+			}
 
-			if (($name !== $this->name) && Explorer::exists($prototype['path_full'])) return false;
+			if (($name !== $this->name) && Explorer::exists($prototype['path_full'])) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -98,19 +112,27 @@ 
 
 		public function create(string $name, string $type) : bool {
 
-			if (('' !== $this->name) || (false === ($prototype = $this->getPrototype($name)))) return false;
+			if (('' !== $this->name) || (false === ($prototype = $this->getPrototype($name)))) {
+				return false;
+			}
 
-			if (!in_array($type, ['dir', 'file'], true)) return false;
+			if (!in_array($type, ['dir', 'file'], true)) {
+				return false;
+			}
 
 			# Create entity
 
 			$create = (($type === 'dir') ? 'createDir' : 'createFile');
 
-			if (!Explorer::$create($prototype['path_full'])) return false;
+			if (!Explorer::$create($prototype['path_full'])) {
+				return false;
+			}
 
 			# Set data
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			$this->type = $type;
 
@@ -127,15 +149,21 @@ 
 
 		public function rename(string $name) : bool {
 
-			if (('' === $this->name) || (false === ($prototype = $this->getPrototype($name)))) return false;
+			if (('' === $this->name) || (false === ($prototype = $this->getPrototype($name)))) {
+				return false;
+			}
 
 			# Rename entity
 
-			if (!Explorer::rename($this->path_full, $prototype['path_full'])) return false;
+			if (!Explorer::rename($this->path_full, $prototype['path_full'])) {
+				return false;
+			}
 
 			# Set data
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			# ------------------------
 
@@ -150,13 +178,17 @@ 
 
 		public function remove() : bool {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			# Remove entity
 
 			$remove = (($this->type === 'dir') ? 'removeDir' : 'removeFile');
 
-			if (!Explorer::$remove($this->path_full, true)) return false;
+			if (!Explorer::$remove($this->path_full, true)) {
+				return false;
+			}
 
 			# Reset data
 
@@ -175,7 +207,9 @@ 
 
 		public function getExtension() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return strtolower(Explorer::getExtension($this->name, false));
 		}
@@ -188,7 +222,9 @@ 
 
 		public function getCreated() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getCreated($this->path_full);
 		}
@@ -201,7 +237,9 @@ 
 
 		public function getAccessed() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getAccessed($this->path_full);
 		}
@@ -214,7 +252,9 @@ 
 
 		public function getModified() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getModified($this->path_full);
 		}
@@ -227,7 +267,9 @@ 
 
 		public function getPermissions() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getPermissions($this->path_full);
 		}
@@ -240,7 +282,9 @@ 
 
 		public function getSize() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getSize($this->path_full);
 		}
@@ -253,7 +297,9 @@ 
 
 		public function getContents() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getContents($this->path_full);
 		}
@@ -266,7 +312,9 @@ 
 
 		public function putContents(string $contents) {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::putContents($this->path_full, $contents);
 		}