cadmium-org / cadmium-cms

www/engine/System/Includes/Tables.php

Spacing +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 
 # Database tables
 
-define('TABLE_PAGES',                               'pages');
-define('TABLE_PAGES_RELATIONS',                     'pages_relations');
+define('TABLE_PAGES', 'pages');
+define('TABLE_PAGES_RELATIONS', 'pages_relations');
 
-define('TABLE_MENU',                                'menu');
-define('TABLE_MENU_RELATIONS',                      'menu_relations');
+define('TABLE_MENU', 'menu');
+define('TABLE_MENU_RELATIONS', 'menu_relations');
 
-define('TABLE_VARIABLES',                           'variables');
-define('TABLE_WIDGETS',                             'widgets');
+define('TABLE_VARIABLES', 'variables');
+define('TABLE_WIDGETS', 'widgets');
 
-define('TABLE_USERS',                               'users');
-define('TABLE_USERS_SECRETS',                       'users_secrets');
-define('TABLE_USERS_SESSIONS',                      'users_sessions');
+define('TABLE_USERS', 'users');
+define('TABLE_USERS_SECRETS', 'users_secrets');
+define('TABLE_USERS_SESSIONS', 'users_sessions');

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

Braces +12 added lines, -6 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (!Auth::check()) return false;
+			if (!Auth::check()) {
+				return false;
+			}
 
 			# Declare variables
 
@@ -22,13 +24,15 @@ 
 
 			# Validate values
 
-			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'];
+			}
 
 			# Encode password
 
@@ -38,7 +42,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/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 ['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'];
+			}
 
 			# 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 ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', '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 ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', '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/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 ['name', 'USER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::userName($name))) {
+				return ['name', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Create user object
 
@@ -32,13 +38,19 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (!$user->init($name, 'name')) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return ['name', '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 ['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'];
+			}
 
 			# Create user object
 
@@ -32,19 +38,27 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (!$user->init($name, 'name')) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
 			# Check password
 
 			$password = Str::encode($user->auth_key, $password);
 
-			if (0 !== strcmp($user->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp($user->password, $password)) {
+				return ['password', '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/Filemanager/Controller/Rename.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+				@file_exists($this->entity->parent()->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
 
 			# Rename item
 

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+				@file_exists($this->entity->parent()->pathFull() . $name)) {
+				return ['name', '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

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (@file_exists($this->parent->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
 
 			# Create item
 

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (@file_exists($this->parent->pathFull() . $name)) {
+				return ['name', '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/Filemanager/Handler/Lister.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
 
 			$dirs = []; $files = [];
 
-			$prefix = (('' !== $this->parent->path()) ? ($this->parent->path() . '/') : '');
+			$prefix = (('' !== $this->parent->path()) ? ($this->parent->path().'/') : '');
 
 			# Read parent directory contents
 
@@ -25,7 +25,7 @@ 
 
 					if (in_array($name, ['.', '..', '.empty'], true)) continue;
 
-					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
+					$path = ($prefix.$name); $path_full = ($this->parent->pathFull().$name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
@@ -112,9 +112,9 @@ 
 
 		private function getPaginationBlock() {
 
-			$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+			$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-			$url = new Url(INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$url = new Url(INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# ------------------------
 
@@ -137,9 +137,9 @@ 
 
 			# Set link
 
-			$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+			$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-			$contents->link = (INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$contents->link = (INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# Implement form
 
@@ -180,9 +180,9 @@ 
 
 			if ($upload || $this->form->handle(new Filemanager\Controller\Create($this->parent))) {
 
-				$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+				$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager' . $query);
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager'.$query);
 			}
 
 			# Get index

Braces +13 added lines, -7 removed lines

@@ -25,15 +25,19 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (in_array($name, ['.', '..', '.empty'], true)) continue;
+					if (in_array($name, ['.', '..', '.empty'], true)) {
+						continue;
+					}
 
 					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
-					if (@is_dir($path_full)) $dirs[] = ($data + ['type' => FILEMANAGER_TYPE_DIR]);
-
-					else if (@is_file($path_full)) $files[] = ($data + ['type' => FILEMANAGER_TYPE_FILE]);
+					if (@is_dir($path_full)) {
+						$dirs[] = ($data + ['type' => FILEMANAGER_TYPE_DIR]);
+					} else if (@is_file($path_full)) {
+						$files[] = ($data + ['type' => FILEMANAGER_TYPE_FILE]);
+					}
 				}
 
 				closedir($handler);
@@ -135,9 +139,11 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ($item['type'] === FILEMANAGER_TYPE_DIR) $items->addItem($this->getDirItemBlock($item));
-
-				else if ($item['type'] === FILEMANAGER_TYPE_FILE) $items->addItem($this->getFileItemBlock($item));
+				if ($item['type'] === FILEMANAGER_TYPE_DIR) {
+					$items->addItem($this->getDirItemBlock($item));
+				} else if ($item['type'] === FILEMANAGER_TYPE_FILE) {
+					$items->addItem($this->getFileItemBlock($item));
+				}
 			}
 
 			# Set pagination

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Group/Params.php

Braces +6 added lines, -2 removed lines

@@ -19,11 +19,15 @@
 
 		private function add(string $type, string $name, array $args) {
 
-			if (('' === $name) || isset($this->list[$name])) return;
+			if (('' === $name) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new $this->types[$type](...$args);
 
-			if (($type !== 'textual') || $this->list[$name]->short) $this->secure[] = $name;
+			if (($type !== 'textual') || $this->list[$name]->short) {
+				$this->secure[] = $name;
+			}
 		}
 
 		# Constructor