Passed
Push — master ( db71b9...272130 )
by Darío
04:27
created
module/Workarea/config/user.config.php 1 patch
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,23 +15,25 @@
 block discarded – undo
15 15
 			{
16 16
 				if (is_array($in))
17 17
 				{
18
-					if (array_key_exists($key, $in))
19
-						$in = $in[$key];
20
-					else
21
-						return $value;
18
+					if (array_key_exists($key, $in)) {
19
+											$in = $in[$key];
20
+					} else {
21
+											return $value;
22
+					}
23
+				} else {
24
+									return $value;
22 25
 				}
23
-				else
24
-					return $value;
25 26
 
26 27
 				$key = ($array) ? array_shift($array) : NULL;
27 28
 
28
-				if (!$key)
29
-					return $in;
29
+				if (!$key) {
30
+									return $in;
31
+				}
30 32
 
31 33
 			} while($key);
34
+		} else {
35
+					return $value;
32 36
 		}
33
-		else
34
-			return $value;
35 37
 	}
36 38
 }
37 39
 
Please login to merge, or discard this patch.
module/Workarea/Module.php 1 patch
Braces   +22 added lines, -18 removed lines patch added patch discarded remove patch
@@ -24,8 +24,9 @@  discard block
 block discarded – undo
24 24
      */
25 25
     private function getUserAdapter()
26 26
     {
27
-        if (!is_null($this->userAdapter))
28
-            return $this->userAdapter;
27
+        if (!is_null($this->userAdapter)) {
28
+                    return $this->userAdapter;
29
+        }
29 30
 
30 31
         $this->userAdapter = new EntityAdapter(new UserTbl(new User()));
31 32
 
@@ -48,8 +49,9 @@  discard block
 block discarded – undo
48 49
          * when users log in. It should be an unique session id for the app to prevent bad redirections with other projects.
49 50
          */
50 51
         # save only no XmlHttpRequest!
51
-        if (!$c->isXmlHttpRequest())
52
-            $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
52
+        if (!$c->isXmlHttpRequest()) {
53
+                    $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
54
+        }
53 55
 
54 56
         # config constraints
55 57
         $components = [
@@ -133,9 +135,9 @@  discard block
 block discarded – undo
133 135
                         $c->stopExecution(false);
134 136
 
135 137
                         header("location: " . $c->getBasePath() . "/public/" . $redirect);
138
+                    } else {
139
+                                            $username_credential = $_COOKIE[$key];
136 140
                     }
137
-                    else
138
-                        $username_credential = $_COOKIE[$key];
139 141
 
140 142
                     break;
141 143
 
@@ -147,9 +149,9 @@  discard block
 block discarded – undo
147 149
                         $c->stopExecution(false);
148 150
 
149 151
                         header("location: " . $c->getBasePath() . "/public/" . $redirect);
152
+                    } else {
153
+                                            $username_credential = $_SESSION[$key];
150 154
                     }
151
-                    else
152
-                        $username_credential = $_SESSION[$key];
153 155
 
154 156
                     break;
155 157
             }
@@ -161,10 +163,10 @@  discard block
 block discarded – undo
161 163
             $state_field  = $config["authentication"]["gateway"]["table_info"]["columns"]["state_field"];
162 164
             $active_state = $config["authentication"]["gateway"]["table_info"]["column_values"]["state_field"]["user_active"];
163 165
 
164
-            if ($user->{$state_field} != $active_state)
165
-                throw new \Exception("The user has been inactived!. Please log-in again.");
166
-        }
167
-        catch (\Exception $e)
166
+            if ($user->{$state_field} != $active_state) {
167
+                            throw new \Exception("The user has been inactived!. Please log-in again.");
168
+            }
169
+        } catch (\Exception $e)
168 170
         {
169 171
             $file = str_replace('\\', '', __CLASS__);
170 172
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -194,10 +196,11 @@  discard block
 block discarded – undo
194 196
             $layoutManager->setParams($data);
195 197
 
196 198
             # for AJAX requests!
197
-            if ($c->isXmlHttpRequest())
198
-                $layoutManager->content();
199
-            else
200
-                $layoutManager->fromTemplate($this, 'blank');
199
+            if ($c->isXmlHttpRequest()) {
200
+                            $layoutManager->content();
201
+            } else {
202
+                            $layoutManager->fromTemplate($this, 'blank');
203
+            }
201 204
         }
