cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Profile/Controller/Personal.php

Braces +12 added lines, -4 removed lines

@@ -20,13 +20,19 @@ 
 
 			# Validate values
 
-			if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID';
+			if (false === ($email = Validate::userEmail($email))) {
+				return 'USER_ERROR_EMAIL_INVALID';
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = Auth::user()->check('email', $email))) return 'USER_ERROR_EDIT_PERSONAL';
+			if (false === ($check_email = Auth::user()->check('email', $email))) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
-			if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE';
+			if ($check_email === 1) {
+				return 'USER_ERROR_EMAIL_DUPLICATE';
+			}
 
 			# Update user
 
@@ -40,7 +46,9 @@ 
 			$data['country']            = $country;
 			$data['timezone']           = $timezone;
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PERSONAL';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Controller/Password.php

Braces +15 added lines, -5 removed lines

@@ -20,17 +20,25 @@ 
 
 			# Validate values
 
-			if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+			if (false === ($password = Validate::userPassword($password))) {
+				return 'USER_ERROR_PASSWORD_INVALID';
+			}
 
-			if (false === ($password_new = Validate::userPassword($password_new))) return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			if (false === ($password_new = Validate::userPassword($password_new))) {
+				return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			}
 
-			if (0 !== strcmp($password_new, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+			if (0 !== strcmp($password_new, $password_retype)) {
+				return 'USER_ERROR_PASSWORD_MISMATCH';
+			}
 
 			# Check password
 
 			$password = Str::encode(Auth::user()->auth_key, $password);
 
-			if (0 !== strcmp(Auth::user()->password, $password)) return 'USER_ERROR_PASSWORD_INCORRECT';
+			if (0 !== strcmp(Auth::user()->password, $password)) {
+				return 'USER_ERROR_PASSWORD_INCORRECT';
+			}
 
 			# Encode password
 
@@ -43,7 +51,9 @@ 
 			$data['auth_key']           = $auth_key;
 			$data['password']           = $password;
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PASSWORD';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_EDIT_PASSWORD';
+			}
 
 			# ------------------------
 

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

Braces +33 added lines, -11 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,15 +24,25 @@ 
 
 			# 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';
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID';
+			if (false === ($email = Validate::userEmail($email))) {
+				return 'USER_ERROR_EMAIL_INVALID';
+			}
 
-			if (0 !== strcmp($password, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+			if (0 !== strcmp($password, $password_retype)) {
+				return 'USER_ERROR_PASSWORD_MISMATCH';
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return 'USER_ERROR_CAPTCHA_INCORRECT';
+			if (false === Security::checkCaptcha($captcha)) {
+				return 'USER_ERROR_CAPTCHA_INCORRECT';
+			}
 
 			# Create user object
 
@@ -38,15 +50,23 @@ 
 
 			# Check name exists
 
-			if (false === ($check_name = $user->check('name', $name))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_name = $user->check('name', $name))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			if ($check_name === 1) return 'USER_ERROR_NAME_DUPLICATE';
+			if ($check_name === 1) {
+				return 'USER_ERROR_NAME_DUPLICATE';
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = $user->check('email', $email))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_email = $user->check('email', $email))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE';
+			if ($check_email === 1) {
+				return 'USER_ERROR_EMAIL_DUPLICATE';
+			}
 
 			# Encode password
 
@@ -69,7 +89,9 @@ 
 			$data['time_registered']    = REQUEST_TIME;
 			$data['time_logged']        = REQUEST_TIME;
 
-			if (!$user->create($data)) return 'USER_ERROR_AUTH_REGISTER';
+			if (!$user->create($data)) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
 			# Send mail
 

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

Braces +12 added lines, -4 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (!Auth::check()) return false;
+			if (!Auth::check()) {
+				return false;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# Validate values
 
-			if (false === ($password_new = Validate::userPassword($password_new))) return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			if (false === ($password_new = Validate::userPassword($password_new))) {
+				return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			}
 
-			if (0 !== strcmp($password_new, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+			if (0 !== strcmp($password_new, $password_retype)) {
+				return 'USER_ERROR_PASSWORD_MISMATCH';
+			}
 
 			# Encode password
 
@@ -34,7 +40,9 @@ 
 
 			$data = ['auth_key' => $auth_key, 'password' => $password];
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_AUTH_RECOVER';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_AUTH_RECOVER';
+			}
 
 			# Remove secret
 

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', '/^[^\/?%*:|"<>\\\]+$/');