cadmium-org / cadmium-cms

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

Braces +6 added lines, -2 removed lines

@@ -34,7 +34,9 @@ 
 
 		public static function set(string $type, string $text, string $title = null) {
 
-			if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) return;
+			if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) {
+				return;
+			}
 
 			static::$items[$type] = ['text' => $text, 'title' => (('' !== $title) ? $title : null)];
 		}
@@ -64,7 +66,9 @@ 
 
 				$message->type = $type; $message->text = Template::createBlock($item['text']);
 
-				if (isset($item['title'])) $message->getBlock('title')->set('text', $item['title'])->enable();
+				if (isset($item['title'])) {
+					$message->getBlock('title')->set('text', $item['title'])->enable();
+				}
 			}
 
 			# ------------------------

www/engine/System/Classes/Modules/Page.php

Spacing +5 added lines, -5 removed lines

@@ -68,11 +68,11 @@
 
 			if ($this->page->id !== 1) SEO::set('title', $this->page->title); else $this->_layout = 'Index';
 
-			SEO::set('description',         $this->page->description);
-			SEO::set('keywords',            $this->page->keywords);
-			SEO::set('robots_index',        $this->page->robots_index);
-			SEO::set('robots_follow',       $this->page->robots_follow);
-			SEO::set('canonical',           $this->page->canonical);
+			SEO::set('description', $this->page->description);
+			SEO::set('keywords', $this->page->keywords);
+			SEO::set('robots_index', $this->page->robots_index);
+			SEO::set('robots_follow', $this->page->robots_follow);
+			SEO::set('canonical', $this->page->canonical);
 
 			# ------------------------
 

Braces +21 added lines, -7 removed lines

