Passed
Push — 0.4.0 ( 434eea...cba0fe )
by Anton
03:50
created
www/engine/System/Classes/Modules/Auth/Utils/Action.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,9 @@
 block discarded – undo
20 20
 
21 21
 			# Implement form
22 22
 
23
-			if (null !== $this->form) $this->form->implement($contents);
23
+			if (null !== $this->form) {
24
+				$this->form->implement($contents);
25
+			}
24 26
 
25 27
 			# ------------------------
26 28
 
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Auth/Action/Reset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 			if ($this->form->handle(new Auth\Controller\Reset())) {
22 22
 
23
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=reset');
23
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=reset');
24 24
 			}
25 25
 
26 26
 			# ------------------------
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Auth/Action/Register.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 			if ($this->form->handle(new Auth\Controller\Register())) {
22 22
 
23
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=register');
23
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=register');
24 24
 			}
25 25
 
26 26
 			# ------------------------
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Auth/Action/Recover.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 
17 17
 			if (false !== ($code = Auth::secret())) $this->code = $code;
18 18
 
19
-			else Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
19
+			else Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/reset');
20 20
 
21 21
 			# Create form
22 22
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 			if ($this->form->handle(new Auth\Controller\Recover())) {
28 28
 
29
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=recover');
29
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=recover');
30 30
 			}
31 31
 
32 32
 			# ------------------------
Please login to merge, or discard this patch.
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,9 +14,11 @@
 block discarded – undo
14 14
 
15 15
 			# Init user by secret code
16 16
 
17
-			if (false !== ($code = Auth::secret())) $this->code = $code;
18
-
19
-			else Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
17
+			if (false !== ($code = Auth::secret())) {
18
+				$this->code = $code;
19
+			} else {
20
+				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
21
+			}
20 22
 
21 23
 			# Create form
22 24
 
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Auth/Action/Login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 			if ($this->form->handle(new Auth\Controller\Login())) {
22 22
 
23
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile'));
23
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile'));
24 24
 			}
25 25
 
26 26
 			# Display success message
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Auth/Auth.php 1 patch
Braces   +36 added lines, -12 removed lines patch added patch discarded remove patch
@@ -12,9 +12,13 @@  discard block
 block discarded – undo
12 12
 
13 13
 		private static function getAuth(string $code, string $type, int $lifetime) {
14 14
 
15
-			if (!($auth = Entitizer::get($type))->init($code, 'code')) return false;
15
+			if (!($auth = Entitizer::get($type))->init($code, 'code')) {
16
+				return false;
17
+			}
16 18
 
17
-			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) return false;
19
+			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) {
20
+				return false;
21
+			}
18 22
 
19 23
 			# ------------------------
20 24
 
@@ -25,9 +29,13 @@  discard block
 block discarded – undo
25 29
 
26 30
 		private static function getUser(int $id) {
27 31
 
28
-			if (0 === ($user = Entitizer::get(TABLE_USERS, $id))->id) return false;
32
+			if (0 === ($user = Entitizer::get(TABLE_USERS, $id))->id) {
33
+				return false;
34
+			}
29 35
 
30
-			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
36
+			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) {
37
+				return false;
38
+			}
31 39
 
32 40
 			# ------------------------
33 41
 
@@ -42,17 +50,23 @@  discard block
 block discarded – undo
42 50
 
43 51
 			# Check session code
44 52
 
45
-			if (false === ($code = Validate::authCode(Session::get('code') ?? ''))) return false;
53
+			if (false === ($code = Validate::authCode(Session::get('code') ?? ''))) {
54
+				return false;
55
+			}
46 56
 
47 57
 			# Get auth
48 58
 
49 59
 			$type = TABLE_USERS_SESSIONS; $lifetime = CONFIG_USER_SESSION_LIFETIME;
50 60
 
51
-			if (false === ($session = self::getAuth($code, $type, $lifetime))) return false;
61
+			if (false === ($session = self::getAuth($code, $type, $lifetime))) {
62
+				return false;
63
+			}
52 64
 
53 65
 			# Get user
54 66
 
55
-			if (false === ($user = self::getUser($session->id))) return false;
67
+			if (false === ($user = self::getUser($session->id))) {
68
+				return false;
69
+			}
56 70
 
57 71
 			# Update session
58 72
 
@@ -71,21 +85,29 @@  discard block
 block discarded – undo
71 85
 
