cadmium-org / cadmium-cms

www/engine/Main.php

Braces +12 added lines, -6 removed lines

@@ -2,7 +2,9 @@ 
 
 # Check PHP version
 
-if (version_compare(PHP_VERSION, '7.0.0') < 0) exit('PHP version 7 or higher is required.');
+if (version_compare(PHP_VERSION, '7.0.0') < 0) {
+	exit('PHP version 7 or higher is required.');
+}
 
 # Set error reporting
 
@@ -37,9 +39,11 @@ 
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
-
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	} else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	}
 
 	# Check if class exists
 
@@ -50,5 +54,7 @@ 
 
 	# Call autoload method
 
-	if (method_exists($class_name, '__autoload')) $class_name::__autoload();
-});
+	if (method_exists($class_name, '__autoload')) {
+		$class_name::__autoload();
+	}
+	});

Spacing +8 added lines, -8 removed lines

@@ -10,18 +10,18 @@ 
 
 # Define constants
 
-define('DIR_ENGINE',        (dirname(__FILE__) . '/'));
+define('DIR_ENGINE', (dirname(__FILE__).'/'));
 
-define('DIR_WWW',           (DIR_ENGINE . '../'));
-define('DIR_UPLOADS',       (DIR_ENGINE . '../uploads/'));
+define('DIR_WWW', (DIR_ENGINE.'../'));
+define('DIR_UPLOADS', (DIR_ENGINE.'../uploads/'));
 
 # Require framework main file
 
-require_once(DIR_ENGINE . 'Framework/Main.php');
+require_once(DIR_ENGINE.'Framework/Main.php');
 
 # Require system main file
 
-require_once(DIR_ENGINE . 'System/Main.php');
+require_once(DIR_ENGINE.'System/Main.php');
 
 # Register classes autoloader
 
@@ -33,13 +33,13 @@ 
 
 	$system_classes = ['Frames', 'Handlers', 'Modules', 'Utils', 'Views', 'Dispatcher', 'Installer'];
 
-	$path = ((in_array($path[0], $system_classes, true) ? DIR_SYSTEM_CLASSES : DIR_CLASSES) . implode('/', $path));
+	$path = ((in_array($path[0], $system_classes, true) ? DIR_SYSTEM_CLASSES : DIR_CLASSES).implode('/', $path));
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path.'.php')) && @is_file($file_name)) require_once $file_name;
 
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	else if (@file_exists($file_name = ($path.'/'.$last.'.php')) && @is_file($file_name)) require_once $file_name;
 
 	# Check if class exists
 

