@@ -6,9 +6,9 @@ |
||
6 | 6 | |
7 | 7 | class DbUserRole extends Entity |
8 | 8 | { |
9 | - /** |
|
10 | - * @var string |
|
11 | - */ |
|
9 | + /** |
|
10 | + * @var string |
|
11 | + */ |
|
12 | 12 | public $USERNAME; |
13 | 13 | |
14 | 14 | /** |
@@ -39,8 +39,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $http = new Http(); |
94 | 94 | $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED); |
95 | 95 | |
96 | - die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
96 | + die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $this->checkSession(); |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | $data = []; |
113 | 113 | |
114 | 114 | # environment settings |
115 | - $post = $this->getPost(); # catch $_POST |
|
116 | - $this->setTerminal(true); # set terminal |
|
115 | + $post = $this->getPost(); # catch $_POST |
|
116 | + $this->setTerminal(true); # set terminal |
|
117 | 117 | |
118 | 118 | # TRY-CATCH-BLOCK |
119 | 119 | try { |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | $http = new Http(); |
125 | 125 | $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED); |
126 | 126 | |
127 | - die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
127 | + die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | # STANDARD VALIDATIONS [check needed arguments] |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $http = new Http(); |
137 | 137 | $http->writeStatus($http::HTTP_BAD_REQUEST); |
138 | 138 | |
139 | - die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!'); |
|
139 | + die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!'); |
|
140 | 140 | } |
141 | 141 | }); |
142 | 142 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | |
248 | 248 | $this->getUserAdapter()->insert($user); |
249 | 249 | |
250 | - $link = $_SERVER["REQUEST_SCHEME"] .'://'. $_SERVER["HTTP_HOST"] . $this->getBasePath() . "/public/Auth/SingUp/verifyEmail/user/" . $post["username"] . "/token/" . $token; |
|
250 | + $link = $_SERVER["REQUEST_SCHEME"] . '://' . $_SERVER["HTTP_HOST"] . $this->getBasePath() . "/public/Auth/SingUp/verifyEmail/user/" . $post["username"] . "/token/" . $token; |
|
251 | 251 | |
252 | 252 | if ($data["mail"]) |
253 | 253 | { |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | $http = new Http(); |
339 | 339 | $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED); |
340 | 340 | |
341 | - die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
341 | + die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
342 | 342 | } |
343 | 343 | |
344 | 344 | # STANDARD VALIDATIONS [check needed arguments] |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | $http = new Http(); |
351 | 351 | $http->writeStatus($http::HTTP_BAD_REQUEST); |
352 | 352 | |
353 | - die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!'); |
|
353 | + die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!'); |
|
354 | 354 | } |
355 | 355 | }); |
356 | 356 | |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | foreach ($errors as $errno => $error) |
438 | 438 | { |
439 | 439 | $errorInformation .= |
440 | - "<strong style='color: #a94442'>". |
|
440 | + "<strong style='color: #a94442'>" . |
|
441 | 441 | $method |
442 | 442 | . "</strong>: <span style='color: #e24f4c'>{$error}</span> \n<br />"; |
443 | 443 | } |
@@ -27,8 +27,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -202,8 +202,8 @@ |
||
202 | 202 | $c->translator = new \Zend\Mvc\I18n\Translator($i18nTranslator); |
203 | 203 | } |
204 | 204 | |
205 | - public function getUserConfig() |
|
206 | - { |
|
207 | - return include __DIR__ . "/config/user.config.php"; |
|
208 | - } |
|
205 | + public function getUserConfig() |
|
206 | + { |
|
207 | + return include __DIR__ . "/config/user.config.php"; |
|
208 | + } |
|
209 | 209 | } |
210 | 210 | \ No newline at end of file |
@@ -143,8 +143,7 @@ discard block |
||
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 |
||
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 |
@@ -2,41 +2,41 @@ |
||
2 | 2 | |
3 | 3 | if (!function_exists('ifdef')) |
4 | 4 | { |
5 | - function ifdef($value, Array $array) |
|
6 | - { |
|
7 | - $global = __DIR__ . '/../../../config/global.config.php'; |
|
5 | + function ifdef($value, Array $array) |
|
6 | + { |
|
7 | + $global = __DIR__ . '/../../../config/global.config.php'; |
|
8 | 8 | |
9 | - if (file_exists($global)) |
|
10 | - { |
|
11 | - $key = array_shift($array); |
|
12 | - $in = include $global; |
|
9 | + if (file_exists($global)) |
|
10 | + { |
|
11 | + $key = array_shift($array); |
|
12 | + $in = include $global; |
|
13 | 13 | |
14 | - do |
|
15 | - { |
|
16 | - if (is_array($in)) |
|
17 | - { |
|
18 | - if (array_key_exists($key, $in)) |
|
19 | - $in = $in[$key]; |
|
20 | - else |
|
21 | - return $value; |
|
22 | - } |
|
23 | - else |
|
24 | - return $value; |
|
14 | + do |
|
15 | + { |
|
16 | + if (is_array($in)) |
|
17 | + { |
|
18 | + if (array_key_exists($key, $in)) |
|
19 | + $in = $in[$key]; |
|
20 | + else |
|
21 | + return $value; |
|
22 | + } |
|
23 | + else |
|
24 | + return $value; |
|
25 | 25 | |
26 | - $key = ($array) ? array_shift($array) : NULL; |
|
26 | + $key = ($array) ? array_shift($array) : NULL; |
|
27 | 27 | |
28 | - if (!$key) |
|
29 | - return $in; |
|
28 | + if (!$key) |
|
29 | + return $in; |
|
30 | 30 | |
31 | - } while($key); |
|
32 | - } |
|
33 | - else |
|
34 | - return $value; |
|
35 | - } |
|
31 | + } while($key); |
|
32 | + } |
|
33 | + else |
|
34 | + return $value; |
|
35 | + } |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | return [ |
39 | - 'project' => [ |
|
40 | - 'name' => ifdef('PROTOTYPE4', ["project", "name"]), # The name of your project |
|
41 | - ], |
|
39 | + 'project' => [ |
|
40 | + 'name' => ifdef('PROTOTYPE4', ["project", "name"]), # The name of your project |
|
41 | + ], |
|
42 | 42 | ]; |
43 | 43 | \ No newline at end of file |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | { |
5 | 5 | function ifdef($value, Array $array) |
6 | 6 | { |
7 | - $global = __DIR__ . '/../../../config/global.config.php'; |
|
7 | + $global = __DIR__ . '/../../../config/global.config.php'; |
|
8 | 8 | |
9 | 9 | if (file_exists($global)) |
10 | 10 | { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | if (!$key) |
29 | 29 | return $in; |
30 | 30 | |
31 | - } while($key); |
|
31 | + } while ($key); |
|
32 | 32 | } |
33 | 33 | else |
34 | 34 | return $value; |
@@ -37,6 +37,6 @@ discard block |
||
37 | 37 | |
38 | 38 | return [ |
39 | 39 | 'project' => [ |
40 | - 'name' => ifdef('PROTOTYPE4', ["project", "name"]), # The name of your project |
|
40 | + 'name' => ifdef('PROTOTYPE4', ["project", "name"]), # The name of your project |
|
41 | 41 | ], |
42 | 42 | ]; |
43 | 43 | \ No newline at end of file |
@@ -15,23 +15,25 @@ |
||
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 |
@@ -7,25 +7,25 @@ |
||
7 | 7 | |
8 | 8 | class Error extends AbstractionController |
9 | 9 | { |
10 | - public function notFound() |
|
11 | - { |
|
12 | - $this->setShowView(false); |
|
13 | - $this->setLayout('HTTP404'); |
|
10 | + public function notFound() |
|
11 | + { |
|
12 | + $this->setShowView(false); |
|
13 | + $this->setLayout('HTTP404'); |
|
14 | 14 | |
15 | 15 | $http = new Http(); |
16 | 16 | $http->writeStatus($http::HTTP_NOT_FOUND); |
17 | 17 | |
18 | - return []; |
|
19 | - } |
|
18 | + return []; |
|
19 | + } |
|
20 | 20 | |
21 | - public function notFoundView() |
|
22 | - { |
|
23 | - $this->setLayout('blank'); |
|
24 | - //$this->setTerminal(true); |
|
21 | + public function notFoundView() |
|
22 | + { |
|
23 | + $this->setLayout('blank'); |
|
24 | + //$this->setTerminal(true); |
|
25 | 25 | |
26 | 26 | $http = new Http(); |
27 | 27 | $http->writeStatus($http::HTTP_NOT_FOUND); |
28 | 28 | |
29 | - return []; |
|
30 | - } |
|
29 | + return []; |
|
30 | + } |
|
31 | 31 | } |
32 | 32 | \ No newline at end of file |
@@ -2,21 +2,21 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | 'project' => [ |
5 | - 'id' => 'id6447896', # Unique ID for the project |
|
6 | - 'name' => 'SQLWebManager' # The name of your project |
|
5 | + 'id' => 'id6447896', # Unique ID for the project |
|
6 | + 'name' => 'SQLWebManager' # The name of your project |
|
7 | 7 | ], |
8 | - 'mail' => [ |
|
9 | - "noreply" => "", |
|
10 | - "host" => "" |
|
11 | - ], |
|
12 | - "authentication" => [ |
|
13 | - "method" => "_COOKIE", # the method to store credentials (_COOKIE, _SESSION) |
|
14 | - "key" => "session_id6448654", # the key in the array to store credentials |
|
15 | - ], |
|
16 | - "database" => [ |
|
17 | - /** TABLE PREFIX: |
|
18 | - * Database prefix of tables, specifically here, the prefix of entity gateway above. |
|
19 | - */ |
|
20 | - "prefix" => "SWM" |
|
21 | - ] |
|
8 | + 'mail' => [ |
|
9 | + "noreply" => "", |
|
10 | + "host" => "" |
|
11 | + ], |
|
12 | + "authentication" => [ |
|
13 | + "method" => "_COOKIE", # the method to store credentials (_COOKIE, _SESSION) |
|
14 | + "key" => "session_id6448654", # the key in the array to store credentials |
|
15 | + ], |
|
16 | + "database" => [ |
|
17 | + /** TABLE PREFIX: |
|
18 | + * Database prefix of tables, specifically here, the prefix of entity gateway above. |
|
19 | + */ |
|
20 | + "prefix" => "SWM" |
|
21 | + ] |
|
22 | 22 | ]; |
23 | 23 | \ No newline at end of file |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | 'project' => [ |
5 | - 'id' => 'id6447896', # Unique ID for the project |
|
5 | + 'id' => 'id6447896', # Unique ID for the project |
|
6 | 6 | 'name' => 'SQLWebManager' # The name of your project |
7 | 7 | ], |
8 | 8 | 'mail' => [ |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | "host" => "" |
11 | 11 | ], |
12 | 12 | "authentication" => [ |
13 | - "method" => "_COOKIE", # the method to store credentials (_COOKIE, _SESSION) |
|
14 | - "key" => "session_id6448654", # the key in the array to store credentials |
|
13 | + "method" => "_COOKIE", # the method to store credentials (_COOKIE, _SESSION) |
|
14 | + "key" => "session_id6448654", # the key in the array to store credentials |
|
15 | 15 | ], |
16 | 16 | "database" => [ |
17 | 17 | /** TABLE PREFIX: |
@@ -13,9 +13,9 @@ |
||
13 | 13 | |
14 | 14 | try |
15 | 15 | { |
16 | - $config = include "config/application.config.php"; |
|
17 | - $mvc = new Drone\Mvc\Application($config); |
|
18 | - $mvc->run(); |
|
16 | + $config = include "config/application.config.php"; |
|
17 | + $mvc = new Drone\Mvc\Application($config); |
|
18 | + $mvc->run(); |
|
19 | 19 | } |
20 | 20 | # to load only the error view |
21 | 21 | catch (Drone\Mvc\Exception\ViewNotFoundException $e) |