202 205
     }
203 206
 
@@ -207,8 +210,9 @@  discard block
 block discarded – undo
207 210
 
208 211
         if (array_key_exists('locale', $_GET))
209 212
         {
210
-            if (in_array($_GET['locale'], ['en', 'es', 'fr']))
211
-                $_SESSION["LOCALE"] = $_GET['locale'];
213
+            if (in_array($_GET['locale'], ['en', 'es', 'fr'])) {
214
+                            $_SESSION["LOCALE"] = $_GET['locale'];
215
+            }
212 216
         }
213 217
 
214 218
         $locale = (array_key_exists('LOCALE', $_SESSION)) ? $_SESSION["LOCALE"] : $config["environment"]["locale"];
Please login to merge, or discard this patch.
module/Connections/config/user.config.php 1 patch
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,23 +15,25 @@
 block discarded – undo
15 15
 			{
16 16
 				if (is_array($in))
17 17
 				{
18
-					if (array_key_exists($key, $in))
19
-						$in = $in[$key];
20
-					else
21
-						return $value;
18
+					if (array_key_exists($key, $in)) {
19
+											$in = $in[$key];
20
+					} else {
21
+											return $value;
22
+					}
23
+				} else {
24
+									return $value;
22 25
 				}
23
-				else
24
-					return $value;
25 26
 
26 27
 				$key = ($array) ? array_shift($array) : NULL;
27 28
 
28
-				if (!$key)
29
-					return $in;
29
+				if (!$key) {
30
+									return $in;
31
+				}
30 32
 
31 33
 			} while($key);
34
+		} else {
35
+					return $value;
32 36
 		}
33
-		else
34
-			return $value;
35 37
 	}
36 38
 }
37 39
 
Please login to merge, or discard this patch.
module/Connections/Module.php 1 patch
Braces   +22 added lines, -18 removed lines patch added patch discarded remove patch
@@ -24,8 +24,9 @@  discard block
 block discarded – undo
24 24
      */
25 25
     private function getUserAdapter()
26 26
     {
27
-        if (!is_null($this->userAdapter))
28
-            return $this->userAdapter;
27
+        if (!is_null($this->userAdapter)) {
28
+                    return $this->userAdapter;
29
+        }
29 30
 
30 31
         $this->userAdapter = new EntityAdapter(new UserTbl(new User()));
31 32
 
@@ -48,8 +49,9 @@  discard block
 block discarded – undo
48 49
          * when users log in. It should be an unique session id for the app to prevent bad redirections with other projects.
49 50
          */
50 51
         # save only no XmlHttpRequest!
51
-        if (!$c->isXmlHttpRequest())
52
-            $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
52
+        if (!$c->isXmlHttpRequest()) {
53
+                    $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
54
+        }
53 55
 
54 56
         # config constraints
55 57
         $components = [
@@ -133,9 +135,9 @@  discard block
 block discarded – undo
133 135
                         $c->stopExecution(false);
134 136
 
135 137
                         header("location: " . $c->getBasePath() . "/public/" . $redirect);
138
+                    } else {
139
+                                            $username_credential = $_COOKIE[$key];
136 140
                     }
137
-                    else
138
-                        $username_credential = $_COOKIE[$key];
139 141
 
140 142
                     break;
141 143
 
@@ -147,9 +149,9 @@  discard block
 block discarded – undo
147 149
                         $c->stopExecution(false);
148 150
 
149 151
                         header("location: " . $c->getBasePath() . "/public/" . $redirect);
152
+                    } else {
153
+                                            $username_credential = $_SESSION[$key];
150 154
                     }
151
-                    else
152
-                        $username_credential = $_SESSION[$key];
153 155
 
154 156
                     break;
155 157
             }
@@ -161,10 +163,10 @@  discard block
 block discarded – undo
