Inspection of "Merge branch 0.4.4" - cadmium-org/cadmium-cms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#16)

by Anton

created 2017-02-21 02:18 UTC

Status

Spacing +34 added lines, -34 removed lines patch added patch discarded remove patch

@@ -9,68 +9,68 @@
 block discarded – undo
 
 # Cadmium
 
-define('CADMIUM_NAME',                              'Cadmium CMS');
-define('CADMIUM_HOME',                              'http://cadmium-cms.com');
+define('CADMIUM_NAME', 'Cadmium CMS');
+define('CADMIUM_HOME', 'http://cadmium-cms.com');
 
-define('CADMIUM_VERSION',                           '0.4.4');
-define('CADMIUM_COPY',                              '2017');
+define('CADMIUM_VERSION', '0.4.4');
+define('CADMIUM_COPY', '2017');
 
 # Third-party
 
-define('JQUERY_VERSION',                            '3.1.1');
-define('SEMANTIC_UI_VERSION',                       '2.2.7');
-define('CKEDITOR_VERSION',                          '4.6.2');
+define('JQUERY_VERSION', '3.1.1');
+define('SEMANTIC_UI_VERSION', '2.2.7');
+define('CKEDITOR_VERSION', '4.6.2');
 
 # Sections
 
-define('SECTION_SITE',                              'site');
-define('SECTION_ADMIN',                             'admin');
+define('SECTION_SITE', 'site');
+define('SECTION_ADMIN', 'admin');
 
 # Filemanager types
 
-define('FILEMANAGER_TYPE_DIR',                      'dir');
-define('FILEMANAGER_TYPE_FILE',                     'file');
+define('FILEMANAGER_TYPE_DIR', 'dir');
+define('FILEMANAGER_TYPE_FILE', 'file');
 
 # Access
 
-define('ACCESS_PUBLIC',                             0);
-define('ACCESS_REGISTERED',                         1);
-define('ACCESS_ADMINISTRATOR',                      2);
+define('ACCESS_PUBLIC', 0);
+define('ACCESS_REGISTERED', 1);
+define('ACCESS_ADMINISTRATOR', 2);
 
 # Frequency
 
-define('FREQUENCY_ALWAYS',                          'always');
-define('FREQUENCY_HOURLY',                          'hourly');
-define('FREQUENCY_DAILY',                           'daily');
-define('FREQUENCY_WEEKLY',                          'weekly');
-define('FREQUENCY_MONTHLY',                         'monthly');
-define('FREQUENCY_YEARLY',                          'yearly');
-define('FREQUENCY_NEVER',                           'never');
+define('FREQUENCY_ALWAYS', 'always');
+define('FREQUENCY_HOURLY', 'hourly');
+define('FREQUENCY_DAILY', 'daily');
+define('FREQUENCY_WEEKLY', 'weekly');
+define('FREQUENCY_MONTHLY', 'monthly');
+define('FREQUENCY_YEARLY', 'yearly');
+define('FREQUENCY_NEVER', 'never');
 
 # Rank
 
-define('RANK_GUEST',                                0);
-define('RANK_USER',                                 1);
-define('RANK_ADMINISTRATOR',                        2);
+define('RANK_GUEST', 0);
+define('RANK_USER', 1);
+define('RANK_ADMINISTRATOR', 2);
 
 # Sex
 
-define('SEX_NOT_SELECTED',                          0);
-define('SEX_MALE',                                  1);
-define('SEX_FEMALE',                                2);
+define('SEX_NOT_SELECTED', 0);
+define('SEX_MALE', 1);
+define('SEX_FEMALE', 2);
 
 # Status
 
-define('STATUS_ONLINE',                             0);
-define('STATUS_MAINTENANCE',                        1);
-define('STATUS_UPDATE',                             2);
+define('STATUS_ONLINE', 0);
+define('STATUS_MAINTENANCE', 1);
+define('STATUS_UPDATE', 2);
 
 # Target
 
-define('TARGET_SELF',                               0);
-define('TARGET_BLANK',                              1);
+define('TARGET_SELF', 0);
+define('TARGET_BLANK', 1);
 
 # Visibility
 
-define('VISIBILITY_DRAFT',                          0);
-define('VISIBILITY_PUBLISHED',                      1);
+define('VISIBILITY_DRAFT', 0);
+define('VISIBILITY_PUBLISHED', 1);

Please login to merge, or discard this patch.

www/engine/System/Classes/Installer.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,13 +21,13 @@
 block discarded – undo
 
 			# Check installation
 
-			if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/index.php');
+			if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH.'/index.php');
 
 			# Get handler class
 
 			$checked = (Install::checkRequirements() && Validate::boolean(Request::get('checked')));
 
-			$class = ('Modules\Install\Handler\\' . (!$checked ? 'Check' : 'Database'));
+			$class = ('Modules\Install\Handler\\'.(!$checked ? 'Check' : 'Database'));
 
 			# ------------------------
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,9 @@
 block discarded – undo
 
 			# Check installation
 