www/engine/System/Classes/Modules/Entitizer/Form/Variable.php

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form;
+	use Modules\Entitizer;
+	use Utils\Form;
 
 	class Widget extends Form {
 

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

Braces +6 added lines, -2 removed lines

@@ -49,9 +49,13 @@
 
 		public static function url(string $value) {
 
-			if (false === ($value = parent::url($value))) return false;
+			if (false === ($value = parent::url($value))) {
+				return false;
+			}
 
-			if (!preg_match('/^https?:\/\//', $value)) return false;
+			if (!preg_match('/^https?:\/\//', $value)) {
+				return false;
+			}
 
 			# ------------------------
 

www/engine/System/Includes/Regex.php

Spacing +8 added lines, -8 removed lines

@@ -2,15 +2,15 @@
 
 # Regular expressions
 
-define('REGEX_MAP_ITEM_PATH',                       '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
-define('REGEX_MAP_ITEM_HANDLER',                    '/^[A-Z][a-zA-Z0-9]*$/');
+define('REGEX_MAP_ITEM_PATH', '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
+define('REGEX_MAP_ITEM_HANDLER', '/^[A-Z][a-zA-Z0-9]*$/');
 
-define('REGEX_LANGUAGE_NAME',                       '/^[a-z][a-z]-[A-Z][A-Z]$/');
-define('REGEX_TEMPLATE_NAME',                       '/^[A-Z0-9][a-zA-Z0-9]*$/');
+define('REGEX_LANGUAGE_NAME', '/^[a-z][a-z]-[A-Z][A-Z]$/');
+define('REGEX_TEMPLATE_NAME', '/^[A-Z0-9][a-zA-Z0-9]*$/');
 
-define('REGEX_USER_AUTH_CODE',                      '/^[a-zA-Z0-9]{40}$/');
+define('REGEX_USER_AUTH_CODE', '/^[a-zA-Z0-9]{40}$/');
 
-define('REGEX_USER_NAME',                           '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
-define('REGEX_USER_PASSWORD',                       '/^.+$/');
+define('REGEX_USER_NAME', '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_USER_PASSWORD', '/^.+$/');
 
-define('REGEX_FILE_NAME',                           '/^[^\/?%*:|"<>\\\]+$/');
+define('REGEX_FILE_NAME', '/^[^\/?%*:|"<>\\\]+$/');

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.json');
 
-				if (false === ($config = Explorer::json($file_name))) continue;
+				if (false === ($config = Explorer::json($file_name))) {
+					continue;
+				}
 
 				$config = Arr::select($config, self::$data);
 
-				if (!(self::valid($config['name']) && ($config['name'] === $name))) continue;
+				if (!(self::valid($config['name']) && ($config['name'] === $name))) {
+					continue;
+				}
 
 				$items[$name] = array_map('strval', $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);
 		}

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 
 		private static function getDirName(string $section) {
 
-			return (self::$root_dir . (self::$separate ? ($section . '/') : ''));
+			return (self::$root_dir.(self::$separate ? ($section.'/') : ''));
 		}
 
 		# Get items
@@ -30,7 +30,7 @@ 
 
 			foreach (Explorer::listDirs($dir_name) as $name) {
 
-				$file_name = ($dir_name . $name . '/Config.json');
+				$file_name = ($dir_name.$name.'/Config.json');
 
 				if (false === ($config = Explorer::json($file_name))) continue;
 
@@ -154,7 +154,7 @@ 
 
 			if ('' === self::$active) return false;
 
-			return (self::$dir_name . self::$active . '/');
+			return (self::$dir_name.self::$active.'/');
 		}
 
 		# Get primary extension path
@@ -163,7 +163,7 @@ 
 
 			if ('' === self::$primary) return false;
 
-			return (self::$dir_name . self::$primary . '/');
+			return (self::$dir_name.self::$primary.'/');
 		}
 
 		# Get active extension data

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

Braces +18 added lines, -6 removed lines

@@ -14,7 +14,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;
+			}
 
 			# ------------------------
 
@@ -27,9 +29,13 @@ 
 
 			$data = Arr::select($item, ['path', 'handler']);
 
-			if (false === ($path = $this->parseString($data['path'], REGEX_MAP_ITEM_PATH))) return;
+			if (false === ($path = $this->parseString($data['path'], REGEX_MAP_ITEM_PATH))) {
+				return;
+			}
 
-			if (false === ($handler = $this->parseString($data['handler'], REGEX_MAP_ITEM_HANDLER))) return;
+			if (false === ($handler = $this->parseString($data['handler'], REGEX_MAP_ITEM_HANDLER))) {
+				return;
+			}
 
 			$this->map[] = ['path' => $path, 'handler' => implode('\\', $handler)];
 		}
@@ -40,16 +46,22 @@ 
 
 			$file_name = (DIR_SYSTEM_DATA . 'Map.json');
 
-			if (false === ($map = Explorer::json($file_name))) return;
+			if (false === ($map = Explorer::json($file_name))) {
+				return;
+			}
 
-			foreach ($map as $item) if (is_array($item)) $this->parseItem($item);
+			foreach ($map as $item) {
+				if (is_array($item)) $this->parseItem($item);
+			}
 		}
 
 		# Get handler by url
 
 		public function handler(Url $url) {
 
-			foreach ($this->map as $item) if ($item['path'] === $url->path()) return $item['handler'];
+			foreach ($this->map as $item) {
+				if ($item['path'] === $url->path()) return $item['handler'];
+			}
 
 			return false;
 		}

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 		public function __construct() {
 
-			$file_name = (DIR_SYSTEM_DATA . 'Map.json');
+			$file_name = (DIR_SYSTEM_DATA.'Map.json');
 
 			if (false === ($map = Explorer::json($file_name))) return;
 

www/engine/System/System.php

Braces +9 added lines, -3 removed lines

@@ -18,12 +18,16 @@ 
 
 			foreach (array_keys($this->database) as $key) {
 
-				if (is_scalar($value = Arr::get($data, ['database', $key]))) $this->database[$key] = strval($value);
+				if (is_scalar($value = Arr::get($data, ['database', $key]))) {
+					$this->database[$key] = strval($value);
+				}
 			}
 
 			# Parse installation details
 
-			if (is_numeric($time = Arr::get($data, ['time']))) $this->time = intval($time);
+			if (is_numeric($time = Arr::get($data, ['time']))) {
+				$this->time = intval($time);
+			}
 		}
 
 		# Constructor
@@ -32,7 +36,9 @@ 
 
 			$system_file = (DIR_SYSTEM_DATA . 'System.json');
 
-			if (false !== ($data = Explorer::json($system_file))) $this->parse($data);
+			if (false !== ($data = Explorer::json($system_file))) {
+				$this->parse($data);
+			}
 		}
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
 		public function __construct() {
 
-			$system_file = (DIR_SYSTEM_DATA . 'System.json');
+			$system_file = (DIR_SYSTEM_DATA.'System.json');
 
 			if (false !== ($data = Explorer::json($system_file))) $this->parse($data);
 		}

www/engine/Framework/Classes/Explorer/Explorer.php