161 163
             $state_field  = $config["authentication"]["gateway"]["table_info"]["columns"]["state_field"];
162 164
             $active_state = $config["authentication"]["gateway"]["table_info"]["column_values"]["state_field"]["user_active"];
163 165
 
164
-            if ($user->{$state_field} != $active_state)
165
-                throw new \Exception("The user has been inactived!. Please log-in again.");
166
-        }
167
-        catch (\Exception $e)
166
+            if ($user->{$state_field} != $active_state) {
167
+                            throw new \Exception("The user has been inactived!. Please log-in again.");
168
+            }
169
+        } catch (\Exception $e)
168 170
         {
169 171
             $file = str_replace('\\', '', __CLASS__);
170 172
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -194,10 +196,11 @@  discard block
 block discarded – undo
194 196
             $layoutManager->setParams($data);
195 197
 
196 198
             # for AJAX requests!
197
-            if ($c->isXmlHttpRequest())
198
-                $layoutManager->content();
199
-            else
200
-                $layoutManager->fromTemplate($this, 'blank');
199
+            if ($c->isXmlHttpRequest()) {
200
+                            $layoutManager->content();
201
+            } else {
202
+                            $layoutManager->fromTemplate($this, 'blank');
203
+            }
201 204
         }
202 205
     }
203 206
 
@@ -207,8 +210,9 @@  discard block
 block discarded – undo
207 210
 
208 211
         if (array_key_exists('locale', $_GET))
209 212
         {
210
-            if (in_array($_GET['locale'], ['en', 'es', 'fr']))
211
-                $_SESSION["LOCALE"] = $_GET['locale'];
213
+            if (in_array($_GET['locale'], ['en', 'es', 'fr'])) {
214
+                            $_SESSION["LOCALE"] = $_GET['locale'];
215
+            }
212 216
         }
213 217
 
214 218
         $locale = (array_key_exists('LOCALE', $_SESSION)) ? $_SESSION["LOCALE"] : $config["environment"]["locale"];
Please login to merge, or discard this patch.
module/Auth/config/user.config.php 1 patch
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,23 +15,25 @@
 block discarded – undo
15 15
 			{
16 16
 				if (is_array($in))
17 17
 				{
18
-					if (array_key_exists($key, $in))
19
-						$in = $in[$key];
20
-					else
21
-						return $value;
18
+					if (array_key_exists($key, $in)) {
19
+											$in = $in[$key];
20
+					} else {
21
+											return $value;
22
+					}
23
+				} else {
24
+									return $value;
22 25
 				}
23
-				else
24
-					return $value;
25 26
 
26 27
 				$key = ($array) ? array_shift($array) : NULL;
27 28
 
28
-				if (!$key)
29
-					return $in;
29
+				if (!$key) {
30
+									return $in;
31
+				}
30 32
 
31 33
 			} while($key);
34
+		} else {
35
+					return $value;
32 36
 		}
33
-		else
34
-			return $value;
35 37
 	}
36 38
 }
37 39
 
Please login to merge, or discard this patch.
module/Auth/source/Model/UserTbl.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,8 +49,9 @@  discard block
 block discarded – undo
49 49
 
50 50
         foreach ($row as $key => $value)
51 51
         {
52
-            if (is_string($key))
53
-                $filtered_array[$key] = $value;
52
+            if (is_string($key)) {
53
+                            $filtered_array[$key] = $value;
54
+            }
54 55
         }
55 56
 
56 57
         $user = new User();
@@ -81,8 +82,9 @@  discard block
 block discarded – undo
81 82
 
82 83
         foreach ($row as $key => $value)
83 84
         {
84
-            if (is_string($key))
85
-                $filtered_array[$key] = $value;
85
+            if (is_string($key)) {
86
+                            $filtered_array[$key] = $value;
87
+            }
86 88
         }
87 89
 
88 90
         $user = new User();
Please login to merge, or discard this patch.
module/Auth/source/Controller/LogIn.php 1 patch
Braces   +46 added lines, -36 removed lines patch added patch discarded remove patch
@@ -39,8 +39,9 @@  discard block
 block discarded – undo
