cadmium-org / cadmium-cms

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
 

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 			# Sort arrays
 
-			$sort = function (Entity $a, Entity $b) {
+			$sort = function(Entity $a, Entity $b) {
 
 				return strcmp(Str::toLower($a->getName()), Str::toLower($b->getName()));
 			};

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/Framework/Classes/Explorer/Explorer.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if ((null === $type) || (@filetype($dir_name . $name) === $type)) yield $name;
+					if ((null === $type) || (@filetype($dir_name.$name) === $type)) yield $name;
 				}
 
 				closedir($handler);
@@ -115,7 +115,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_dir($name)) self::removeDir($name, true);
 

Braces +26 added lines, -10 removed lines

@@ -21,9 +21,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if ((null === $type) || (@filetype($dir_name . $name) === $type)) yield $name;
+					if ((null === $type) || (@filetype($dir_name . $name) === $type)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -38,7 +42,9 @@ 
 
 		private static function getInfo(string $file_name, int $param, bool $check_exists = true) {
 
-			if ($check_exists && !self::isFile($file_name)) return false;
+			if ($check_exists && !self::isFile($file_name)) {
+				return false;
+			}
 
 			return pathinfo($file_name, $param);
 		}
@@ -117,9 +123,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_dir($name)) self::removeDir($name, true);
-
-					else if (@is_file($name)) self::removeFile($name);
+					if (@is_dir($name)) {
+						self::removeDir($name, true);
+					} else if (@is_file($name)) {
+						self::removeFile($name);
+					}
 				}
 			}
 
@@ -145,7 +153,9 @@ 
 
 		public static function iterate(string $dir_name) : Generator {
 
- 			foreach (self::getList($dir_name) as $name) yield $name;
+ 			foreach (self::getList($dir_name) as $name) {
+ 				yield $name;
+ 			}
  		}
 
 		/**
@@ -154,7 +164,9 @@ 
 
 		public static function iterateDirs(string $dir_name) : Generator {
 
-			foreach (self::getList($dir_name, 'dir') as $name) yield $name;
+			foreach (self::getList($dir_name, 'dir') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -163,7 +175,9 @@ 
 
 		public static function iterateFiles(string $dir_name) : Generator {
 
-			foreach (self::getList($dir_name, 'file') as $name) yield $name;
+			foreach (self::getList($dir_name, 'file') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -334,7 +348,9 @@ 
 
 		public static function include(string $file_name) {
 
-			if ((strtolower(self::getExtension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::getExtension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return @include $file_name;
 		}

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

Doc Comments +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 		/**
 		 * Get the active item data or a specific param value
 		 *
-		 * @return array|mixed|false : the data array, the param value, or false if the active item was not loaded
+		 * @return string : the data array, the param value, or false if the active item was not loaded
 		 */
 
 		public function get(string $param = null) {

Braces +18 added lines, -6 removed lines

@@ -34,11 +34,15 @@ 
 
 		protected function loadFirst() {
 
-			if ($this->loaded) return ($this->items[key($this->items)] ?? null);
+			if ($this->loaded) {
+				return ($this->items[key($this->items)] ?? null);
+			}
 
 			foreach (Explorer::iterateDirs($this->dir_name) as $name) {
 
-				if (null !== ($data = $this->loadItem($name))) return $data;
+				if (null !== ($data = $this->loadItem($name))) {
+					return $data;
+				}
 			}
 
 			# ------------------------
@@ -97,9 +101,13 @@ 
 
 		public function activate(string $name, bool $save = false) : bool {
 
-			if (null === ($data = $this->loadItem($name))) return false;
+			if (null === ($data = $this->loadItem($name))) {
+				return false;
+			}
 
-			if ($save && ((!Settings::set(static::$param[$this->section], $name)) || !Settings::save())) return false;
+			if ($save && ((!Settings::set(static::$param[$this->section], $name)) || !Settings::save())) {
+				return false;
+			}
 
 			$this->active = $data;
 
@@ -125,7 +133,9 @@ 
 
 		public function getPrimary(string $param = null) {
 
-			if (null !== $param) return ($this->primary[$param] ?? false);
+			if (null !== $param) {
+				return ($this->primary[$param] ?? false);
+			}
 
 			return ($this->primary ?? false);
 		}
@@ -138,7 +148,9 @@ 
 
 		public function get(string $param = null) {
 
-			if (null !== $param) return ($this->active[$param] ?? false);
+			if (null !== $param) {
+				return ($this->active[$param] ?? false);
+			}
 
 			return ($this->active ?? false);
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
 			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
 
-			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
+			self::$routes['/'.implode('/', $path)] = ('Addons\\'.$name.'\\'.implode('\\', $handler));
 		}
 
 		/**

Braces +12 added lines, -4 removed lines

@@ -75,7 +75,9 @@ 
 
 			$parts = preg_split('/\//', $string, 0, PREG_SPLIT_NO_EMPTY);
 
-			foreach ($parts as $name) if (!preg_match($regex, $name)) return false;
+			foreach ($parts as $name) {
+				if (!preg_match($regex, $name)) return false;
+			}
 
 			# ------------------------
 
@@ -88,9 +90,13 @@ 
 
 		private static function parseRoute(string $name, array $route) {
 
-			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) return;
+			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) {
+				return;
+			}
 
-			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
+			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) {
+				return;
+			}
 
 			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
 		}
@@ -103,7 +109,9 @@ 
 
 			foreach (Extend\Addons::getItems() as $item) {
 
-				foreach ($item['routes'] as $route) self::parseRoute($item['name'], $route);
+				foreach ($item['routes'] as $route) {
+					self::parseRoute($item['name'], $route);
+				}
 			}
 		}