cadmium-org / cadmium-cms

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

Spacing +6 added lines, -6 removed lines

@@ -28,9 +28,9 @@ 
 
 			# Set link
 
-			$query = (('' !== $this->parent->getPath()) ? ('?parent=' . $this->parent->getPath()) : '');
+			$query = (('' !== $this->parent->getPath()) ? ('?parent='.$this->parent->getPath()) : '');
 
-			$bar->link = (INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$bar->link = (INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# Implement form
 
@@ -45,9 +45,9 @@ 
 
 		private function getPaginationBlock() {
 
-			$query = (('' !== $this->parent->getPath()) ? ('?parent=' . $this->parent->getPath()) : '');
+			$query = (('' !== $this->parent->getPath()) ? ('?parent='.$this->parent->getPath()) : '');
 
-			$url = new Url(INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$url = new Url(INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# ------------------------
 
@@ -148,9 +148,9 @@ 
 
 			if (isset($submitted)) {
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager/' . static::$origin . '?' . (('' !==
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager/'.static::$origin.'?'.(('' !==
 
-					($parent = $this->parent->getPath())) ? ('parent=' . $parent . '&') : '') . 'submitted=' . $submitted);
+					($parent = $this->parent->getPath())) ? ('parent='.$parent.'&') : '').'submitted='.$submitted);
 			}
 
 			# Display success message

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/Lister/Dir.php

Spacing +3 added lines, -3 removed lines

@@ -25,9 +25,9 @@ 
 
 			$name = $entity->getName(); $path = $entity->getPath();
 
-			$query = ('?parent=' . $parent->getPath() .  '&name=' . $name);
+			$query = ('?parent='.$parent->getPath().'&name='.$name);
 
-			$link = (INSTALL_PATH . '/admin/content/filemanager/' . $parent->getOrigin() . '/dir' . $query);
+			$link = (INSTALL_PATH.'/admin/content/filemanager/'.$parent->getOrigin().'/dir'.$query);
 
 			# Set data
 
@@ -35,7 +35,7 @@ 
 
 			# Set link
 
-			$view->link = (INSTALL_PATH . '/admin/content/filemanager/' . $parent->getOrigin() .	'?parent=' . $path);
+			$view->link = (INSTALL_PATH.'/admin/content/filemanager/'.$parent->getOrigin().'?parent='.$path);
 
 			# Set buttons
 

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

Spacing +3 added lines, -3 removed lines

@@ -29,9 +29,9 @@ 
 
 			$format = Filemanager\Utils\Mime::getFormat($entity->getExtension());
 
-			$query = ('?parent=' . $parent->getPath() .  '&name=' . $name);
+			$query = ('?parent='.$parent->getPath().'&name='.$name);
 
-			$link = (INSTALL_PATH . '/admin/content/filemanager/' . $parent->getOrigin() . '/file' . $query);
+			$link = (INSTALL_PATH.'/admin/content/filemanager/'.$parent->getOrigin().'/file'.$query);
 
 			# Set data
 
@@ -39,7 +39,7 @@ 
 
 			# Set link
 
-			$view->link = ($permissions['browse'] ? (INSTALL_PATH . '/uploads/' . $path) : $link);
+			$view->link = ($permissions['browse'] ? (INSTALL_PATH.'/uploads/'.$path) : $link);
 
 			$view->target = ($permissions['browse'] ? '_blank' : '_self');
 

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

Spacing +4 added lines, -4 removed lines

@@ -118,9 +118,9 @@ 
 
 			if (!$this->entity->isInited()) {
 
-				$query = (('' !== $this->parent->getPath()) ? ('?parent=' . $this->parent->getPath()) : '');
+				$query = (('' !== $this->parent->getPath()) ? ('?parent='.$this->parent->getPath()) : '');
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager/' . static::$origin . '/' . $query);
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager/'.static::$origin.'/'.$query);
 			}
 
 			# Create rename form
@@ -142,9 +142,9 @@ 
 
 			foreach ($this->forms as $name => $form) if ($form->handle($this->controllers[$name], true)) {
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager/' . static::$origin . '/' . static::$type .
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager/'.static::$origin.'/'.static::$type.
 
-					'?parent=' . $this->parent->getPath() . '&name=' . $this->entity->getName() . '&submitted=' . $name);
+					'?parent='.$this->parent->getPath().'&name='.$this->entity->getName().'&submitted='.$name);
 			}
 
 			# Display success message

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

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 			$scheme = array_diff(preg_split('/[\/\\\\]+/', $path, -1, PREG_SPLIT_NO_EMPTY), ['.', '..']);
 