72 86
 		public static function secret() {
73 87
 
74
-			if ((null === self::$user) || (0 !== self::$user->id)) return false;
88
+			if ((null === self::$user) || (0 !== self::$user->id)) {
89
+				return false;
90
+			}
75 91
 
76 92
 			# Check secret code
77 93
 
78
-			if (false === ($code = Validate::authCode(Request::get('code')))) return false;
94
+			if (false === ($code = Validate::authCode(Request::get('code')))) {
95
+				return false;
96
+			}
79 97
 
80 98
 			# Get auth
81 99
 
82 100
 			$type = TABLE_USERS_SECRETS; $lifetime = CONFIG_USER_SECRET_LIFETIME;
83 101
 
84
-			if (false === ($secret = self::getAuth($code, $type, $lifetime))) return false;
102
+			if (false === ($secret = self::getAuth($code, $type, $lifetime))) {
103
+				return false;
104
+			}
85 105
 
86 106
 			# Get user
87 107
 
88
-			if (false === ($user = self::getUser($secret->id))) return false;
108
+			if (false === ($user = self::getUser($secret->id))) {
109
+				return false;
110
+			}
89 111
 
90 112
 			# ------------------------
91 113
 
@@ -96,7 +118,9 @@  discard block
 block discarded – undo
96 118
 
97 119
 		public static function logout() {
98 120
 
99
-			if ((null === self::$user) || (0 === self::$user->id)) return false;
121
+			if ((null === self::$user) || (0 === self::$user->id)) {
122
+				return false;
123
+			}
100 124
 
101 125
 			# Remove session
102 126
 
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Entitizer/Collection/Widgets.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 		protected function init() {
14 14
 
15
-			$this->config->addParam('active', '', function (bool $active) {
15
+			$this->config->addParam('active', '', function(bool $active) {
16 16
 
17 17
 				return ($active ? "ent.active = 1" : '');
18 18
 			});
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Entitizer/Collection/Pages.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -12,44 +12,44 @@
 block discarded – undo
12 12
 
13 13
 		protected function init() {
14 14
 
15
-			$this->config->addParam('active', '', function (bool $active) {
15
+			$this->config->addParam('active', '', function(bool $active) {
16 16
 
17
-				return ($active ? ("ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.locked = 0") : '');
17
+				return ($active ? ("ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.locked = 0") : '');
18 18
 			});
19 19
 
20
-			$this->config->addParam('rank', '', function (int $rank = null) {
20
+			$this->config->addParam('rank', '', function(int $rank = null) {
21 21
 
22
-				return ((null !== $rank) ? ("ent.access <= " . $rank) : '');
22
+				return ((null !== $rank) ? ("ent.access <= ".$rank) : '');
23 23
 			});
24 24
 
25
-			$this->config->addParam('slug', '', function (string $slug) {
25
+			$this->config->addParam('slug', '', function(string $slug) {
26 26
 
27
-				return (('' !== $slug) ? ("ent.slug = '" . addslashes($slug) . "'") : '');
27
+				return (('' !== $slug) ? ("ent.slug = '".addslashes($slug)."'") : '');
28 28
 			});
29 29
 
30
-			$this->config->addParam('name', '', function (string $name) {
30
+			$this->config->addParam('name', '', function(string $name) {
31 31
 
32
-				return (('' !== $name) ? ("ent.name = '" . addslashes($name) . "'") : '');
32
+				return (('' !== $name) ? ("ent.name = '".addslashes($name)."'") : '');
33 33
 			});
34 34
 
35
-			$this->config->addParam('time_created >=', '', function (int $time) {
35
+			$this->config->addParam('time_created >=', '', function(int $time) {
36 36
 
37
-				return ((0 < $time) ? ("ent.time_created >= " . $time) : '');
37
+				return ((0 < $time) ? ("ent.time_created >= ".$time) : '');
38 38
 			});
39 39
 
40
-			$this->config->addParam('time_created <=', '', function (int $time) {
40
+			$this->config->addParam('time_created <=', '', function(int $time) {
41 41
 
42
-				return ((0 < $time) ? ("ent.time_created <= " . $time) : '');
42
+				return ((0 < $time) ? ("ent.time_created <= ".$time) : '');
43 43
 			});
44 44
 
45
-			$this->config->addParam('time_modified >=', '', function (int $time) {
45
+			$this->config->addParam('time_modified >=', '', function(int $time) {
46 46
 
47
-				return ((0 < $time) ? ("ent.time_modified >= " . $time) : '');
47
+				return ((0 < $time) ? ("ent.time_modified >= ".$time) : '');
48 48
 			});
49 49
 
50
-			$this->config->addParam('time_modified <=', '', function (int $time) {
50
+			$this->config->addParam('time_modified <=', '', function(int $time) {
51 51
 
52
-				return ((0 < $time) ? ("ent.time_modified <= " . $time) : '');
52
+				return ((0 < $time) ? ("ent.time_modified <= ".$time) : '');
53 53
 			});
54 54
 		}
55 55
 	}
Please login to merge, or discard this patch.
www/engine/System/Classes/Modules/Entitizer/Collection/Users.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -12,29 +12,29 @@
 block discarded – undo
12 12
 
13 13
 		protected function init() {
14 14
 
15
-			$this->config->addParam('rank', '', function (int $rank = null) {
15
+			$this->config->addParam('rank', '', function(int $rank = null) {
16 16
 
17
-				return ((null !== $rank) ? ("ent.rank >= " . $rank) : '');
17
+				return ((null !== $rank) ? ("ent.rank >= ".$rank) : '');
18 18
 			});
19 19
 
20
-			$this->config->addParam('time_registered >=', '', function (int $time) {
20
+			$this->config->addParam('time_registered >=', '', function(int $time) {
21 21
 
22
-				return ((0 < $time) ? ("ent.time_registered >= " . $time) : '');
22
+				return ((0 < $time) ? ("ent.time_registered >= ".$time) : '');
23 23
 			});
24 24
 
25
-			$this->config->addParam('time_registered <=', '', function (int $time) {
25
+			$this->config->addParam('time_registered <=', '', function(int $time) {
26 26
 
27
-				return ((0 < $time) ? ("ent.time_registered <= " . $time) : '');
27
+				return ((0 < $time) ? ("ent.time_registered <= ".$time) : '');
28 28
 			});
29 29
 
30
-			$this->config->addParam('time_logged >=', '', function (int $time) {
30
+			$this->config->addParam('time_logged >=', '', function(int $time) {
31 31
 
32
-				return ((0 < $time) ? ("ent.time_logged >= " . $time) : '');
32
+				return ((0 < $time) ? ("ent.time_logged >= ".$time) : '');
33 33
 			});
34 34
 
35
-			$this->config->addParam('time_logged <=', '', function (int $time) {
35
+			$this->config->addParam('time_logged <=', '', function(int $time) {
36 36
 
37
-				return ((0 < $time) ? ("ent.time_logged <= " . $time) : '');
37
+				return ((0 < $time) ? ("ent.time_logged <= ".$time) : '');
38 38
 			});
39 39
 		}
40 40
 	}
Please login to merge, or discard this patch.