@@ -25,10 +25,10 @@ |
||
| 25 | 25 | |
| 26 | 26 | namespace App\Http\Controllers\General; |
| 27 | 27 | |
| 28 | +use App\DataTables\General\ArpDataTable; |
|
| 28 | 29 | use App\DataTables\General\IPv4DataTable; |
| 29 | 30 | use App\DataTables\General\IPv6DataTable; |
| 30 | 31 | use App\DataTables\General\MacDataTable; |
| 31 | -use App\DataTables\General\ArpDataTable; |
|
| 32 | 32 | use App\Http\Controllers\Controller; |
| 33 | 33 | use Illuminate\Http\Request; |
| 34 | 34 | |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | if ($this->input('update') == 'password') { |
| 57 | 57 | $user_id = $this->input('user_id'); |
| 58 | 58 | $rules = ['password' => 'required|min:5|max:255', |
| 59 | - 'password_confirmation' => 'required|same:password', |
|
| 59 | + 'password_confirmation' => 'required|same:password', |
|
| 60 | 60 | ]; |
| 61 | 61 | if (!Auth::user()->isAdmin() || Auth::id() == $user_id) { |
| 62 | 62 | $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 | |