cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Auth/Controller/Reset.php

Braces +21 added lines, -7 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# Validate values
 
-			if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return 'USER_ERROR_CAPTCHA_INCORRECT';
+			if (false === Security::checkCaptcha($captcha)) {
+				return 'USER_ERROR_CAPTCHA_INCORRECT';
+			}
 
 			# Create user object
 
@@ -32,13 +38,19 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return 'USER_ERROR_NAME_INCORRECT';
+			if (!$user->init($name, 'name')) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return 'USER_ERROR_NAME_INCORRECT';
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -48,7 +60,9 @@ 
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$secret->create($data)) return 'USER_ERROR_AUTH_RESET';
+			if (!$secret->create($data)) {
+				return 'USER_ERROR_AUTH_RESET';
+			}
 
 			# Send mail
 

www/engine/System/Classes/Modules/Auth/Controller/Login.php

Braces +24 added lines, -8 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# Validate values
 
-			if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+			if (false === ($password = Validate::userPassword($password))) {
+				return 'USER_ERROR_PASSWORD_INVALID';
+			}
 
 			# Create user object
 
@@ -32,19 +38,27 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return 'USER_ERROR_NAME_INCORRECT';
+			if (!$user->init($name, 'name')) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return 'USER_ERROR_NAME_INCORRECT';
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
 			# Check password
 
 			$password = Str::encode($user->auth_key, $password);
 
-			if (0 !== strcmp($user->password, $password)) return 'USER_ERROR_PASSWORD_INCORRECT';
+			if (0 !== strcmp($user->password, $password)) {
+				return 'USER_ERROR_PASSWORD_INCORRECT';
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -54,7 +68,9 @@ 
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$session->create($data)) return 'USER_ERROR_AUTH_LOGIN';
+			if (!$session->create($data)) {
+				return 'USER_ERROR_AUTH_LOGIN';
+			}
 
 			# Set session variable
 

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

Braces +36 added lines, -12 removed lines

@@ -12,9 +12,13 @@ 
 
 		private static function getAuth(string $code, string $type, int $lifetime) {
 
-			if (!($auth = Entitizer::get($type))->init($code, 'code')) return false;
+			if (!($auth = Entitizer::get($type))->init($code, 'code')) {
+				return false;
+			}
 
-			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) return false;
+			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -25,9 +29,13 @@ 
 
 		private static function getUser(int $id) {
 
-			if (0 === ($user = Entitizer::get(ENTITY_TYPE_USER, $id))->id) return false;
+			if (0 === ($user = Entitizer::get(ENTITY_TYPE_USER, $id))->id) {
+				return false;
+			}
 
-			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
+			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -42,17 +50,23 @@ 
 
 			# Check session code
 
-			if (false === ($code = Validate::authCode(Session::get('code')))) return false;
+			if (false === ($code = Validate::authCode(Session::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = ENTITY_TYPE_USER_SESSION; $lifetime = CONFIG_USER_SESSION_LIFETIME;
 
-			if (false === ($session = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($session = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($session->id))) return false;
+			if (false === ($user = self::getUser($session->id))) {
+				return false;
+			}
 
 			# Update session
 
@@ -71,21 +85,29 @@ 
 
 		public static function secret() {
 
-			if ((null === self::$user) || (0 !== self::$user->id)) return false;
+			if ((null === self::$user) || (0 !== self::$user->id)) {
+				return false;
+			}
 
 			# Check secret code
 
-			if (false === ($code = Validate::authCode(Request::get('code')))) return false;
+			if (false === ($code = Validate::authCode(Request::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = ENTITY_TYPE_USER_SECRET; $lifetime = CONFIG_USER_SECRET_LIFETIME;
 
-			if (false === ($secret = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($secret = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($secret->id))) return false;
+			if (false === ($user = self::getUser($secret->id))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -96,7 +118,9 @@ 
 
 		public static function logout() {
 
-			if ((null === self::$user) || (0 === self::$user->id)) return false;
+			if ((null === self::$user) || (0 === self::$user->id)) {
+				return false;
+			}
 
 			# Remove session
 

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

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

Spacing +4 added lines, -4 removed lines

@@ -39,16 +39,16 @@ 
 
 			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) return;
 
-			self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://') . $host);
+			self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://').$host);
 
-			self::$settings['system_email'] = ('admin@' . $host);
+			self::$settings['system_email'] = ('admin@'.$host);
 		}
 
 		# Init settings
 
 		public static function init() {
 
-			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
+			$settings_file = (DIR_SYSTEM_DATA.'Settings.json');
 
 			self::$loaded = (false !== ($settings = Explorer::json($settings_file)));
 
@@ -63,7 +63,7 @@ 
 
 		public static function save() {
 
-			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
+			$settings_file = (DIR_SYSTEM_DATA.'Settings.json');
 
 			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) return false;
 

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;