cadmium-org / cadmium-cms

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/Includes/Constants.php

Spacing +41 added lines, -41 removed lines

@@ -2,78 +2,78 @@
 
 # Cadmium
 
-define('CADMIUM_NAME',                              'Cadmium CMS');
-define('CADMIUM_HOME',                              'http://cadmium-cms.com');
+define('CADMIUM_NAME', 'Cadmium CMS');
+define('CADMIUM_HOME', 'http://cadmium-cms.com');
 
-define('CADMIUM_VERSION',                           '0.2.2');
-define('CADMIUM_COPY',                              '2016');
+define('CADMIUM_VERSION', '0.2.2');
+define('CADMIUM_COPY', '2016');
 
 # External
 
-define('JQUERY_VERSION',                            '2.2.0');
-define('SEMANTIC_UI_VERSION',                       '2.1.8');
-define('CKEDITOR_VERSION',                          '4.5.6');
+define('JQUERY_VERSION', '2.2.0');
+define('SEMANTIC_UI_VERSION', '2.1.8');
+define('CKEDITOR_VERSION', '4.5.6');
 
 # Sections
 
-define('SECTION_ADMIN',                             'Admin');
-define('SECTION_SITE',                              'Site');
+define('SECTION_ADMIN', 'Admin');
+define('SECTION_SITE', 'Site');
 
 # Entity types
 
-define('ENTITY_TYPE_PAGE',                          'page');
-define('ENTITY_TYPE_MENUITEM',                      'menuitem');
-define('ENTITY_TYPE_VARIABLE',                      'variable');
-define('ENTITY_TYPE_WIDGET',                        'widget');
-define('ENTITY_TYPE_USER',                          'user');
-define('ENTITY_TYPE_USER_SECRET',                   'user_secret');
-define('ENTITY_TYPE_USER_SESSION',                  'user_session');
+define('ENTITY_TYPE_PAGE', 'page');
+define('ENTITY_TYPE_MENUITEM', 'menuitem');
+define('ENTITY_TYPE_VARIABLE', 'variable');
+define('ENTITY_TYPE_WIDGET', 'widget');
+define('ENTITY_TYPE_USER', 'user');
+define('ENTITY_TYPE_USER_SECRET', 'user_secret');
+define('ENTITY_TYPE_USER_SESSION', 'user_session');
 
 # Filemanager types
 
-define('FILEMANAGER_TYPE_DIR',                      'dir');
-define('FILEMANAGER_TYPE_FILE',                     'file');
+define('FILEMANAGER_TYPE_DIR', 'dir');
+define('FILEMANAGER_TYPE_FILE', 'file');
 
 # Access
 
-define('ACCESS_PUBLIC',                             0);
-define('ACCESS_REGISTERED',                         1);
-define('ACCESS_ADMINISTRATOR',                      2);
+define('ACCESS_PUBLIC', 0);
+define('ACCESS_REGISTERED', 1);
+define('ACCESS_ADMINISTRATOR', 2);
 
 # Frequency
 
-define('FREQUENCY_ALWAYS',                          'always');
-define('FREQUENCY_HOURLY',                          'hourly');
-define('FREQUENCY_DAILY',                           'daily');
-define('FREQUENCY_WEEKLY',                          'weekly');
-define('FREQUENCY_MONTHLY',                         'monthly');
-define('FREQUENCY_YEARLY',                          'yearly');
-define('FREQUENCY_NEVER',                           'never');
+define('FREQUENCY_ALWAYS', 'always');
+define('FREQUENCY_HOURLY', 'hourly');
+define('FREQUENCY_DAILY', 'daily');
+define('FREQUENCY_WEEKLY', 'weekly');
+define('FREQUENCY_MONTHLY', 'monthly');
+define('FREQUENCY_YEARLY', 'yearly');
+define('FREQUENCY_NEVER', 'never');
 
 # Rank
 
-define('RANK_GUEST',                                0);
-define('RANK_USER',                                 1);
-define('RANK_ADMINISTRATOR',                        2);
+define('RANK_GUEST', 0);
+define('RANK_USER', 1);
+define('RANK_ADMINISTRATOR', 2);
 
 # Sex
 
-define('SEX_NOT_SELECTED',                          0);
-define('SEX_MALE',                                  1);
-define('SEX_FEMALE',                                2);
+define('SEX_NOT_SELECTED', 0);
+define('SEX_MALE', 1);
+define('SEX_FEMALE', 2);
 
 # Status
 
-define('STATUS_ONLINE',                             0);
-define('STATUS_MAINTENANCE',                        1);
-define('STATUS_UPDATE',                             2);
+define('STATUS_ONLINE', 0);
+define('STATUS_MAINTENANCE', 1);
+define('STATUS_UPDATE', 2);
 
 # Target
 
-define('TARGET_SELF',                               0);
-define('TARGET_BLANK',                              1);
+define('TARGET_SELF', 0);
+define('TARGET_BLANK', 1);
 
 # Visibility
 
-define('VISIBILITY_DRAFT',                          0);
-define('VISIBILITY_PUBLISHED',                      1);
+define('VISIBILITY_DRAFT', 0);
+define('VISIBILITY_PUBLISHED', 1);

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);
 		}

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

Braces +39 added lines, -13 removed lines

@@ -37,7 +37,9 @@ 
 
 		public static function __autoload() {
 
-			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) return;
+			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) {
+				return;
+			}
 
 			self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://') . $host);
 
@@ -52,7 +54,9 @@ 
 
 			self::$loaded = (false !== ($settings = Explorer::json($settings_file)));
 
-			if (self::$loaded) foreach ($settings as $name => $value) self::set($name, $value);
+			if (self::$loaded) {
+				foreach ($settings as $name => $value) self::set($name, $value);
+			}
 
 			# ------------------------
 
