cadmium-org / cadmium-cms

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

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name.$name)) yield $name;
 				}
 
 				closedir($handler);
@@ -93,7 +93,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_dir($name)) self::removeDir($name, true);
 

Braces +23 added lines, -9 removed lines

@@ -21,9 +21,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name . $name)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -36,7 +40,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);
 		}
@@ -95,9 +101,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_dir($name)) self::removeDir($name, true);
-
-					else if (@is_file($name)) self::removeFile($name);
+					if (@is_dir($name)) {
+						self::removeDir($name, true);
+					} else if (@is_file($name)) {
+						self::removeFile($name);
+					}
 				}
 			}
 
@@ -123,7 +131,9 @@ 
 
 		public static function iterateDirs(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_dir') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_dir') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -132,7 +142,9 @@ 
 
 		public static function iterateFiles(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_file') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_file') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -238,7 +250,9 @@ 
 
 		public static function include(string $file_name) {
 
-			if ((strtolower(self::getExtension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::getExtension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return @include $file_name;
 		}

www/engine/Framework/Classes/JSON/JSON.php

Braces +6 added lines, -2 removed lines

@@ -41,7 +41,9 @@ 
 
 		public static function load(string $file_name) {
 
-			if (false === ($contents = Explorer::getContents($file_name))) return null;
+			if (false === ($contents = Explorer::getContents($file_name))) {
+				return null;
+			}
 
 			return self::parse($contents);
 		}
@@ -54,7 +56,9 @@ 
 
 		public static function save(string $file_name, $value) {
 
-			if (false === ($value = self::stringify($value))) return false;
+			if (false === ($value = self::stringify($value))) {
+				return false;
+			}
 
 			return Explorer::putContents($file_name, $value);
 		}

www/engine/System/Includes/Regex.php

Spacing +9 added lines, -9 removed lines

@@ -2,16 +2,16 @@
 
 # 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_ADDON_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_ADDON_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/Addons/Contact/Handler.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 			# Handle form
 
-			if ($this->form->handle(new Controller)) Request::redirect(INSTALL_PATH . '/contact?submitted');
+			if ($this->form->handle(new Controller)) Request::redirect(INSTALL_PATH.'/contact?submitted');
 
 			# Display success message
 

Braces +6 added lines, -2 removed lines

@@ -35,11 +35,15 @@
 
 			# Handle form
 
-			if ($this->form->handle(new Controller)) Request::redirect(INSTALL_PATH . '/contact?submitted');
+			if ($this->form->handle(new Controller)) {
+				Request::redirect(INSTALL_PATH . '/contact?submitted');
+			}
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::set('success', Language::get('CONTACT_SUCCESS_SEND'));
+			if (false !== Request::get('submitted')) {
+				Messages::set('success', Language::get('CONTACT_SUCCESS_SEND'));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Addons/Contact/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 			# Send mail
 
-			$to = Settings::get('system_email'); $subject = (Settings::get('site_title') . ' | Contact form message');
+			$to = Settings::get('system_email'); $subject = (Settings::get('site_title').' | Contact form message');
 
 			if (!Mailer::send($to, $name, $email, $email, $subject, $message)) return 'CONTACT_ERROR_SEND';
 

Braces +9 added lines, -3 removed lines

@@ -20,15 +20,21 @@
 
 			# Validate values
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'CONTACT_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'CONTACT_ERROR_EMAIL_INVALID'];
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return ['captcha', 'CONTACT_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'CONTACT_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Send mail
 
 			$to = Settings::get('system_email'); $subject = (Settings::get('site_title') . ' | Contact form message');
 
-			if (!Mailer::send($to, $name, $email, $email, $subject, $message)) return 'CONTACT_ERROR_SEND';
+			if (!Mailer::send($to, $name, $email, $email, $subject, $message)) {
+				return 'CONTACT_ERROR_SEND';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Dispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 			if (null === ($data = Schema::get('System')->load())) {
 
-				Request::redirect(INSTALL_PATH . '/install.php');
+				Request::redirect(INSTALL_PATH.'/install.php');
 			}
 
 			# Connect to database

www/engine/System/Classes/Frames/Admin/Area/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/admin');
 
 			# Handle request
 

Braces +6 added lines, -2 removed lines

@@ -14,11 +14,15 @@
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (Modules\Auth::check()) {
+				Request::redirect(INSTALL_PATH . '/admin');
+			}
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_401);
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Frames/Admin/Area/Authorized.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 			if (!Modules\Auth::check() || ((false !== Request::get('logout')) && Modules\Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/login');
+				Request::redirect(INSTALL_PATH.'/admin/login');
 			}
 
 			# Handle request

Braces +6 added lines, -2 removed lines

@@ -19,9 +19,13 @@
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_200);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_200);
+			}
 
-			if (Ajax::isResponse($result)) return Ajax::output($result);
+			if (Ajax::isResponse($result)) {
+				return Ajax::output($result);
+			}
 
 			# ------------------------
 

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

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 
 		private function getLayout(Template\Block $contents) {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Set menu and user
 
@@ -82,7 +82,7 @@ 
 
 		protected function displayPage(Template\Block $contents, int $status = STATUS_CODE_200) {
 
-			$page = View::get('Main/' . $this->layout);
+			$page = View::get('Main/'.$this->layout);
 
 			# Set language
 
@@ -90,7 +90,7 @@ 
 
 			# Set title
 
-			$page->title = ((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . CADMIUM_NAME);
+			$page->title = ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').CADMIUM_NAME);
 
 			# Set layout
 

Braces +3 added lines, -1 removed lines

@@ -111,7 +111,9 @@
 
 				$ips = preg_split('/ +/', CONFIG_ADMIN_IP, -1, PREG_SPLIT_NO_EMPTY);
 
-				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) return Status::error404();
+				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) {
+					return Status::error404();
+				}
 			}
 
 			# ------------------------