Braces +28 added lines, -10 removed lines

@@ -12,9 +12,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if ($dirs ? @is_dir($dir_name . $name) : @is_file($dir_name . $name)) yield $name;
+					if ($dirs ? @is_dir($dir_name . $name) : @is_file($dir_name . $name)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -25,7 +29,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);
 		}
@@ -68,9 +74,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_file($name)) self::removeFile($name);
-
-					else if (@is_dir($name)) self::removeDir($name, true);
+					if (@is_file($name)) {
+						self::removeFile($name);
+					} else if (@is_dir($name)) {
+						self::removeDir($name, true);
+					}
 				}
 			}
 
@@ -146,7 +154,9 @@ 
 
 		public static function json(string $file_name) {
 
-			if ((strtolower(self::extension($file_name)) !== 'json')) return false;
+			if ((strtolower(self::extension($file_name)) !== 'json')) {
+				return false;
+			}
 
 			return (json_decode(@file_get_contents($file_name), true) ?? false);
 		}
@@ -155,7 +165,9 @@ 
 
 		public static function php(string $file_name) {
 
-			if ((strtolower(self::extension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::extension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return include $file_name;
 		}
@@ -164,7 +176,9 @@ 
 
 		public static function xml(string $file_name) {
 
-			if ((strtolower(self::extension($file_name)) !== 'xml')) return false;
+			if ((strtolower(self::extension($file_name)) !== 'xml')) {
+				return false;
+			}
 
 			return @simplexml_load_file($file_name);
 		}
@@ -173,7 +187,11 @@ 
 
 		public static function save(string $file_name, string $contents, bool $force = false) {
 
-			if (self::isFile($file_name)) if (!$force) return false; else if (!@unlink($file_name)) return false;
+			if (self::isFile($file_name)) {
+				if (!$force) return false;
+			} else if (!@unlink($file_name)) {
+				return false;
+			}
 
 			return @file_put_contents($file_name, $contents);
 		}

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if ($dirs ? @is_dir($dir_name . $name) : @is_file($dir_name . $name)) yield $name;
+					if ($dirs ? @is_dir($dir_name.$name) : @is_file($dir_name.$name)) yield $name;
 				}
 
 				closedir($handler);
@@ -66,7 +66,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_file($name)) self::removeFile($name);
 

www/engine/System/Classes/Utils/Tools/Sitemap.php

Braces +24 added lines, -8 removed lines

@@ -14,7 +14,9 @@ 
 
 			$urlset = '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" />';
 
-			if (false !== ($xml = XML::create($urlset))) $this->xml = $xml;
+			if (false !== ($xml = XML::create($urlset))) {
+				$this->xml = $xml;
+			}
 		}
 
 		# Load sitemap
@@ -25,9 +27,13 @@ 
 
 			$modified = Explorer::modified($file_name);
 
-			if ((false === $modified) || ($modified <= $time)) return false;
+			if ((false === $modified) || ($modified <= $time)) {
+				return false;
+			}
 
-			if (false === ($xml = Explorer::xml($file_name))) return false;
+			if (false === ($xml = Explorer::xml($file_name))) {
+				return false;
+			}
 
 			$this->xml = $xml; $this->loaded = true;
 
@@ -40,11 +46,15 @@ 
 
 		public function save() {
 
-			if ((null === $this->xml) || $this->loaded) return false;
+			if ((null === $this->xml) || $this->loaded) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
 
-			if (false === Explorer::save($file_name, XML::string($this->xml), true)) return false;
+			if (false === Explorer::save($file_name, XML::string($this->xml), true)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -55,9 +65,13 @@ 
 
 		public function add(string $loc, string $lastmod = null, string $changefreq = null, float $priority = null) {
 
-			if ((null === $this->xml) || $this->loaded) return false;
+			if ((null === $this->xml) || $this->loaded) {
+				return false;
+			}
 
-			if (false === ($loc = Validate::url($loc))) return false;
+			if (false === ($loc = Validate::url($loc))) {
+				return false;
+			}
 
 			# Create url object
 
@@ -79,7 +93,9 @@ 
 
 			# Set priority
 
-			if (null !== $priority) $url->addChild('priority', Number::formatFloat($priority, 0, 1, 1));
+			if (null !== $priority) {
+				$url->addChild('priority', Number::formatFloat($priority, 0, 1, 1));
+			}
 
 			# ------------------------
 

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 		public function load(int $time) {
 
-			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
+			$file_name = (DIR_SYSTEM_DATA.'Sitemap.xml');
 
 			$modified = Explorer::modified($file_name);
 
@@ -42,7 +42,7 @@ 
 
 			if ((null === $this->xml) || $this->loaded) return false;
 
-			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
+			$file_name = (DIR_SYSTEM_DATA.'Sitemap.xml');
 
 			if (false === Explorer::save($file_name, XML::string($this->xml), true)) return false;