@@ -25,9 +25,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->getBlock('breadcrumbs')->disable();
-
-			else $contents->getBlock('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->getBlock('breadcrumbs')->disable();
+			} else {
+				$contents->getBlock('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -54,19 +56,31 @@ 
 
 			$slug = $this->_url->getSlug();
 
-			if ('' !== $slug) $this->page->initBySlug($slug); else $this->page->init(1);
+			if ('' !== $slug) {
+				$this->page->initBySlug($slug);
+			} else {
+				$this->page->init(1);
+			}
 
 			# Display error if not found
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Get path
 
-			if (false !== ($path = $this->page->getPath())) $this->path = $path;
+			if (false !== ($path = $this->page->getPath())) {
+				$this->path = $path;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) SEO::set('title', $this->page->title); else $this->_layout = 'Index';
+			if ($this->page->id !== 1) {
+				SEO::set('title', $this->page->title);
+			} else {
+				$this->_layout = 'Index';
+			}
 
 			SEO::set('description',         $this->page->description);
 			SEO::set('keywords',            $this->page->keywords);

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

Braces +6 added lines, -2 removed lines

@@ -45,7 +45,9 @@ 
 
 				$name = Request::post('name');
 
-				if (!$this->loader->activate($name, true)) return $ajax->setError(Language::get(static::$error_activate));
+				if (!$this->loader->activate($name, true)) {
+					return $ajax->setError(Language::get(static::$error_activate));
+				}
 
 			} else if (Request::post('action') === 'list') {
 
@@ -67,7 +69,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

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

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 
 		protected function loadItem(string $name) {
 
-			$path = ($this->dir_name . $name . '/');
+			$path = ($this->dir_name.$name.'/');
 
-			if (null === ($data = JSON::load($path . '.Config.json'))) return null;
+			if (null === ($data = JSON::load($path.'.Config.json'))) return null;
 
 			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) return null;
 

Braces +12 added lines, -4 removed lines

@@ -25,7 +25,9 @@ 
 
 			foreach (Explorer::iterateDirs($this->dir_name) as $name) {
 
-				if (null !== ($data = $this->loadItem($name))) $items[$name] = ($pattern + $data);
+				if (null !== ($data = $this->loadItem($name))) {
+					$items[$name] = ($pattern + $data);
+				}
 			}
 
 			# ------------------------
@@ -43,11 +45,17 @@ 
 
 			$path = ($this->dir_name . $name . '/');
 
-			if (null === ($data = JSON::load($path . '.Config.json'))) return null;
+			if (null === ($data = JSON::load($path . '.Config.json'))) {
+				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::isValid($data['name']) && ($data['name'] === $name))) return null;
+			if (!(static::$extension_class::isValid($data['name']) && ($data['name'] === $name))) {
+				return null;
+			}
 
 			# ------------------------
 

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

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
 		}
 
 		/**
- 		 * Validate an item name
- 		 *
- 		 * @return string|false : the name or false on failure
- 		 */
+		 * Validate an item name
+		 *
+		 * @return string|false : the name or false on failure
+		 */
 
 		public static function validate(string $name) {
 

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 			if (null !== static::$loader) return static::$loader->$name(...$arguments);
 
-			throw new \BadMethodCallException('Call to undefined method ' . get_called_class() . '::' . $name . '()');
+			throw new \BadMethodCallException('Call to undefined method '.get_called_class().'::'.$name.'()');
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
 
 		public static function __callStatic($name, $arguments) {
 
-			if (null !== static::$loader) return static::$loader->$name(...$arguments);
+			if (null !== static::$loader) {
+				return static::$loader->$name(...$arguments);
+			}
 
 			throw new \BadMethodCallException('Call to undefined method ' . get_called_class() . '::' . $name . '()');
 		}

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

Braces +19 added lines, -7 removed lines

@@ -23,7 +23,9 @@ 
 
 			foreach ((Schema::get(static::$schema)->load() ?? []) as $item) {
 
-				if (isset($items[$item['name']])) $items[$item['name']]['installed'] = true;
+				if (isset($items[$item['name']])) {
+					$items[$item['name']]['installed'] = true;
+				}
 			}
 
 			# ------------------------
@@ -41,7 +43,9 @@ 
 
 			foreach ((Schema::get(static::$schema)->load() ?? []) as $item) {
 
-				if (static::$extension_class::isValid($item['name'])) $items[$item['name']] = $item;
+				if (static::$extension_class::isValid($item['name'])) {
+					$items[$item['name']] = $item;
+				}
 			}
 
 			# ------------------------
@@ -70,18 +74,26 @@ 
 
 		public function install(string $name, bool $value = true) : bool {
 
-			if (!isset($this->items[$name])) return false;
+			if (!isset($this->items[$name])) {
+				return false;
+			}
 
 			$items = [];
 
 			foreach ($this->items as $item) {
 
-				if ($value) { if ($item['installed'] || ($item['name'] === $name)) $items[] = $item; }
-
-				else { if ($item['installed'] && ($item['name'] !== $name)) $items[] = $item; }
+				if ($value) { if ($item['installed'] || ($item['name'] === $name)) {
+					$items[] = $item;
+				}
+				} else { if ($item['installed'] && ($item['name'] !== $name)) {
+					$items[] = $item;
+				}
+				}
 			}
 
-			if (!Schema::get(static::$schema)->save($items)) return false;
+			if (!Schema::get(static::$schema)->save($items)) {
+				return false;
+			}
 
 			$this->items[$name]['installed'] = $value;
 

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

Braces +6 added lines, -3 removed lines

@@ -32,7 +32,9 @@ 
 
 			# Throw error if no extensions found
 
-			if (false === static::$loader->get('name')) throw new static::$exception_class;
+			if (false === static::$loader->get('name')) {
+				throw new static::$exception_class;
+			}
 
 			# Activate user defined extension
 
@@ -40,9 +42,10 @@ 
 
 				$name = static::$name; $param = static::$param[static::$loader->getSection()];
 
-				if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param)))
-
+				if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param))) {
+				
 					Cookie::set($param, static::$loader->get('name'), static::$cookie_expires);
+				}
 			}
 		}
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
 
 			# Save uploaded file
 
-			if (true === ($upload = (Uploader::save('upload', (DIR_UPLOADS . $target_dir))))) {
+			if (true === ($upload = (Uploader::save('upload', (DIR_UPLOADS.$target_dir))))) {
 
-				$name = Uploader::getBasename(); $url = (INSTALL_PATH . '/uploads/' . $target_dir . $name);
+				$name = Uploader::getBasename(); $url = (INSTALL_PATH.'/uploads/'.$target_dir.$name);
 
 				$ajax->set('name', $name)->set('url', $url);
 

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::handle('upload', $this->parent->getPathFull(), true)) $submitted = 'upload';
-
-				else if ($this->form->handle(new Filemanager\Controller\Create($this->parent), true)) $submitted = 'create';
+				if (Uploader::handle('upload', $this->parent->getPathFull(), true)) {
+					$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