| @@ -55,7 +55,7 @@ | ||
| 55 | 55 |      { | 
| 56 | 56 |          if ($this->input('password')) { | 
| 57 | 57 | $rules = ['password' => 'required|min:5|max:255', | 
| 58 | - 'password_confirmation' => 'required|same:password', | |
| 58 | + 'password_confirmation' => 'required|same:password', | |
| 59 | 59 | ]; | 
| 60 | 60 |              if (!Auth::user()->isAdmin()) { | 
| 61 | 61 | $rules['current_password'] = 'required|password:user_id'; | 
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | /** | 
| 45 | 45 | * Update a notifications status. | 
| 46 | 46 | * | 
| 47 | - * @return \Illuminate\Http\Response | |
| 47 | + * @return \Illuminate\Http\JsonResponse | |
| 48 | 48 | */ | 
| 49 | 49 | public function update($id, $action) | 
| 50 | 50 |      { | 
| @@ -55,7 +55,7 @@ discard block | ||
| 55 | 55 | /** | 
| 56 | 56 | * Create a new notification | 
| 57 | 57 | * | 
| 58 | - * @return \Illuminate\Http\Response | |
| 58 | + * @return \Illuminate\Http\JsonResponse | |
| 59 | 59 | */ | 
| 60 | 60 | public function create(Request $request) | 
| 61 | 61 |      { | 
| @@ -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 |      { | 
| @@ -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 |      { | 
| @@ -82,7 +82,8 @@ discard block | ||
| 82 | 82 |          $uptime = Settings::get('uptime_warning', 84600); | 
| 83 | 83 |          if ($request->user()->hasGlobalRead()) { | 
| 84 | 84 |              $devices = Device::where('ignore', '=', 0)->get(); | 
| 85 | -        } else { | |
| 85 | + } | |
| 86 | +        else { | |
| 86 | 87 |              $devices = User::find($request->user()->user_id)->devices()->where('ignore', '=', 0)->get(); | 
| 87 | 88 | } | 
| 88 | 89 | $count = ['warn' => 0, 'up' => 0, 'down' => 0]; | 
| @@ -90,10 +91,12 @@ discard block | ||
| 90 | 91 |              if ($device->status == 1) { | 
| 91 | 92 |                  if (($device->uptime < $uptime) && ($device->uptime != '0')) { | 
| 92 | 93 | $count['warn']++; | 
| 93 | -                } else { | |
| 94 | + } | |
| 95 | +                else { | |
| 94 | 96 | $count['up']++; | 
| 95 | 97 | } | 
| 96 | -            } else { | |
| 98 | + } | |
| 99 | +            else { | |
| 97 | 100 | $count['down']++; | 
| 98 | 101 | } | 
| 99 | 102 | } | 
| @@ -122,7 +125,8 @@ discard block | ||
| 122 | 125 | $count['ports']['down'] = Port::isDown()->count(); | 
| 123 | 126 | $count['ports']['ignored'] = Port::isIgnored()->count(); | 
| 124 | 127 | $count['ports']['disabled'] = Port::isDisabled()->count(); | 
| 125 | -        } else { | |
| 128 | + } | |
| 129 | +        else { | |
| 126 | 130 | $user = User::find($request->user()->user_id); | 
| 127 | 131 | |
| 128 | 132 | $count['devices']['total'] = $user->devices()->count(); | 
| @@ -73,7 +73,7 @@ | ||
| 73 | 73 | */ | 
| 74 | 74 | public function show(Request $request, $id) | 
| 75 | 75 |      { | 
| 76 | - $widget = Widgets::find($id); | |
| 76 | + $widget = Widgets::find($id); | |
| 77 | 77 |          return array('widget' => $widget); | 
| 78 | 78 | } | 
| 79 | 79 | |
| @@ -25,7 +25,6 @@ | ||
| 25 | 25 | |
| 26 | 26 | namespace App\DataTables; | 
| 27 | 27 | |
| 28 | -use App\Models\DeviceGroup; | |
| 29 | 28 | use App\Models\Device; | 
| 30 | 29 | |
| 31 | 30 | class DeviceDataTable extends BaseDataTable | 
| @@ -3,7 +3,6 @@ | ||
| 3 | 3 | namespace App\Http\Controllers; | 
| 4 | 4 | |
| 5 | 5 | use App\DataTables\DeviceDataTable; | 
| 6 | -use App\DataTables\DeviceGroupDataTable; | |
| 7 | 6 | use App\Models\DeviceGroup; | 
| 8 | 7 | use Dingo\Api\Http; | 
| 9 | 8 | use Dingo\Api\Routing\Helpers; | 
| @@ -18,10 +18,10 @@ | ||
| 18 | 18 | * | 
| 19 | 19 | * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View | 
| 20 | 20 | */ | 
| 21 | - public function index(DeviceDataTable $dataTable, $group_id=-1) | |
| 21 | + public function index(DeviceDataTable $dataTable, $group_id = -1) | |
| 22 | 22 |      { | 
| 23 | 23 | $group_name = ""; | 
| 24 | -        if($group_id >= 0) { | |
| 24 | +        if ($group_id >= 0) { | |
| 25 | 25 | $dataTable->addScope(new \App\DataTables\Scopes\DeviceGroup($group_id)); | 
| 26 | 26 | $group_name = DeviceGroup::find($group_id)->name; | 
| 27 | 27 | } | 
| @@ -36,7 +36,7 @@ | ||
| 36 | 36 | /** | 
| 37 | 37 | * DeviceGroup constructor. | 
| 38 | 38 | * | 
| 39 | - * @param $group_id | |
| 39 | + * @param integer $group_id | |
| 40 | 40 | */ | 
| 41 | 41 | function __construct($group_id) | 
| 42 | 42 |      { |