-			if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/index.php');
+			if (null !== ($data = Schema::get('System')->load())) {
+				Request::redirect(INSTALL_PATH . '/index.php');
+			}
 
 			# Get handler class
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Dispatcher.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
 
 			# Check installation
 
-			if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/install.php');
+			if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH.'/install.php');
 
 			# Connect to database
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,9 @@
 block discarded – undo
 
 			# Check installation
 
-			if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/install.php');
+			if (null === ($data = Schema::get('System')->load())) {
+				Request::redirect(INSTALL_PATH . '/install.php');
+			}
 
 			# Connect to database
 

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,9 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,9 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,9 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,9 @@
 block discarded – undo
 
 		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();
 		}

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@
 block discarded – undo
 
 			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

Please login to merge, or discard this patch.

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

Braces +15 added lines, -5 removed lines patch added patch discarded remove patch

@@ -29,19 +29,29 @@
 block discarded – undo
 
 			# 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;
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

		@@ -9,68 +9,68 @@
		block discarded – undo
9	9
10	10	# Cadmium
11	11
12		-define('CADMIUM_NAME', 'Cadmium CMS');
13		-define('CADMIUM_HOME', 'http://cadmium-cms.com');
	12	+define('CADMIUM_NAME', 'Cadmium CMS');
	13	+define('CADMIUM_HOME', 'http://cadmium-cms.com');
14	14
15		-define('CADMIUM_VERSION', '0.4.4');
16		-define('CADMIUM_COPY', '2017');
	15	+define('CADMIUM_VERSION', '0.4.4');
	16	+define('CADMIUM_COPY', '2017');
17	17
18	18	# Third-party
19	19
20		-define('JQUERY_VERSION', '3.1.1');
21		-define('SEMANTIC_UI_VERSION', '2.2.7');
22		-define('CKEDITOR_VERSION', '4.6.2');
	20	+define('JQUERY_VERSION', '3.1.1');
	21	+define('SEMANTIC_UI_VERSION', '2.2.7');
	22	+define('CKEDITOR_VERSION', '4.6.2');
23	23
24	24	# Sections
25	25
26		-define('SECTION_SITE', 'site');
27		-define('SECTION_ADMIN', 'admin');
	26	+define('SECTION_SITE', 'site');
	27	+define('SECTION_ADMIN', 'admin');
28	28
29	29	# Filemanager types
30	30
31		-define('FILEMANAGER_TYPE_DIR', 'dir');
32		-define('FILEMANAGER_TYPE_FILE', 'file');
	31	+define('FILEMANAGER_TYPE_DIR', 'dir');
	32	+define('FILEMANAGER_TYPE_FILE', 'file');
33	33
34	34	# Access
35	35
36		-define('ACCESS_PUBLIC', 0);
37		-define('ACCESS_REGISTERED', 1);
38		-define('ACCESS_ADMINISTRATOR', 2);
	36	+define('ACCESS_PUBLIC', 0);
	37	+define('ACCESS_REGISTERED', 1);
	38	+define('ACCESS_ADMINISTRATOR', 2);
39	39
40	40	# Frequency
41	41
42		-define('FREQUENCY_ALWAYS', 'always');
43		-define('FREQUENCY_HOURLY', 'hourly');
44		-define('FREQUENCY_DAILY', 'daily');
45		-define('FREQUENCY_WEEKLY', 'weekly');
46		-define('FREQUENCY_MONTHLY', 'monthly');
47		-define('FREQUENCY_YEARLY', 'yearly');
48		-define('FREQUENCY_NEVER', 'never');
	42	+define('FREQUENCY_ALWAYS', 'always');
	43	+define('FREQUENCY_HOURLY', 'hourly');
	44	+define('FREQUENCY_DAILY', 'daily');
	45	+define('FREQUENCY_WEEKLY', 'weekly');
	46	+define('FREQUENCY_MONTHLY', 'monthly');
	47	+define('FREQUENCY_YEARLY', 'yearly');
	48	+define('FREQUENCY_NEVER', 'never');
49	49
50	50	# Rank
51	51
52		-define('RANK_GUEST', 0);
53		-define('RANK_USER', 1);
54		-define('RANK_ADMINISTRATOR', 2);
	52	+define('RANK_GUEST', 0);
	53	+define('RANK_USER', 1);
	54	+define('RANK_ADMINISTRATOR', 2);
55	55
56	56	# Sex
57	57
58		-define('SEX_NOT_SELECTED', 0);
59		-define('SEX_MALE', 1);
60		-define('SEX_FEMALE', 2);
	58	+define('SEX_NOT_SELECTED', 0);
	59	+define('SEX_MALE', 1);
	60	+define('SEX_FEMALE', 2);
