@@ -229,17 +229,20 @@ |
||
| 229 | 229 | * @return boolean|\User\User |
| 230 | 230 | */ |
| 231 | 231 | public function get($idn, $ltype = 'id') { |
| 232 | - if (!$idn) |
|
| 233 | - return false; |
|
| 232 | + if (!$idn) { |
|
| 233 | + return false; |
|
| 234 | + } |
|
| 234 | 235 | |
| 235 | - if (is_numeric($idn) && $ltype != 'login') |
|
| 236 | - $user = Users\User::get($idn, 'id'); |
|
| 237 | - elseif ($ltype == 'login') |
|
| 238 | - $user = Users\User::get($idn, 'login'); |
|
| 239 | - else |
|
| 240 | - $user = Users\User::get($idn, 'mail'); |
|
| 241 | - if (!$user) |
|
| 242 | - return []; |
|
| 236 | + if (is_numeric($idn) && $ltype != 'login') { |
|
| 237 | + $user = Users\User::get($idn, 'id'); |
|
| 238 | + } elseif ($ltype == 'login') { |
|
| 239 | + $user = Users\User::get($idn, 'login'); |
|
| 240 | + } else { |
|
| 241 | + $user = Users\User::get($idn, 'mail'); |
|
| 242 | + } |
|
| 243 | + if (!$user) { |
|
| 244 | + return []; |
|
| 245 | + } |
|
| 243 | 246 | |
| 244 | 247 | return $user; |
| 245 | 248 | } |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return function ($step = NULL, $params = []) { |
|
| 3 | +return function ($step = null, $params = []) { |
|
| 4 | 4 | |
| 5 | 5 | }; |
@@ -49,8 +49,9 @@ |
||
| 49 | 49 | * @return array |
| 50 | 50 | */ |
| 51 | 51 | public static function get($clean = false) { |
| 52 | - if (empty($_SESSION['_INJI_MSG'])) |
|
| 53 | - return []; |
|
| 52 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
| 53 | + return []; |
|
| 54 | + } |
|
| 54 | 55 | $msgs = $_SESSION['_INJI_MSG']; |
| 55 | 56 | if ($clean) { |
| 56 | 57 | $_SESSION['_INJI_MSG'] = []; |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | -require_once( INJI_SYSTEM_DIR . '/init.php' ); |
|
| 40 | +require_once(INJI_SYSTEM_DIR . '/init.php'); |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * System error messages |