39 39
      */
40 40
     private function getUserAdapter()
41 41
     {
42
-        if (!is_null($this->userAdapter))
43
-            return $this->userAdapter;
42
+        if (!is_null($this->userAdapter)) {
43
+                    return $this->userAdapter;
44
+        }
44 45
 
45 46
         $this->userAdapter = new EntityAdapter(new TableGateway(new User()));
46 47
 
@@ -52,8 +53,9 @@  discard block
 block discarded – undo
52 53
      */
53 54
     private function getUserRoleAdapter()
54 55
     {
55
-        if (!is_null($this->userRoleAdapter))
56
-            return $this->userRoleAdapter;
56
+        if (!is_null($this->userRoleAdapter)) {
57
+                    return $this->userRoleAdapter;
58
+        }
57 59
 
58 60
         $this->userRoleAdapter = new EntityAdapter(new TableGateway(new UserRole()));
59 61
 
@@ -65,8 +67,9 @@  discard block
 block discarded – undo
65 67
      */
66 68
     private function getDbUserRoleAdapter()
67 69
     {
68
-        if (!is_null($this->dbUserRoleAdapter))
69
-            return $this->dbUserRoleAdapter;
70
+        if (!is_null($this->dbUserRoleAdapter)) {
71
+                    return $this->dbUserRoleAdapter;
72
+        }
70 73
 
71 74
         $this->dbUserRoleAdapter = new EntityAdapter(new TableGateway(new DbUserRole()));
72 75
 
@@ -95,24 +98,27 @@  discard block
 block discarded – undo
95 98
          * $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
96 99
          * It should be an unique session id for the app to prevent bad redirections with other projects.
97 100
          */
98
-        if (array_key_exists("last_uri_" . $global_config["project"]["id"], $_SESSION) || !empty($_SESSION["last_uri_" . $global_config["project"]["id"]]))
99
-            $location = $_SESSION["last_uri_" . $global_config["project"]["id"]];
100
-        else
101
-            $location = $this->getBasePath() . "/public/" . $config["redirect"];
101
+        if (array_key_exists("last_uri_" . $global_config["project"]["id"], $_SESSION) || !empty($_SESSION["last_uri_" . $global_config["project"]["id"]])) {
102
+                    $location = $_SESSION["last_uri_" . $global_config["project"]["id"]];
103
+        } else {
104
+                    $location = $this->getBasePath() . "/public/" . $config["redirect"];
105
+        }
102 106
 
103 107
         switch ($method)
104 108
         {
105 109
             case '_COOKIE':
106 110
 
107
-                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key]))
108
-                    header("location: " . $location);
111
+                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key])) {
112
+                                    header("location: " . $location);
113
+                }
109 114
 
110 115
                 break;
111 116
 
112 117
             case '_SESSION':
113 118
 
114
-                if (array_key_exists($key, $_SESSION) || !empty($_SESSION[$key]))
115
-                    header("location: " . $location);
119
+                if (array_key_exists($key, $_SESSION) || !empty($_SESSION[$key])) {
120
+                                    header("location: " . $location);
121
+                }
116 122
 
117 123
                 break;
118 124
         }
@@ -241,14 +247,14 @@  discard block
 block discarded – undo
241 247
                                 $username_str => strtoupper($post["username"])
242 248
                             ]);
243 249
 
244
-                            if (!count($rowset))
245
-                                throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
250
+                            if (!count($rowset)) {
251
+                                                            throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
252
+                            }
246 253
                         }
247 254
 
248 255
                         $auth = new Authentication("default", false);
249 256
                         $result = $auth->authenticate($post["username"], $post["password"]);
250
-                    }
251
-                    catch (\Drone\Db\Driver\Exception\ConnectionException $e)
257
+                    } catch (\Drone\Db\Driver\Exception\ConnectionException $e)
252 258
                     {
253 259
                         throw new \Drone\Exception\Exception("Wrong user or password");
254 260
                     }
@@ -261,8 +267,9 @@  discard block
 block discarded – undo
