cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Create.php

Braces +15 added lines, -5 removed lines

@@ -12,25 +12,35 @@
 
 		public function create(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$set = $this->getDataset($data, true);
 
-			if (isset($set['id']) && !($set['id'] > 0)) return false;
+			if (isset($set['id']) && !($set['id'] > 0)) {
+				return false;
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $set);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Re-init entity
 
 			$this->error = false; $this->id = DB::last()->id;
 
-			foreach ($set as $name => $value) if ($name !== 'id') $this->data[$name] = $value;
+			foreach ($set as $name => $value) {
+				if ($name !== 'id') $this->data[$name] = $value;
+			}
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Remove.php

Braces +24 added lines, -8 removed lines

@@ -12,13 +12,19 @@ 
 
 		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->children())) return false;
+			if (static::$nesting && (0 !== $this->children())) {
+				return false;
+			}
 
 			# Remove extension entries
 
@@ -26,18 +32,24 @@ 
 
 				$entity = self::get($extension, $this->id);
 
-				if ($entity->error() || ((0 !== $entity->id) && !$entity->remove())) return false;
+				if ($entity->error() || ((0 !== $entity->id) && !$entity->remove())) {
+					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
 
-			if (self::$cache[static::$type][$this->id] === $this) unset(self::$cache[static::$type][$this->id]);
+			if (self::$cache[static::$type][$this->id] === $this) {
+				unset(self::$cache[static::$type][$this->id]);
+			}
 
 			# Reset id
 
@@ -45,11 +57,15 @@ 
 
 			# Reset data array
 
-			foreach ($this->definition->params() as $name => $param) $this->data[$name] = $param->cast(null);
+			foreach ($this->definition->params() as $name => $param) {
+				$this->data[$name] = $param->cast(null);
+			}
 
 			# Reset path
 
-			if (static::$nesting) $this->data['path'] = [];
+			if (static::$nesting) {
+				$this->data['path'] = [];
+			}
 
 			# Implement entity
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Init.php

Braces +17 added lines, -7 removed lines

@@ -12,13 +12,17 @@ 
 
 		public function init($value, string $name = 'id') {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Check param name
 
-			if ($name === 'id') $param = $this->definition->id();
-
-			else if ((false === ($param = $this->definition->get($name))) || !$param->unique()) return false;
+			if ($name === 'id') {
+				$param = $this->definition->id();
+			} else if ((false === ($param = $this->definition->get($name))) || !$param->unique()) {
+				return false;
+			}
 
 			# Select entity from DB
 
@@ -28,7 +32,9 @@ 
 
 			DB::select(static::$table, $selection, [$name => $value], null, 1);
 
-			if (($this->error = !(DB::last() && DB::last()->status)) || (DB::last()->rows !== 1)) return false;
+			if (($this->error = !(DB::last() && DB::last()->status)) || (DB::last()->rows !== 1)) {
+				return false;
+			}
 
 			$data = DB::last()->row();
 
@@ -36,11 +42,15 @@ 
 
 			$this->id = $this->definition->id()->cast($data['id']);
 
-			foreach ($this->definition->params() as $name => $param) $this->data[$name] = $param->cast($data[$name]);
+			foreach ($this->definition->params() as $name => $param) {
+				$this->data[$name] = $param->cast($data[$name]);
+			}
 
 			# Init path
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Edit.php

Braces +12 added lines, -4 removed lines

@@ -12,7 +12,9 @@ 
 
 		public function edit(array $data) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			$set = $this->getDataset($data);
 
@@ -20,13 +22,19 @@ 
 
 			DB::update(static::$table, $set, ['id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Re-init entity
 
-			foreach ($set as $name => $value) $this->data[$name] = $value;
+			foreach ($set as $name => $value) {
+				$this->data[$name] = $value;
+			}
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Action/Fill.php

Braces +12 added lines, -4 removed lines

@@ -12,19 +12,27 @@
 
 		public function fill(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$set = $this->getDataset($data, true);
 
-			if (!isset($set['id']) || !($set['id'] > 0)) return false;
+			if (!isset($set['id']) || !($set['id'] > 0)) {
+				return false;
+			}
 
 			# Re-init entity
 
 			$this->error = false; $this->id = $set['id'];
 
-			foreach ($set as $name => $value) if ($name !== 'id') $this->data[$name] = $value;
+			foreach ($set as $name => $value) {
+				if ($name !== 'id') $this->data[$name] = $value;
+			}
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity
 

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

Braces +26 added lines, -10 removed lines

@@ -23,11 +23,15 @@ 
 
 			$name = Settings::get(self::$param[$this->section]); $primary = self::$default[$this->section];
 
-			if (self::valid($name) && isset($items[$name])) $active = $name;
-
-			else if (self::valid($primary) && isset($items[$primary])) $active = $primary;
+			if (self::valid($name) && isset($items[$name])) {
+				$active = $name;
+			} else if (self::valid($primary) && isset($items[$primary])) {
+				$active = $primary;
+			}
 
-			foreach (array_keys($items) as $name) $items[$name]['active'] = ($name === $active);
+			foreach (array_keys($items) as $name) {
+				$items[$name]['active'] = ($name === $active);
+			}
 
 			# ------------------------
 
@@ -73,12 +77,16 @@ 
 
 				$items->add($item = View::get(self::$view_item));
 
-				foreach (self::$data as $name) $item->$name = $extension[$name];
+				foreach (self::$data as $name) {
+					$item->$name = $extension[$name];
+				}
 
 				$item->class = ($extension['active'] ? 'positive' : 'grey');
 			}
 
-			if ($items->count()) $contents->block('items', $items);
+			if ($items->count()) {
+				$contents->block('items', $items);
+			}
 
 			# ------------------------
 
@@ -93,15 +101,21 @@ 
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return $ajax->error(Language::get('DEMO_MODE_RESTRICTION'));
+			if (Informer::isDemoMode()) {
+				return $ajax->error(Language::get('DEMO_MODE_RESTRICTION'));
+			}
 
 			# Save configuration
 
 			$param = self::$param[$this->section]; $name = Request::post('name');
 
-			if (false === Settings::set($param, $name)) return $ajax->error(Language::get(self::$error_name));
+			if (false === Settings::set($param, $name)) {
+				return $ajax->error(Language::get(self::$error_name));
+			}
 
-			if (false === Settings::save()) return $ajax->error(Language::get(self::$error_save));
+			if (false === Settings::save()) {
+				return $ajax->error(Language::get(self::$error_save));
+			}
 
 			# ------------------------
 
@@ -116,7 +130,9 @@ 
 
 			$this->items = $this->getHandlerItems();
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

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

Braces +43 added lines, -15 removed lines

@@ -32,11 +32,15 @@ 
 
 				$file_name = ($dir_name . $name . '/Config.php');
 
-				if (!is_array($include = Explorer::php($file_name))) continue;
+				if (!is_array($include = Explorer::php($file_name))) {
+					continue;
+				}
 
 				$config = Arr::select($include, self::$data);
 
-				if (!(self::valid($config['name']) && ($config['name'] === $name))) continue;
+				if (!(self::valid($config['name']) && ($config['name'] === $name))) {
+					continue;
+				}
 
 				$items[$name] = $config;
 			}
@@ -52,11 +56,19 @@ 
 
 			$name = ''; $param = self::$param[self::$section];
 
-			if (self::exists($name_cookie = Cookie::get($param))) $name = $name_cookie;
+			if (self::exists($name_cookie = Cookie::get($param))) {
+				$name = $name_cookie;
+			}
 
-			if (self::exists($name_get = Request::get(self::$name))) $name = $name_get;
+			if (self::exists($name_get = Request::get(self::$name))) {
+				$name = $name_get;
+			}
 
-			if ('' !== $name) Cookie::set($param, $name, self::$cookie_expires); else return false;
+			if ('' !== $name) {
+				Cookie::set($param, $name, self::$cookie_expires);
+			} else {
+				return false;
+			}
 
 			# ------------------------
 
@@ -90,7 +102,9 @@ 
 
 			$section = self::getSection($section); $dir_name = self::getDirName($section);
 
-			if (!Explorer::isDir($dir_name)) throw new Exception\General(self::$error_directory);
+			if (!Explorer::isDir($dir_name)) {
+				throw new Exception\General(self::$error_directory);
+			}
 
 			self::$section = $section; self::$dir_name = $dir_name; self::$items = self::getItems($dir_name);
 
@@ -98,11 +112,15 @@ 
 
 			$primary = (self::exists(self::$default[$section]) ? self::$default[$section] : false);
 
-			if ($selectable && (false !== ($name = self::getUserDefined()))) $name_valid = true;
-
-			else $name_valid = (self::exists($name = Settings::get($param)) || (false !== ($name = $primary)));
+			if ($selectable && (false !== ($name = self::getUserDefined()))) {
+				$name_valid = true;
+			} else {
+				$name_valid = (self::exists($name = Settings::get($param)) || (false !== ($name = $primary)));
+			}
 
-			if (!($name_valid || (null !== ($name = key(self::$items))))) throw new Exception\General(self::$error_select);
+			if (!($name_valid || (null !== ($name = key(self::$items))))) {
+				throw new Exception\General(self::$error_select);
+			}
 
 			# ------------------------
 
@@ -127,7 +145,9 @@ 
 
 		public static function items(string $section = null) {
 
-			if (null === $section) return self::$items;
+			if (null === $section) {
+				return self::$items;
+			}
 
 			$section = self::getSection($section); $dir_name = self::getDirName($section);
 
@@ -152,7 +172,9 @@ 
 
 		public static function path() {
 
-			if ('' === self::$active) return false;
+			if ('' === self::$active) {
+				return false;
+			}
 
 			return (self::$dir_name . self::$active . '/');
 		}
@@ -161,7 +183,9 @@ 
 
 		public static function pathPrimary() {
 
-			if ('' === self::$primary) return false;
+			if ('' === self::$primary) {
+				return false;
+			}
 
 			return (self::$dir_name . self::$primary . '/');
 		}
@@ -170,9 +194,13 @@ 
 
 		public static function data(string $name = null) {
 
-			if ('' === self::$active) return false;
+			if ('' === self::$active) {
+				return false;
+			}
 
-			if (null === $name) return self::$items[self::$active];
+			if (null === $name) {
+				return self::$items[self::$active];
+			}
 
 			return (isset(self::$items[self::$active][$name]) ? self::$items[self::$active][$name] : false);
 		}

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

Braces +6 added lines, -2 removed lines

@@ -32,10 +32,12 @@ 
 
 			$languages = [Extend\Languages::pathPrimary(), Extend\Languages::path()];
 
-			foreach (array_unique($languages) as $path) foreach (static::PHRASES as $name) {
+			foreach (array_unique($languages) as $path) {
+				foreach (static::PHRASES as $name) {
 
 				Language::load($path . 'Phrases/' . $name . '.php');
 			}
+			}
 
 			# Set template globals
 
@@ -57,7 +59,9 @@ 
 
 			# Set timezone
 
-			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) date_default_timezone_set($timezone);
+			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) {
+				date_default_timezone_set($timezone);
+			}
 
 			# ------------------------
 

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

Braces +21 added lines, -8 removed lines

@@ -147,20 +147,29 @@ 
 
 				if ($this instanceof Component\Install) {
 
-					if (Template::isBlock($result = $this->handle())) return $this->displayForm($result, STATUS_CODE_200);
+					if (Template::isBlock($result = $this->handle())) {
+						return $this->displayForm($result, STATUS_CODE_200);
+					}
 				}
 
 				# Handle auth component request
 
 				else if ($this instanceof Component\Auth) {
 
-					if (Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
-
-					if ($this instanceof Component\Auth\Initial) { if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login'); }
+					if (Auth::check()) {
+						Request::redirect(INSTALL_PATH . '/admin');
+					}
 
-					else if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+					if ($this instanceof Component\Auth\Initial) { if (!Auth::initial()) {
+						Request::redirect(INSTALL_PATH . '/admin/login');
+					}
+					} else if (Auth::initial()) {
+						Request::redirect(INSTALL_PATH . '/admin/register');
+					}
 
-					if (Template::isBlock($result = $this->handle())) return $this->displayForm($result, STATUS_CODE_401);
+					if (Template::isBlock($result = $this->handle())) {
+						return $this->displayForm($result, STATUS_CODE_401);
+					}
 				}
 
 				# Handle panel component request
@@ -172,9 +181,13 @@ 
 						Request::redirect(INSTALL_PATH . '/admin/login');
 					}
 
-					if (Template::isBlock($result = $this->handle())) return $this->displayPage($result);
+					if (Template::isBlock($result = $this->handle())) {
+						return $this->displayPage($result);
+					}
 
-					if (Ajax::isResponse($result)) return Ajax::output($result);
+					if (Ajax::isResponse($result)) {
+						return Ajax::output($result);
+					}
 				}
 			}