cadmium-org / cadmium-cms

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

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 			if ((!$this->user->init($$init_by, $init_by)) || (Auth::isAdmin() && ($this->user->rank < RANK_ADMINISTRATOR))) {
 
-				return ['name_email', ('USER_ERROR_' . strtoupper($init_by) .'_INCORRECT')];
+				return ['name_email', ('USER_ERROR_'.strtoupper($init_by).'_INCORRECT')];
 			}
 
 			# Check password

Braces +15 added lines, -5 removed lines

@@ -46,9 +46,13 @@ 
 
 			if ((false === ($name = Validate::userName($name_email))) &&
 
-				(false === ($email = Validate::userEmail($name_email)))) return ['name_email', 'USER_ERROR_NAME_INVALID'];
+				(false === ($email = Validate::userEmail($name_email)))) {
+				return ['name_email', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			if (false === ($password = Validate::userPassword($password))) {
+				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
 			# Init user
 
@@ -63,11 +67,15 @@ 
 
 			$password = Str::encode($this->user->auth_key, $password);
 
-			if (0 !== strcmp($this->user->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp($this->user->password, $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -77,7 +85,9 @@ 
 
 			$data = ['id' => $this->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/Controller/Register.php

Braces +30 added lines, -10 removed lines

@@ -44,27 +44,45 @@ 
 
 			# Validate values
 
-			if (false === ($name = Validate::userName($name))) return ['name', 'USER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::userName($name))) {
+				return ['name', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			if (false === ($password = Validate::userPassword($password))) {
+				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			}
 
-			if (0 !== strcmp($password, $password_retype)) return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			if (0 !== strcmp($password, $password_retype)) {
+				return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check($name, 'name'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_name = $this->user->check($name, 'name'))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			if ($check_name === 1) return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = $this->user->check($email, 'email'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_email = $this->user->check($email, 'email'))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			}
 
 			# Encode password
 
@@ -87,7 +105,9 @@ 
 			$data['time_registered']    = REQUEST_TIME;
 			$data['time_logged']        = REQUEST_TIME;
 
-			if (!$this->user->create($data)) return 'USER_ERROR_AUTH_REGISTER';
+			if (!$this->user->create($data)) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
 			# Send mail
 

www/engine/System/Classes/Modules/Entitizer/Collection/Widgets.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function init() {
 
-			$this->config->addParam('active', '', function (bool $active) {
+			$this->config->addParam('active', '', function(bool $active) {
 
 				return ($active ? "ent.active = 1" : '');
 			});

www/engine/System/Classes/Modules/Entitizer/Lister/Users.php

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 
 			# Set remove button
 
-			if ($user->id === Auth::get('id')) $view->getBlock('remove')->class = 'disabled';
+			if ($user->id === Auth::get('id')) {
+				$view->getBlock('remove')->class = 'disabled';
+			}
 		}
 	}
 }

www/engine/System/Classes/Modules/Entitizer/Definition/User/Session.php

Spacing +7 added lines, -7 removed lines

@@ -14,19 +14,19 @@
 
 			# Add params
 
-			$this->params->textual      ('code',                true, 40, true, '');
-			$this->params->textual      ('ip',                  true, 255, false, '');
-			$this->params->integer      ('time',                false, 10, true, 0);
+			$this->params->textual('code', true, 40, true, '');
+			$this->params->textual('ip', true, 255, false, '');
+			$this->params->integer('time', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('code',                'UNIQUE');
-			$this->indexes->add         ('ip');
-			$this->indexes->add         ('time');
+			$this->indexes->add('code', 'UNIQUE');
+			$this->indexes->add('ip');
+			$this->indexes->add('time');
 
 			# Add foreign keys
 
-			$this->foreigns->add        ('id',                  TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
+			$this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
 		}
 	}
 }

www/engine/System/Classes/Modules/Filemanager/Utils/Mime.php

Braces +21 added lines, -7 removed lines

@@ -12,19 +12,33 @@
 
 			$extension = strtolower(Explorer::getExtension($file_name, false));
 
-			if (self::isImage($extension)) return 'image';
+			if (self::isImage($extension)) {
+				return 'image';
+			}
 
-			if (self::isAudio($extension)) return 'audio';
+			if (self::isAudio($extension)) {
+				return 'audio';
+			}
 
-			if (self::isVideo($extension)) return 'video';
+			if (self::isVideo($extension)) {
+				return 'video';
+			}
 
-			if (in_array($extension, ['doc', 'docx'], true)) return 'word';
+			if (in_array($extension, ['doc', 'docx'], true)) {
+				return 'word';
+			}
 
-			if (in_array($extension, ['xls', 'xlsx'], true)) return 'excel';
+			if (in_array($extension, ['xls', 'xlsx'], true)) {
+				return 'excel';
+			}
 
-			if (in_array($extension, ['ppt', 'pptx'], true)) return 'powerpoint';
+			if (in_array($extension, ['ppt', 'pptx'], true)) {
+				return 'powerpoint';
+			}
 
-			if ($extension === 'pdf') return 'pdf';
+			if ($extension === 'pdf') {
+				return 'pdf';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Handler/Overview.php

Braces +8 added lines, -4 removed lines

@@ -41,14 +41,18 @@
 
 			foreach (['full_name', 'city'] as $name) {
 
-				if ('' === ($text = Auth::get($name))) $contents->getBlock($name)->disable();
-
-				else $contents->getBlock($name)->text = $text;
+				if ('' === ($text = Auth::get($name))) {
+					$contents->getBlock($name)->disable();
+				} else {
+					$contents->getBlock($name)->text = $text;
+				}
 			}
 
 			# Set country
 
-			if ('' === ($country = Auth::get('country'))) $contents->getBlock('country')->disable(); else {
+			if ('' === ($country = Auth::get('country'))) {
+				$contents->getBlock('country')->disable();
+			} else {
 
 				$contents->getBlock('country')->code = $country;
 

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

Braces +12 added lines, -4 removed lines

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

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

Braces +15 added lines, -8 removed lines

@@ -33,23 +33,28 @@ 
 
 			# Validate values
 
-			if (false === ($password = Validate::userPassword($password)))
-
+			if (false === ($password = Validate::userPassword($password))) {
+			
 				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
-			if (false === ($password_new = Validate::userPassword($password_new)))
-
+			if (false === ($password_new = Validate::userPassword($password_new))) {
+			
 				return ['password_new', 'USER_ERROR_PASSWORD_NEW_INVALID'];
+			}
 
-			if (0 !== strcmp($password_new, $password_retype))
-
+			if (0 !== strcmp($password_new, $password_retype)) {
+			
 				return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			}
 
 			# Check password
 
 			$password = Str::encode(Auth::get('auth_key'), $password);
 
-			if (0 !== strcmp(Auth::get('password'), $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp(Auth::get('password'), $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Encode password
 
@@ -62,7 +67,9 @@ 
 			$data['auth_key']           = $auth_key;
 			$data['password']           = $password;
 
-			if (!Auth::getUser()->edit($data)) return 'USER_ERROR_EDIT_PASSWORD';
+			if (!Auth::getUser()->edit($data)) {
+				return 'USER_ERROR_EDIT_PASSWORD';
+			}
 
 			# ------------------------