261 267
                         $username_str => $post["username"]
262 268
                     ]);
263 269
 
264
-                    if (!count($rowset))
265
-                        throw new \Drone\Exception\Exception("Username or password are incorrect");
270
+                    if (!count($rowset)) {
271
+                                            throw new \Drone\Exception\Exception("Username or password are incorrect");
272
+                    }
266 273
 
267 274
                     $user = array_shift($rowset);
268 275
 
@@ -274,23 +281,26 @@  discard block
 block discarded – undo
274 281
                             $id_field => $user->{$id_field}
275 282
                         ]);
276 283
 
277
-                        if (!count($rowset))
278
-                            throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
284
+                        if (!count($rowset)) {
285
+                                                    throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
286
+                        }
279 287
                     }
280 288
 
281 289
                     $state_field = $config["authentication"]["gateway"]["table_info"]["columns"]["state_field"];
282 290
                     $state_pending_value = $config["authentication"]["gateway"]["table_info"]["column_values"]["state_field"]["pending_email"];
283 291
 
284
-                    if ($user->{$state_field} == $state_pending_value)
285
-                        throw new \Drone\Exception\Exception("User pending of email checking");
292
+                    if ($user->{$state_field} == $state_pending_value) {
293
+                                            throw new \Drone\Exception\Exception("User pending of email checking");
294
+                    }
286 295
 
287 296
                     $securePass = $user->{$password_str};
288 297
                     $password = $post["password"];
289 298
 
290 299
                     $bcrypt = new Bcrypt();
291 300
 
292
-                    if (!$bcrypt->verify($password, $securePass))
293
-                        throw new \Drone\Exception\Exception("Username or password are incorrect");
301
+                    if (!$bcrypt->verify($password, $securePass)) {
302
+                                            throw new \Drone\Exception\Exception("Username or password are incorrect");
303
+                    }
294 304
 
295 305
                     break;
296 306
 
@@ -315,14 +325,12 @@  discard block
 block discarded – undo
315 325
 
316 326
             # SUCCESS-MESSAGE
317 327
             $data["process"] = "success";
318
-        }
319
-        catch (\Drone\Exception\Exception $e)
328
+        } catch (\Drone\Exception\Exception $e)
320 329
         {
321 330
             # ERROR-MESSAGE
322 331
             $data["process"] = "warning";
323 332
             $data["message"] = $e->getMessage();
324
-        }
325
-        catch (\Exception $e)
333
+        } catch (\Exception $e)
326 334
         {
327 335
             $file = str_replace('\\', '', __CLASS__);
328 336
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -337,8 +345,9 @@  discard block
 block discarded – undo
337 345
             }
338 346
 
339 347
             # errors retrived by the use of ErrorTrait
340
-            if (count($this->getErrors()))
341
-                $this->handleErrors($this->getErrors(), __METHOD__);
348
+            if (count($this->getErrors())) {
349
+                            $this->handleErrors($this->getErrors(), __METHOD__);
350
+            }
342 351
 
343 352
             $data["code"]    = $errorCode;
344 353
             $data["message"] = $e->getMessage();
@@ -374,15 +383,16 @@  discard block
 block discarded – undo
374 383
             if (!$hd || !@fwrite($hd, $errorInformation))
375 384
             {
376 385
                 # error storing are not mandatory!
386
+            } else {
387
+                            @fclose($hd);
377 388
             }
378
-            else
379
-                @fclose($hd);
380 389
 
381 390
             $config = include 'config/application.config.php';
382 391
             $dev = $config["environment"]["dev_mode"];
383 392
 
384
-            if ($dev)
385
-                echo $errorInformation;
393
+            if ($dev) {
394
+                            echo $errorInformation;
395
+            }
386 396
         }
387 397
     }
388 398
 }
389 399
\ No newline at end of file
Please login to merge, or discard this patch.
module/Auth/source/Controller/SingUp.php 1 patch
Braces   +41 added lines, -34 removed lines patch added patch discarded remove patch
@@ -27,8 +27,9 @@  discard block
 block discarded – undo
27 27
      */
28 28
     private function getUserAdapter()
