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

www/engine/System/Classes/Modules/Entitizer/Controller/User.php

Braces +27 added lines, -9 removed lines

@@ -31,30 +31,46 @@ 
 
 			# Validate name & email
 
-			if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID';
+			if (false === ($email = Validate::userEmail($email))) {
+				return 'USER_ERROR_EMAIL_INVALID';
+			}
 
 			# Validate password
 
 			if ((0 === $this->user->id) || ('' !== $password)) {
 
-				if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+				if (false === ($password = Validate::userPassword($password))) {
+					return 'USER_ERROR_PASSWORD_INVALID';
+				}
 
-				if (0 !== strcmp($password, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+				if (0 !== strcmp($password, $password_retype)) {
+					return 'USER_ERROR_PASSWORD_MISMATCH';
+				}
 			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check('name', $name))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_name = $this->user->check('name', $name))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			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 = $this->user->check('email', $email))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_email = $this->user->check('email', $email))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE';
+			if ($check_email === 1) {
+				return 'USER_ERROR_EMAIL_DUPLICATE';
+			}
 
 			# Modify user
 
@@ -84,7 +100,9 @@ 
 
 			$modifier = ((0 === $this->user->id) ? 'create' : 'edit');
 
-			if (!$this->user->$modifier($data)) return 'USER_ERROR_MODIFY';
+			if (!$this->user->$modifier($data)) {
+				return 'USER_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Rename.php

Braces +12 added lines, -4 removed lines

@@ -29,23 +29,31 @@
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return 'FILEMANAGER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::fileName($name))) {
+				return 'FILEMANAGER_ERROR_NAME_INVALID';
+			}
 
 			# Check if item exists
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return 'FILEMANAGER_ERROR_EXISTS';
+				@file_exists($this->entity->parent()->pathFull() . $name)) {
+				return 'FILEMANAGER_ERROR_EXISTS';
+			}
 
 			# Rename item
 
-			if (!$this->entity->rename($name)) return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$this->entity->rename($name)) {
+				return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Create.php

Braces +12 added lines, -4 removed lines

@@ -29,23 +29,31 @@
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return 'FILEMANAGER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::fileName($name))) {
+				return 'FILEMANAGER_ERROR_NAME_INVALID';
+			}
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return 'FILEMANAGER_ERROR_EXISTS';
+			if (@file_exists($this->parent->pathFull() . $name)) {
+				return 'FILEMANAGER_ERROR_EXISTS';
+			}
 
 			# Create item
 
 			$entity = Filemanager::get($type, $this->parent);
 
-			if (!$entity->create($name)) return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$entity->create($name)) {
+				return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_CREATE' : 'FILEMANAGER_ERROR_FILE_CREATE');
+			}
 
 			# ------------------------
 

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