@@ -21,7 +21,9 @@ |
||
| 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,9 @@ |
||
| 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,9 @@ |
||
| 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()) { |
|
| 25 | + Request::redirect(INSTALL_PATH . '/admin/register'); |
|
| 26 | + } |
|
| 25 | 27 | |
| 26 | 28 | return (new Auth\Action\Recover)->handle(); |
| 27 | 29 | } |
@@ -21,7 +21,9 @@ |
||
| 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()) { |
|
| 25 | + Request::redirect(INSTALL_PATH . '/admin/register'); |
|
| 26 | + } |
|
| 25 | 27 | |
| 26 | 28 | return (new Auth\Action\Reset)->handle(); |
| 27 | 29 | } |
@@ -21,7 +21,9 @@ |
||
| 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()) { |
|
| 25 | + Request::redirect(INSTALL_PATH . '/admin/register'); |
|
| 26 | + } |
|
| 25 | 27 | |
| 26 | 28 | return (new Auth\Action\Login)->handle(); |
| 27 | 29 | } |
@@ -21,7 +21,9 @@ |
||
| 21 | 21 | |
| 22 | 22 | public function handle() : Template\Block { |
| 23 | 23 | |
| 24 | - if (!Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/login'); |
|
| 24 | + if (!Auth::isInitial()) { |
|
| 25 | + Request::redirect(INSTALL_PATH . '/admin/login'); |
|
| 26 | + } |
|
| 25 | 27 | |
| 26 | 28 | return (new Auth\Action\Register)->handle(); |
| 27 | 29 | } |
@@ -29,19 +29,29 @@ |
||
| 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 | |
@@ -31,11 +31,15 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | # Set code |
| 33 | 33 | |
| 34 | - if (null !== $this->code) $contents->code = $this->code; |
|
| 34 | + if (null !== $this->code) { |
|
| 35 | + $contents->code = $this->code; |
|
| 36 | + } |
|
| 35 | 37 | |
| 36 | 38 | # Implement form |
| 37 | 39 | |
| 38 | - if (null !== $this->form) $this->form->implement($contents); |
|
| 40 | + if (null !== $this->form) { |
|
| 41 | + $this->form->implement($contents); |
|
| 42 | + } |
|
| 39 | 43 | |
| 40 | 44 | # ------------------------ |
| 41 | 45 | |
@@ -61,10 +65,12 @@ discard block |
||
| 61 | 65 | |
| 62 | 66 | # Display success message |
| 63 | 67 | |
| 64 | - foreach (static::$messages as $key => $message) if (Request::get('submitted') === $key) { |
|
| 68 | + foreach (static::$messages as $key => $message) { |
|
| 69 | + if (Request::get('submitted') === $key) { |
|
| 65 | 70 | |
| 66 | 71 | Messages::set('success', Language::get($message['text']), Language::get($message['title'])); |
| 67 | 72 | } |
| 73 | + } |
|
| 68 | 74 | |
| 69 | 75 | # ------------------------ |
| 70 | 76 | |
@@ -31,11 +31,15 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | # Check session code |
| 33 | 33 | |
| 34 | - if (!is_string($code = Session::get('code'))) return false; |
|
| 34 | + if (!is_string($code = Session::get('code'))) { |
|
| 35 | + return false; |
|
| 36 | + } |
|
| 35 | 37 | |
| 36 | 38 | # Authorize |
| 37 | 39 | |
| 38 | - if (false === ($result = Auth\Utils\Connector\Session::authorize($code, self::$admin))) return false; |
|
| 40 | + if (false === ($result = Auth\Utils\Connector\Session::authorize($code, self::$admin))) { |
|
| 41 | + return false; |
|
| 42 | + } |
|
| 39 | 43 | |
| 40 | 44 | # Update auth |
| 41 | 45 | |
@@ -62,7 +66,9 @@ discard block |
||
| 62 | 66 | |
| 63 | 67 | public static function logout() : bool { |
| 64 | 68 | |
| 65 | - if ((null === self::$user) || (0 === self::$user->id)) return false; |
|
| 69 | + if ((null === self::$user) || (0 === self::$user->id)) { |
|
| 70 | + return false; |
|
| 71 | + } |
|
| 66 | 72 | |
| 67 | 73 | # Remove auth entry from db |
| 68 | 74 | |
@@ -89,7 +95,9 @@ discard block |
||
| 89 | 95 | |
| 90 | 96 | DB::send("SHOW TABLE STATUS WHERE name LIKE '" . TABLE_USERS . "'"); |
| 91 | 97 | |
| 92 | - if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) return false; |
|
| 98 | + if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) { |
|
| 99 | + return false; |
|
| 100 | + } |
|
| 93 | 101 | |
| 94 | 102 | # ------------------------ |
| 95 | 103 | |