cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Install/Utils/Tables.php

Spacing +4 added lines, -4 removed lines

@@ -93,9 +93,9 @@ 
 
 			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
-				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
+				'locked' => false, 'slug' => ('page-'.($id - 1)), 'name' => ('page-'.($id - 1)),
 
-				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . ($id - 1)),
+				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.($id - 1)),
 
 				'contents' => Template::createBlock(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->getContents(),
 
@@ -132,9 +132,9 @@ 
 
 			for ($id = 1; $id <= 3; $id++) $menu[] = [
 
-				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
+				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-'.$id),
 
-				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.$id)];
 
 			# Process insertion
 

Braces +28 added lines, -8 removed lines

@@ -77,7 +77,11 @@ 
 
 			$count = DB::count(TABLE_PAGES);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
@@ -91,7 +95,8 @@ 
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME]];
 
-			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
+			for ($id = 2; $id <= 4; $id++) {
+				$pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
 				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
 
@@ -100,10 +105,13 @@ 
 				'contents' => Template::createBlock(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->getContents(),
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_PAGES_RELATIONS, count($pages));
 
@@ -124,21 +132,29 @@ 
 
 			$count = DB::count(TABLE_MENU);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
 			$menu = [];
 
-			for ($id = 1; $id <= 3; $id++) $menu[] = [
+			for ($id = 1; $id <= 3; $id++) {
+				$menu[] = [
 
 				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
 
 				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_MENU_RELATIONS, count($menu));
 
@@ -157,7 +173,9 @@ 
 
 			$definitions = self::getDefinitions(false);
 
-			foreach ($definitions as $definition) if (!$definition->createTables()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->createTables()) return false;
+			}
 
 			# ------------------------
 
@@ -174,7 +192,9 @@ 
 
 			$definitions = self::getDefinitions(true);
 
-			foreach ($definitions as $definition) if (!$definition->removeTables()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->removeTables()) return false;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Install/Install.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
 		public static function checkFile() : bool {
 
-			return Explorer::isFile(DIR_WWW . 'install.php');
+			return Explorer::isFile(DIR_WWW.'install.php');
 		}
 	}
 }

www/engine/System/Classes/Modules/Settings/Settings.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 
 		public static function __autoload() {
 
-			if (null === self::$settings) self::$settings = new Settings\Utils\Dataset;
+			if (null === self::$settings) {
+				self::$settings = new Settings\Utils\Dataset;
+			}
 		}
 
 		/**
@@ -32,7 +34,9 @@ 
 
 		public static function load() : bool {
 
-			if (null === ($data = Schema::get('Settings')->load())) return false;
+			if (null === ($data = Schema::get('Settings')->load())) {
+				return false;
+			}
 
 			self::$settings->setArray($data); self::$loaded = true;
 

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 			return (new Auth\Action\Recover)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) {
+				Request::redirect(INSTALL_PATH . '/admin/register');
+			}
 
 			return (new Auth\Action\Recover)->handle();
 		}

www/engine/System/Classes/Modules/Auth/Handler/Reset.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 			return (new Auth\Action\Reset)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) {
+				Request::redirect(INSTALL_PATH . '/admin/register');
+			}
 
 			return (new Auth\Action\Reset)->handle();
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 			return (new Auth\Action\Login)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) {
+				Request::redirect(INSTALL_PATH . '/admin/register');
+			}
 
 			return (new Auth\Action\Login)->handle();
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function handle() : Template\Block {
 
-			if (!Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/login');
+			if (!Auth::isInitial()) Request::redirect(INSTALL_PATH.'/admin/login');
 
 			return (new Auth\Action\Register)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		public function handle() : Template\Block {
 
-			if (!Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/login');
+			if (!Auth::isInitial()) {
+				Request::redirect(INSTALL_PATH . '/admin/login');
+			}
 
 			return (new Auth\Action\Register)->handle();
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 			if (false === ($result = Auth\Utils\Connector\Secret::authorize($code, $admin))) {
 
-				Request::redirect(INSTALL_PATH . ($admin ? '/admin' : '/profile') . '/reset');
+				Request::redirect(INSTALL_PATH.($admin ? '/admin' : '/profile').'/reset');
 			}
 
 			# Set recovery data

www/engine/System/Classes/Modules/Auth/Utils/Connector.php

Braces +15 added lines, -5 removed lines

@@ -29,19 +29,29 @@
 
 			# Check code
 
-			if (false === ($code = Validate::authCode($code))) return false;
+			if (false === ($code = Validate::authCode($code))) {
+				return false;
+			}
 
 			# Get auth
 
-			if (!($auth = Entitizer::get(static::$type))->init($code, 'code')) return false;
+			if (!($auth = Entitizer::get(static::$type))->init($code, 'code')) {
+				return false;
+			}
 
-			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - static::$lifetime))) return false;
+			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - static::$lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (0 === ($user = Entitizer::get(TABLE_USERS, $auth->id))->id) return false;
+			if (0 === ($user = Entitizer::get(TABLE_USERS, $auth->id))->id) {
+				return false;
+			}
 
-			if ($user->rank < ($admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
+			if ($user->rank < ($admin ? RANK_ADMINISTRATOR : RANK_USER)) {
+				return false;
+			}
 
 			# ------------------------