@@ -65,9 +69,13 @@ 
 
 			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
 
-			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) return false;
+			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) {
+				return false;
+			}
 
-			if (false === Explorer::save($settings_file, $settings, true)) return false;
+			if (false === Explorer::save($settings_file, $settings, true)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -85,34 +93,44 @@ 
 
 		public static function set(string $name, $value) {
 
-			if (!isset(self::$settings[$name]) || !is_scalar($value)) return false;
+			if (!isset(self::$settings[$name]) || !is_scalar($value)) {
+				return false;
+			}
 
 			# Validate language
 
 			if (($name === 'admin_language') || ($name === 'site_language')) {
 
-				if (false === ($value = Extend\Languages::validate($value))) return false;
+				if (false === ($value = Extend\Languages::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate template
 
 			else if (($name === 'admin_template') || ($name === 'site_template')) {
 
-				if (false === ($value = Extend\Templates::validate($value))) return false;
+				if (false === ($value = Extend\Templates::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site title
 
 			else if ($name === 'site_title') {
 
-				if ('' === ($value = strval($value))) return false;
+				if ('' === ($value = strval($value))) {
+					return false;
+				}
 			}
 
 			# Validate site status
 
 			else if ($name === 'site_status') {
 
-				if (false === ($value = Lister\Status::validate($value))) return false;
+				if (false === ($value = Lister\Status::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site slogan/description/keywords
@@ -126,21 +144,27 @@ 
 
 			else if ($name === 'system_url') {
 
-				if (false === ($value = Validate::url($value))) return false;
+				if (false === ($value = Validate::url($value))) {
+					return false;
+				}
 			}
 
 			# Validate system email
 
 			else if ($name === 'system_email') {
 
-				if (false === ($value = Validate::email($value))) return false;
+				if (false === ($value = Validate::email($value))) {
+					return false;
+				}
 			}
 
 			# Validate system timezone
 
 			else if ($name === 'system_timezone') {
 
-				if (false === ($value = Timezone::validate($value))) return false;
+				if (false === ($value = Timezone::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate users registration
@@ -163,7 +187,9 @@ 
 
 		public static function get(string $name = null) {
 
-			if (null === $name) return self::$settings;
+			if (null === $name) {
+				return self::$settings;
+			}
 
 			return (isset(self::$settings[$name]) ? self::$settings[$name] : null);
 		}

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;
 		}

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);
+			}
 		}
 	}
 }

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);
 		}

www/engine/Framework/Classes/Template/Template.php

Braces +15 added lines, -5 removed lines

@@ -10,18 +10,26 @@ 
 
 		public static function global(string $name, string $value = null) {
 
-			if (null === $value) return (self::$globals[$name] ?? false);
+			if (null === $value) {
+				return (self::$globals[$name] ?? false);
+			}
 
-			if (!isset(self::$globals[$name])) self::$globals[$name] = $value;
+			if (!isset(self::$globals[$name])) {
+				self::$globals[$name] = $value;
+			}
 		}
 
 		# Set/get widget
 
 		public static function widget(string $name, Template\Asset\Block $block = null) {
 
-			if (null === $block) return (self::$widgets[$name] ?? false);
+			if (null === $block) {
+				return (self::$widgets[$name] ?? false);
+			}
 
-			if (!isset(self::$widgets[$name])) self::$widgets[$name] = $block;
+			if (!isset(self::$widgets[$name])) {
+				self::$widgets[$name] = $block;
+			}
 		}
 
 		# Create block
@@ -56,7 +64,9 @@ 
 
 		public static function output(Template\Asset\Block $block, $status = null) {
 
-			if ((null === $status) || !Headers::isStatusCode($status)) $status = STATUS_CODE_200;
+			if ((null === $status) || !Headers::isStatusCode($status)) {
+				$status = STATUS_CODE_200;
+			}
 
 			Headers::nocache(); Headers::status($status); Headers::content(MIME_TYPE_HTML);
 

www/engine/Framework/Classes/Arr/Arr.php

Braces +20 added lines, -5 removed lines

@@ -10,7 +10,12 @@ 
 
 			$value = false;
 
-			foreach ($path as $item) if (isset($array[$item])) $value = ($array = $array[$item]); else return false;
+			foreach ($path as $item) {
+				if (isset($array[$item])) $value = ($array = $array[$item]);
+			}
+			else {
+				return false;
+			}
 
 			# ------------------------
 
@@ -23,10 +28,12 @@ 
 
 			$result = [];
 
-			foreach ($keys as $key) if (is_scalar($key)) {
+			foreach ($keys as $key) {
+				if (is_scalar($key)) {
 
 				$result[$key] = ((isset($array[$key]) && is_scalar($array[$key])) ? $array[$key] : false);
 			}
+			}
 
 			# ------------------------
 
@@ -39,7 +46,9 @@ 
 
 			$result = [];
 
-			foreach ($array as $key => $value) $result[] = [$key_name => $key, $value_name => $value];
+			foreach ($array as $key => $value) {
+				$result[] = [$key_name => $key, $value_name => $value];
+			}
 
 			# ------------------------
 
@@ -57,9 +66,15 @@ 
 
 			$column = array_map($select_key, $array);
 
-			if (!$descending) asort($column); else arsort($column);
+			if (!$descending) {
+				asort($column);
+			} else {
+				arsort($column);
+			}
 
-			$result = []; foreach (array_keys($column) as $key) $result[$key] = $array[$key];
+			$result = []; foreach (array_keys($column) as $key) {
+				$result[$key] = $array[$key];
+			}
 
 			# ------------------------