29 29
     {
30
-        if (!is_null($this->userAdapter))
31
-            return $this->userAdapter;
30
+        if (!is_null($this->userAdapter)) {
31
+                    return $this->userAdapter;
32
+        }
32 33
 
33 34
         $this->userAdapter = new EntityAdapter(new UserTbl(new User()));
34 35
 
@@ -57,24 +58,27 @@  discard block
 block discarded – undo
57 58
          * $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
58 59
          * It should be an unique session id for the app to prevent bad redirections with other projects.
59 60
          */
60
-        if (array_key_exists("last_uri_" . $global_config["project"]["id"], $_SESSION) || !empty($_SESSION["last_uri_" . $global_config["project"]["id"]]))
61
-            $location = $_SESSION["last_uri_" . $global_config["project"]["id"]];
62
-        else
63
-            $location = $this->getBasePath() . "/public/" . $config["redirect"];
61
+        if (array_key_exists("last_uri_" . $global_config["project"]["id"], $_SESSION) || !empty($_SESSION["last_uri_" . $global_config["project"]["id"]])) {
62
+                    $location = $_SESSION["last_uri_" . $global_config["project"]["id"]];
63
+        } else {
64
+                    $location = $this->getBasePath() . "/public/" . $config["redirect"];
65
+        }
64 66
 
65 67
         switch ($method)
66 68
         {
67 69
             case '_COOKIE':
68 70
 
69
-                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key]))
70
-                    header("location: " . $location);
71
+                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key])) {
72
+                                    header("location: " . $location);
73
+                }
71 74
 
72 75
                 break;
73 76
 
74 77
             case '_SESSION':
75 78
 
76
-                if (array_key_exists($key, $_SESSION) || !empty($_SESSION[$key]))
77
-                    header("location: " . $location);
79
+                if (array_key_exists($key, $_SESSION) || !empty($_SESSION[$key])) {
80
+                                    header("location: " . $location);
81
+                }
78 82
 
79 83
                 break;
80 84
         }
@@ -142,8 +146,9 @@  discard block
 block discarded – undo
142 146
 
143 147
             $this->checkSession();
144 148
 
145
-            if ($post["password"] !== $post["password_confirm"])
146
-                throw new \Drone\Exception\Exception("The password fields are different!", 300);
149
+            if ($post["password"] !== $post["password_confirm"]) {
150
+                            throw new \Drone\Exception\Exception("The password fields are different!", 300);
151
+            }
147 152
 
148 153
             $components = [
149 154
                 "attributes" => [
@@ -221,8 +226,9 @@  discard block
 block discarded – undo
221 226
                 $username_str => $post["username"]
222 227
             ]);
223 228
 
224
-            if (count($rowset))
225
-                throw new \Drone\Exception\Exception("This username already exists!", 300);
229
+            if (count($rowset)) {
230
+                            throw new \Drone\Exception\Exception("This username already exists!", 300);
231
+            }
226 232
 
227 233
             $bcrypt = new Bcrypt();
228 234
             $securePass = $bcrypt->create($post["password"]);
@@ -279,14 +285,12 @@  discard block
 block discarded – undo
279 285
 
280 286
             # SUCCESS-MESSAGE
281 287
             $data["process"] = "success";
282
-        }
283
-        catch (\Drone\Exception\Exception $e)
288
+        } catch (\Drone\Exception\Exception $e)
284 289
         {
285 290
             # ERROR-MESSAGE
286 291
             $data["process"] = "warning";
287 292
             $data["message"] = $e->getMessage();
288
-        }
289
-        catch (\Exception $e)
293
+        } catch (\Exception $e)
290 294
         {
291 295
             $file = str_replace('\\', '', __CLASS__);
292 296
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -301,8 +305,9 @@  discard block
 block discarded – undo
301 305
             }
302 306
 
303 307
             # errors retrived by the use of ErrorTrait
304
-            if (count($this->getErrors()))
305
-                $this->handleErrors($this->getErrors(), __METHOD__);
308
+            if (count($this->getErrors())) {
309
+                            $this->handleErrors($this->getErrors(), __METHOD__);
310
+            }
306 311
 
