| @@ -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 | } | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | /** | 
| 42 | 42 | * @param AdminOnlyRequest $request | 
| 43 | 43 | * @param $user_id | 
| 44 | - * @return mixed | |
| 44 | + * @return \Illuminate\Http\RedirectResponse | |
| 45 | 45 | */ | 
| 46 | 46 | public function store(AdminOnlyRequest $request, $user_id) | 
| 47 | 47 |      { | 
| @@ -64,7 +64,7 @@ discard block | ||
| 64 | 64 | * @param AdminOnlyRequest $request | 
| 65 | 65 | * @param $user_id | 
| 66 | 66 | * @param $device_id | 
| 67 | - * @return mixed | |
| 67 | + * @return \Illuminate\Http\RedirectResponse | |
| 68 | 68 | */ | 
| 69 | 69 | public function destroy(AdminOnlyRequest $request, $user_id, $device_id) | 
| 70 | 70 |      { | 
| @@ -46,7 +46,7 @@ discard block | ||
| 46 | 46 | * @param AdminOnlyRequest $request | 
| 47 | 47 | * @param $user_id | 
| 48 | 48 | * @param $port_id | 
| 49 | - * @return mixed | |
| 49 | + * @return \Illuminate\Http\RedirectResponse | |
| 50 | 50 | */ | 
| 51 | 51 | public function store(AdminOnlyRequest $request, $user_id) | 
| 52 | 52 |      { | 
| @@ -69,7 +69,7 @@ discard block | ||
| 69 | 69 | * @param AdminOnlyRequest $request | 
| 70 | 70 | * @param $user_id | 
| 71 | 71 | * @param $port_id | 
| 72 | - * @return mixed | |
| 72 | + * @return \Illuminate\Http\RedirectResponse | |
| 73 | 73 | */ | 
| 74 | 74 | public function destroy(AdminOnlyRequest $request, $user_id, $port_id) | 
| 75 | 75 |      { | 
| @@ -21,7 +21,7 @@ | ||
| 21 | 21 | */ | 
| 22 | 22 | public function apply($query) | 
| 23 | 23 |      { | 
| 24 | -        return $query->whereHas('groups', function ($q) { | |
| 24 | +        return $query->whereHas('groups', function($q) { | |
| 25 | 25 |              $q->where('id', '=', $this->group_id); | 
| 26 | 26 | }); | 
| 27 | 27 | } | 
| @@ -38,6 +38,9 @@ | ||
| 38 | 38 |          return json_encode(self::generateMacroFilter('alert.macros.rule', self::generateTableFilter())); | 
| 39 | 39 | } | 
| 40 | 40 | |
| 41 | + /** | |
| 42 | + * @param string $setting | |
| 43 | + */ | |
| 41 | 44 | private static function generateMacroFilter($setting, $filter = []) | 
| 42 | 45 |      { | 
| 43 | 46 |          foreach (Settings::get($setting, []) as $key => $value) { | 
| @@ -62,7 +62,7 @@ | ||
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | 64 | // return the table filter merged with $filter, fetch from cache if available | 
| 65 | -        return array_merge($filter, Cache::rememberForever('query_builder_table_filter', function () { | |
| 65 | +        return array_merge($filter, Cache::rememberForever('query_builder_table_filter', function() { | |
| 66 | 66 | $tableFilter = []; | 
| 67 | 67 | $schema = DB::getDoctrineSchemaManager(); | 
| 68 | 68 | |
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | Route::group([ | 
| 55 | 55 | 'middleware' => 'web', | 
| 56 | 56 | 'namespace' => $this->namespace, | 
| 57 | -        ], function ($router) { | |
| 57 | +        ], function($router) { | |
| 58 | 58 |              require base_path('routes/web.php'); | 
| 59 | 59 | }); | 
| 60 | 60 | } | 
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | 'middleware' => ['api', 'jwt-auth'], | 
| 73 | 73 | 'namespace' => $this->namespace, | 
| 74 | 74 | 'prefix' => 'api', | 
| 75 | -        ], function ($router) { | |
| 75 | +        ], function($router) { | |
| 76 | 76 |              require base_path('routes/api.php'); | 
| 77 | 77 | }); | 
| 78 | 78 | } | 
| @@ -60,7 +60,6 @@ | ||
| 60 | 60 | /** | 
| 61 | 61 | * Display the alerts widget. | 
| 62 | 62 | * | 
| 63 | - * @param AlertsDataTable $dataTable | |
| 64 | 63 | * @param null $action | 
| 65 | 64 | * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View | 
| 66 | 65 | */ | 
| @@ -52,7 +52,8 @@ discard block | ||
| 52 | 52 |          if ($request->device_id) { | 
| 53 | 53 | return $EventlogDataTable->forDevice($request->device_id) | 
| 54 | 54 |                  ->render('widgets.eventlog', compact(['tableName', 'action'])); | 
| 55 | -        } else { | |
| 55 | + } | |
| 56 | +        else { | |
| 56 | 57 |              return $EventlogDataTable->render('widgets.eventlog', compact(['tableName', 'action'])); | 
| 57 | 58 | } | 
| 58 | 59 | } | 
| @@ -95,7 +96,8 @@ discard block | ||
| 95 | 96 |          $uptime = Settings::get('uptime_warning', 84600); | 
| 96 | 97 |          if ($request->user()->hasGlobalRead()) { | 
| 97 | 98 |              $devices = Device::where('ignore', '=', 0)->get(); | 
| 98 | -        } else { | |
| 99 | + } | |
| 100 | +        else { | |
| 99 | 101 |              $devices = User::find($request->user()->user_id)->devices()->where('ignore', '=', 0)->get(); | 
| 100 | 102 | } | 
| 101 | 103 | $count = ['warn' => 0, 'up' => 0, 'down' => 0]; | 
| @@ -103,10 +105,12 @@ discard block | ||
| 103 | 105 |              if ($device->status == 1) { | 
| 104 | 106 |                  if (($device->uptime < $uptime) && ($device->uptime != '0')) { | 
| 105 | 107 | $count['warn']++; | 
| 106 | -                } else { | |
| 108 | + } | |
| 109 | +                else { | |
| 107 | 110 | $count['up']++; | 
| 108 | 111 | } | 
| 109 | -            } else { | |
| 112 | + } | |
| 113 | +            else { | |
| 110 | 114 | $count['down']++; | 
| 111 | 115 | } | 
| 112 | 116 | } | 
| @@ -137,7 +141,8 @@ discard block | ||
| 137 | 141 | $count['ports']['down'] = Port::isDown()->count(); | 
| 138 | 142 | $count['ports']['ignored'] = Port::isIgnored()->count(); | 
| 139 | 143 | $count['ports']['disabled'] = Port::isDisabled()->count(); | 
| 140 | -        } else { | |
| 144 | + } | |
| 145 | +        else { | |
| 141 | 146 | $user = User::find($request->user()->user_id); | 
| 142 | 147 | |
| 143 | 148 | $count['devices']['total'] = $user->devices()->count(); | 
| @@ -213,11 +213,14 @@ | ||
| 213 | 213 | $disabled = $this->disabled; | 
| 214 | 214 |          if ($disabled == 1) { | 
| 215 | 215 | return 'teal'; | 
| 216 | -        } elseif ($ignore == 1) { | |
| 216 | + } | |
| 217 | +        elseif ($ignore == 1) { | |
| 217 | 218 | return 'yellow'; | 
| 218 | -        } elseif ($status == 0) { | |
| 219 | + } | |
| 220 | +        elseif ($status == 0) { | |
| 219 | 221 | return 'danger'; | 
| 220 | -        } else { | |
| 222 | + } | |
| 223 | +        else { | |
| 221 | 224 | return 'success'; | 
| 222 | 225 | } | 
| 223 | 226 | } | 
| @@ -150,7 +150,7 @@ | ||
| 150 | 150 |      { | 
| 151 | 151 | parent::boot(); | 
| 152 | 152 | |
| 153 | -        static::deleting(function (Device $device) { | |
| 153 | +        static::deleting(function(Device $device) { | |
| 154 | 154 | // delete related data | 
| 155 | 155 | $device->ports()->delete(); | 
| 156 | 156 | $device->syslogs()->delete(); | 
| @@ -33,7 +33,7 @@ | ||
| 33 | 33 |      { | 
| 34 | 34 |          if ($this->hasIDs()) { | 
| 35 | 35 | return [ | 
| 36 | -                'storage' => function (Builder $query) { | |
| 36 | +                'storage' => function(Builder $query) { | |
| 37 | 37 |                      $query->whereIn('storage_id', $this->getIDs()); | 
| 38 | 38 | }, | 
| 39 | 39 | ]; |