61	61
62	62	# Status
63	63
64		-define('STATUS_ONLINE', 0);
65		-define('STATUS_MAINTENANCE', 1);
66		-define('STATUS_UPDATE', 2);
	64	+define('STATUS_ONLINE', 0);
	65	+define('STATUS_MAINTENANCE', 1);
	66	+define('STATUS_UPDATE', 2);
67	67
68	68	# Target
69	69
70		-define('TARGET_SELF', 0);
71		-define('TARGET_BLANK', 1);
	70	+define('TARGET_SELF', 0);
	71	+define('TARGET_BLANK', 1);
72	72
73	73	# Visibility
74	74
75		-define('VISIBILITY_DRAFT', 0);
76		-define('VISIBILITY_PUBLISHED', 1);
	75	+define('VISIBILITY_DRAFT', 0);
	76	+define('VISIBILITY_PUBLISHED', 1);

		@@ -21,13 +21,13 @@
		block discarded – undo
21	21
22	22	# Check installation
23	23
24		- if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/index.php');
	24	+ if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH.'/index.php');
25	25
26	26	# Get handler class
27	27
28	28	$checked = (Install::checkRequirements() && Validate::boolean(Request::get('checked')));
29	29
30		- $class = ('Modules\Install\Handler\\' . (!$checked ? 'Check' : 'Database'));
	30	+ $class = ('Modules\Install\Handler\\'.(!$checked ? 'Check' : 'Database'));
31	31
32	32	# ------------------------
33	33

		@@ -21,7 +21,9 @@
		block discarded – undo
21	21
22	22	# Check installation
23	23
24		- if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/index.php');
	24	+ if (null !== ($data = Schema::get('System')->load())) {
	25	+ Request::redirect(INSTALL_PATH . '/index.php');
	26	+ }
25	27
26	28	# Get handler class
27	29

		@@ -21,7 +21,7 @@
		block discarded – undo
21	21
22	22	# Check installation
23	23
24		- if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/install.php');
	24	+ if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH.'/install.php');
25	25
26	26	# Connect to database
27	27

		@@ -21,7 +21,9 @@
		block discarded – undo
21	21
22	22	# Check installation
23	23
24		- if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/install.php');
	24	+ if (null === ($data = Schema::get('System')->load())) {
	25	+ Request::redirect(INSTALL_PATH . '/install.php');
	26	+ }
25	27
26	28	# Connect to database
27	29

		@@ -21,7 +21,7 @@
		block discarded – undo
21	21
22	22	public function handle() : Template\Block {
23	23
24		- if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
	24	+ if (Auth::isInitial()) Request::redirect(INSTALL_PATH.'/admin/register');
25	25
26	26	return (new Auth\Action\Recover)->handle();
27	27	}

		@@ -37,7 +37,7 @@
		block discarded – undo
37	37
38	38	if (false === ($result = Auth\Utils\Connector\Secret::authorize($code, $admin))) {
39	39
40		- Request::redirect(INSTALL_PATH . ($admin ? '/admin' : '/profile') . '/reset');
	40	+ Request::redirect(INSTALL_PATH.($admin ? '/admin' : '/profile').'/reset');
41	41	}
42	42
43	43	# Set recovery data

		@@ -29,19 +29,29 @@
		block discarded – undo
29	29
30	30	# Check code
31	31
32		- if (false === ($code = Validate::authCode($code))) return false;
	32	+ if (false === ($code = Validate::authCode($code))) {
	33	+ return false;
	34	+ }
33	35
34	36	# Get auth
35	37
36		- if (!($auth = Entitizer::get(static::$type))->init($code, 'code')) return false;
	38	+ if (!($auth = Entitizer::get(static::$type))->init($code, 'code')) {
	39	+ return false;
	40	+ }
37	41
38		- if (($auth->ip !== REQUEST_CLIENT_IP) \|\| ($auth->time < (REQUEST_TIME - static::$lifetime))) return false;
	42	+ if (($auth->ip !== REQUEST_CLIENT_IP) \|\| ($auth->time < (REQUEST_TIME - static::$lifetime))) {
	43	+ return false;
	44	+ }
39	45
40	46	# Get user
41	47
42		- if (0 === ($user = Entitizer::get(TABLE_USERS, $auth->id))->id) return false;
	48	+ if (0 === ($user = Entitizer::get(TABLE_USERS, $auth->id))->id) {
	49	+ return false;
	50	+ }
43	51
44		- if ($user->rank < ($admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
	52	+ if ($user->rank < ($admin ? RANK_ADMINISTRATOR : RANK_USER)) {
	53	+ return false;
	54	+ }
45	55
46	56	# ------------------------
47	57

cadmium-org / cadmium-cms

Pull Request — master (#16)

Status

Category

Spacing +34 added lines, -34 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +15 added lines, -5 removed lines patch added patch discarded remove patch