-			$path_full = ($this->path_full . (('' !== ($path = implode('/', $scheme))) ? ($path . '/') : ''));
+			$path_full = ($this->path_full.(('' !== ($path = implode('/', $scheme))) ? ($path.'/') : ''));
 
 			if (!Explorer::isDir($path_full)) return;
 

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
 
 			$path_full = ($this->path_full . (('' !== ($path = implode('/', $scheme))) ? ($path . '/') : ''));
 
-			if (!Explorer::isDir($path_full)) return;
+			if (!Explorer::isDir($path_full)) {
+				return;
+			}
 
 			$this->scheme = $scheme; $this->path = $path; $this->path_full = $path_full;
 		}

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

Braces +21 added lines, -7 removed lines

@@ -34,19 +34,33 @@
 
 		public static function getFormat(string $extension) {
 
-			if (self::isImage($extension)) return 'image';
+			if (self::isImage($extension)) {
+				return 'image';
+			}
 
-			if (self::isAudio($extension)) return 'audio';
+			if (self::isAudio($extension)) {
+				return 'audio';
+			}
 
-			if (self::isVideo($extension)) return 'video';
+			if (self::isVideo($extension)) {
+				return 'video';
+			}
 
-			if (in_array($extension, ['doc', 'docx'], true)) return 'word';
+			if (in_array($extension, ['doc', 'docx'], true)) {
+				return 'word';
+			}
 
-			if (in_array($extension, ['xls', 'xlsx'], true)) return 'excel';
+			if (in_array($extension, ['xls', 'xlsx'], true)) {
+				return 'excel';
+			}
 
-			if (in_array($extension, ['ppt', 'pptx'], true)) return 'powerpoint';
+			if (in_array($extension, ['ppt', 'pptx'], true)) {
+				return 'powerpoint';
+			}
 
-			if ($extension === 'pdf') return 'pdf';
+			if ($extension === 'pdf') {
+				return 'pdf';
+			}
 
 			# ------------------------
 

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function getItem(string $name) {
 
-			$file_name = ($this->dir_name . $name . '/.Config.json');
+			$file_name = ($this->dir_name.$name.'/.Config.json');
 
 			if (null === ($data = JSON::load($file_name))) return null;
 

Braces +9 added lines, -3 removed lines

@@ -14,11 +14,17 @@
 
 			$file_name = ($this->dir_name . $name . '/.Config.json');
 
-			if (null === ($data = JSON::load($file_name))) return null;
+			if (null === ($data = JSON::load($file_name))) {
+				return null;
+			}
 
-			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) return null;
+			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) {
+				return null;
+			}
 
-			if (!(static::$extension_class::valid($data['name']) && ($data['name'] === $name))) return null;
+			if (!(static::$extension_class::valid($data['name']) && ($data['name'] === $name))) {
+				return null;
+			}
 
 			# ------------------------
 

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

Braces +36 added lines, -16 removed lines

@@ -29,15 +29,15 @@ 
 
 			# Set create button
 
-			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->getBlock('create')->id = $this->parent->id;
-
-			else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
+			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
+				$parent->getBlock('create')->id = $this->parent->id;
+			} else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
 
 			# Set edit button
 
-			if (0 !== $this->parent->id) $parent->getBlock('edit')->id = $this->parent->id;
-
-			else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('edit')->id = $this->parent->id;
+			} else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
 
 			# Add parent additional data
 
@@ -52,7 +52,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->addItem($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
 
@@ -121,11 +123,15 @@ 
 
 			# 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->getBlock('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Process items block
 
@@ -133,7 +139,9 @@ 
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -160,15 +168,21 @@ 
 
 			# Get path and depth
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
-			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->getSubtreeDepth()))) $this->depth = $depth;
+			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->getSubtreeDepth()))) {
+				$this->depth = $depth;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'getChildren' : 'getItems');
 
-			if (false !== ($items = $this->parent->$lister())) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister())) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 
@@ -183,7 +197,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# Create parent entity
 
@@ -193,7 +209,9 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
 			# Get index
 
@@ -203,7 +221,9 @@ 
 
 			$lister = (static::$nesting ? 'getChildren' : 'getItems'); $display = Settings::get('admin_display_entities');
 
-			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) {
+				$this->items = $items;
+			}
 
 			# ------------------------