307 312
             $data["code"]    = $errorCode;
308 313
             $data["message"] = $e->getMessage();
@@ -370,13 +375,15 @@  discard block
 block discarded – undo
370 375
                 "TOKEN"       => $token
371 376
             ]);
372 377
 
373
-            if (!count($row))
374
-                throw new \Drone\Exception\Exception("Token has expired or username does not exists!.");
378
+            if (!count($row)) {
379
+                            throw new \Drone\Exception\Exception("Token has expired or username does not exists!.");
380
+            }
375 381
 
376 382
             $user = array_shift($row);
377 383
 
378
-            if ($user->{$state_field} <> $pending_state)
379
-                throw new \Drone\Exception\Exception("This email address had verified before!.", 300);
384
+            if ($user->{$state_field} <> $pending_state) {
385
+                            throw new \Drone\Exception\Exception("This email address had verified before!.", 300);
386
+            }
380 387
 
381 388
             $user->exchangeArray([
382 389
                 $state_field => $active_state
@@ -388,14 +395,12 @@  discard block
 block discarded – undo
388 395
 
389 396
             # SUCCESS-MESSAGE
390 397
             $data["process"] = "success";
391
-        }
392
-        catch (\Drone\Exception\Exception $e)
398
+        } catch (\Drone\Exception\Exception $e)
393 399
         {
394 400
             # ERROR-MESSAGE
395 401
             $data["process"] = "warning";
396 402
             $data["message"] = $e->getMessage();
397
-        }
398
-        catch (\Exception $e)
403
+        } catch (\Exception $e)
399 404
         {
400 405
             $file = str_replace('\\', '', __CLASS__);
401 406
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -410,8 +415,9 @@  discard block
 block discarded – undo
410 415
             }
411 416
 
412 417
             # errors retrived by the use of ErrorTrait
413
-            if (count($this->getErrors()))
414
-                $this->handleErrors($this->getErrors(), __METHOD__);
418
+            if (count($this->getErrors())) {
419
+                            $this->handleErrors($this->getErrors(), __METHOD__);
420
+            }
415 421
 
416 422
             $data["code"]    = $errorCode;
417 423
             $data["message"] = $e->getMessage();
@@ -447,15 +453,16 @@  discard block
 block discarded – undo
447 453
             if (!$hd || !@fwrite($hd, $errorInformation))
448 454
             {
449 455
                 # error storing are not mandatory!
456
+            } else {
457
+                            @fclose($hd);
450 458
             }
451
-            else
452
-                @fclose($hd);
453 459
 
454 460
             $config = include 'config/application.config.php';
455 461
             $dev = $config["environment"]["dev_mode"];
456 462
 
457
-            if ($dev)
458
-                echo $errorInformation;
463
+            if ($dev) {
464
+                            echo $errorInformation;
465
+            }
459 466
         }
460 467
     }
461 468
 }
462 469
\ No newline at end of file
Please login to merge, or discard this patch.
module/Auth/Module.php 1 patch
Braces   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -143,8 +143,7 @@  discard block
 block discarded – undo
143 143
                 $data["messages"] = $validator->getMessages();
144 144
                 throw new \Exception("Module config errros in user.config!", 300);
145 145
             }
146
-        }
147
-        catch (\Exception $e)
146
+        } catch (\Exception $e)
148 147
         {
149 148
             $file = str_replace('\\', '', __CLASS__);
150 149
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -175,10 +174,11 @@  discard block
 block discarded – undo
175 174
             $layoutManager->setParams($data);
176 175
 
177 176
             # for AJAX requests!
178
-            if ($c->isXmlHttpRequest())
179
-                $layoutManager->content();
180
-            else
181
-                $layoutManager->fromTemplate($this, 'blank');
177
+            if ($c->isXmlHttpRequest()) {
178
+                            $layoutManager->content();
179
+            } else {
180
+                            $layoutManager->fromTemplate($this, 'blank');
181
+            }
182 182
         }
183 183
     }
184 184
 
Please login to merge, or discard this patch.