@@ -20,7 +20,8 @@ |
||
| 20 | 20 | if (Auth::guard($guard)->guest()) { |
| 21 | 21 | if ($request->ajax() || $request->wantsJson()) { |
| 22 | 22 | return response('Unauthorized.', 401); |
| 23 | - } else { |
|
| 23 | + } |
|
| 24 | + else { |
|
| 24 | 25 | return redirect()->guest('login'); |
| 25 | 26 | } |
| 26 | 27 | } |
@@ -20,7 +20,8 @@ |
||
| 20 | 20 | if (Auth::guard($guard)->guest()) { |
| 21 | 21 | if ($request->ajax() || $request->wantsJson()) { |
| 22 | 22 | return response('Unauthorized.', 401); |
| 23 | - } else { |
|
| 23 | + } |
|
| 24 | + else { |
|
| 24 | 25 | return redirect()->guest('login'); |
| 25 | 26 | } |
| 26 | 27 | } |
@@ -54,14 +54,16 @@ discard block |
||
| 54 | 54 | // set realname |
| 55 | 55 | if ($this->option('realname')) { |
| 56 | 56 | $user->realname = $this->option('realname'); |
| 57 | - } else { |
|
| 57 | + } |
|
| 58 | + else { |
|
| 58 | 59 | $user->realname = $this->ask('Real Name'); |
| 59 | 60 | } |
| 60 | 61 | |
| 61 | 62 | // set email |
| 62 | 63 | if ($this->option('email')) { |
| 63 | 64 | $user->email = $this->option('email'); |
| 64 | - } else { |
|
| 65 | + } |
|
| 66 | + else { |
|
| 65 | 67 | $user->email = $this->ask('Email'); |
| 66 | 68 | } |
| 67 | 69 | |
@@ -77,14 +79,16 @@ discard block |
||
| 77 | 79 | // set password |
| 78 | 80 | if ($this->argument('password')) { |
| 79 | 81 | $user->password = $this->argument('password'); |
| 80 | - } else { |
|
| 82 | + } |
|
| 83 | + else { |
|
| 81 | 84 | $user->password = $this->secret('Password'); |
| 82 | 85 | } |
| 83 | 86 | |
| 84 | 87 | // save user |
| 85 | 88 | if ($user->save()) { |
| 86 | 89 | $this->info('User '.$user->username.' created.'); |
| 87 | - } else { |
|
| 90 | + } |
|
| 91 | + else { |
|
| 88 | 92 | $this->error('Failed to create user '.$user->username); |
| 89 | 93 | } |
| 90 | 94 | } |
@@ -197,7 +197,8 @@ discard block |
||
| 197 | 197 | $icon = $this->icon; |
| 198 | 198 | if (isset($icon)) { |
| 199 | 199 | return asset('images/os/'.$icon.'.png'); |
| 200 | - } else { |
|
| 200 | + } |
|
| 201 | + else { |
|
| 201 | 202 | return asset('images/os/generic.png'); |
| 202 | 203 | } |
| 203 | 204 | } |
@@ -212,11 +213,14 @@ discard block |
||
| 212 | 213 | $disabled = $this->disabled; |
| 213 | 214 | if ($disabled == 1) { |
| 214 | 215 | return 'teal'; |
| 215 | - } elseif ($ignore == 1) { |
|
| 216 | + } |
|
| 217 | + elseif ($ignore == 1) { |
|
| 216 | 218 | return 'yellow'; |
| 217 | - } elseif ($status == 0) { |
|
| 219 | + } |
|
| 220 | + elseif ($status == 0) { |
|
| 218 | 221 | return 'danger'; |
| 219 | - } else { |
|
| 222 | + } |
|
| 223 | + else { |
|
| 220 | 224 | return 'success'; |
| 221 | 225 | } |
| 222 | 226 | } |
@@ -46,7 +46,8 @@ discard block |
||
| 46 | 46 | ->editColumn('rule.name', function ($log) { |
| 47 | 47 | if ($log->rule_id) { |
| 48 | 48 | return '<a href="'.url("alerting/rules/".$log->rule_id).'">'.$log->rule->name.'</a>'; |
| 49 | - } else { |
|
| 49 | + } |
|
| 50 | + else { |
|
| 50 | 51 | return trans('alerting.general.text.invalid'); |
| 51 | 52 | } |
| 52 | 53 | }) |
@@ -58,19 +59,23 @@ discard block |
||
| 58 | 59 | $icon = 'check'; |
| 59 | 60 | $colour = 'green'; |
| 60 | 61 | $text = trans('alerting.logs.text.ok'); |
| 61 | - } elseif ($log->state == 1) { |
|
| 62 | + } |
|
| 63 | + elseif ($log->state == 1) { |
|
| 62 | 64 | $icon = 'times'; |
| 63 | 65 | $colour = 'red'; |
| 64 | 66 | $text = trans('alerting.logs.text.fail'); |
| 65 | - } elseif ($log->state == 2) { |
|
| 67 | + } |
|
| 68 | + elseif ($log->state == 2) { |
|
| 66 | 69 | $icon = 'volume-off'; |
| 67 | 70 | $colour = 'lightgrey'; |
| 68 | 71 | $text = trans('alerting.logs.text.ack'); |
| 69 | - } elseif ($log->state == 3) { |
|
| 72 | + } |
|
| 73 | + elseif ($log->state == 3) { |
|
| 70 | 74 | $icon = 'arrow-down'; |
| 71 | 75 | $colour = 'orange'; |
| 72 | 76 | $text = trans('alerting.logs.text.worse'); |
| 73 | - } elseif ($log->state == 4) { |
|
| 77 | + } |
|
| 78 | + elseif ($log->state == 4) { |
|
| 74 | 79 | $icon = 'arrow-up'; |
| 75 | 80 | $colour = 'khaki'; |
| 76 | 81 | $text = trans('alerting.logs.text.better'); |
@@ -102,7 +102,8 @@ |
||
| 102 | 102 | } catch(\Exception $e) { |
| 103 | 103 | if(starts_with($e->getMessage(), 'unserialize():')) { |
| 104 | 104 | return $value; |
| 105 | - } else { |
|
| 105 | + } |
|
| 106 | + else { |
|
| 106 | 107 | throw $e; |
| 107 | 108 | } |
| 108 | 109 | } |
@@ -102,7 +102,8 @@ |
||
| 102 | 102 | } catch(\Exception $e) { |
| 103 | 103 | if(starts_with($e->getMessage(), 'unserialize():')) { |
| 104 | 104 | return $value; |
| 105 | - } else { |
|
| 105 | + } |
|
| 106 | + else { |
|
| 106 | 107 | throw $e; |
| 107 | 108 | } |
| 108 | 109 | } |
@@ -54,14 +54,16 @@ discard block |
||
| 54 | 54 | // set realname |
| 55 | 55 | if ($this->option('realname')) { |
| 56 | 56 | $user->realname = $this->option('realname'); |
| 57 | - } else { |
|
| 57 | + } |
|
| 58 | + else { |
|
| 58 | 59 | $user->realname = $this->ask('Real Name'); |
| 59 | 60 | } |
| 60 | 61 | |
| 61 | 62 | // set email |
| 62 | 63 | if ($this->option('email')) { |
| 63 | 64 | $user->email = $this->option('email'); |
| 64 | - } else { |
|
| 65 | + } |
|
| 66 | + else { |
|
| 65 | 67 | $user->email = $this->ask('Email'); |
| 66 | 68 | } |
| 67 | 69 | |
@@ -77,14 +79,16 @@ discard block |
||
| 77 | 79 | // set password |
| 78 | 80 | if ($this->argument('password')) { |
| 79 | 81 | $user->password = $this->argument('password'); |
| 80 | - } else { |
|
| 82 | + } |
|
| 83 | + else { |
|
| 81 | 84 | $user->password = $this->secret('Password'); |
| 82 | 85 | } |
| 83 | 86 | |
| 84 | 87 | // save user |
| 85 | 88 | if ($user->save()) { |
| 86 | 89 | $this->info('User '.$user->username.' created.'); |
| 87 | - } else { |
|
| 90 | + } |
|
| 91 | + else { |
|
| 88 | 92 | $this->error('Failed to create user '.$user->username); |
| 89 | 93 | } |
| 90 | 94 | } |
@@ -23,7 +23,8 @@ discard block |
||
| 23 | 23 | $per_page = $request->per_page ?: 25; |
| 24 | 24 | if ($request->user()->hasGlobalRead()) { |
| 25 | 25 | $devices = Device::paginate($per_page); |
| 26 | - } else { |
|
| 26 | + } |
|
| 27 | + else { |
|
| 27 | 28 | $devices = User::find($request->user()->user_id)->devices()->paginate($per_page); |
| 28 | 29 | } |
| 29 | 30 | return $devices; |
@@ -60,7 +61,8 @@ discard block |
||
| 60 | 61 | { |
| 61 | 62 | if ($request->user()->hasGlobalRead()) { |
| 62 | 63 | $device = Device::find($id); |
| 63 | - } else { |
|
| 64 | + } |
|
| 65 | + else { |
|
| 64 | 66 | $user = User::find($request->user()->user_id); |
| 65 | 67 | $device = $user->devices()->find($id); |
| 66 | 68 | } |