mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI (#12117)

Browse Source 
* Apply fixes from StyleCI

* Disable style check
This commit is contained in:
Jellyfrog
2020-09-21 14:54:51 +02:00
committed by GitHub
parent 8ec9183df5
commit 77c531527c
752 changed files with 6238 additions and 5833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/Http/Controllers/OverviewController.php
View File

@@ -2,8 +2,6 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\BgpPeer;
use App\Models\Dashboard;
use App\Models\Device;
@@ -14,6 +12,7 @@ use App\Models\UserPref;
use App\Models\UserWidget;
use App\Models\Widget;
use Auth;
use Illuminate\Http\Request;
use LibreNMS\Config;
use Toastr;
@@ -38,18 +37,16 @@ class OverviewController extends Controller
$dashboards = Dashboard::allAvailable($user)->with('user:user_id,username')->get()->keyBy('dashboard_id');
// Split dashboards into user owned or shared
list($user_dashboards, $shared_dashboards) = $dashboards->partition(function ($dashboard) use ($user) {
[$user_dashboards, $shared_dashboards] = $dashboards->partition(function ($dashboard) use ($user) {
return $dashboard->user_id == $user->user_id;
});
if (!empty($request->dashboard) && isset($dashboards[$request->dashboard])) {
if (! empty($request->dashboard) && isset($dashboards[$request->dashboard])) {
// specific dashboard
$dashboard = $dashboards[$request->dashboard];
} else {
$user_default_dash = (int)UserPref::getPref($user, 'dashboard');
$global_default = (int)Config::get('webui.default_dashboard_id');
$user_default_dash = (int) UserPref::getPref($user, 'dashboard');
$global_default = (int) Config::get('webui.default_dashboard_id');
// load user default
if (isset($dashboards[$user_default_dash])) {
@@ -58,21 +55,21 @@ class OverviewController extends Controller
} elseif (isset($dashboards[$global_default])) {
$dashboard = $dashboards[$global_default];
// load users first dashboard
} elseif (!empty($user_dashboards)) {
} elseif (! empty($user_dashboards)) {
$dashboard = $user_dashboards->first();
}
// specific dashboard was requested, but doesn't exist
if (isset($dashboard) && !empty($request->dashboard)) {
if (isset($dashboard) && ! empty($request->dashboard)) {
Toastr::error(
"Dashboard <code>#$request->dashboard</code> does not exist! Loaded <code>
".htmlentities($dashboard->dashboard_name)."</code> instead.",
" . htmlentities($dashboard->dashboard_name) . "</code> instead.",
"Requested Dashboard Not Found!"
);
}
}
if (!isset($dashboard)) {
if (! isset($dashboard)) {
$dashboard = Dashboard::create([
'dashboard_name' => 'Default',
'user_id' => $user->user_id,
@@ -81,28 +78,28 @@ class OverviewController extends Controller
$data = $dashboard
->widgets()
->select(['user_widget_id','users_widgets.widget_id','title','widget','col','row','size_x','size_y','refresh'])
->select(['user_widget_id', 'users_widgets.widget_id', 'title', 'widget', 'col', 'row', 'size_x', 'size_y', 'refresh'])
->join('widgets', 'widgets.widget_id', '=', 'users_widgets.widget_id')
->get();
if ($data->isEmpty()) {
$data[] = array('user_widget_id'=>'0',
'widget_id'=>1,
'title'=>'Add a widget',
'widget'=>'placeholder',
'col'=>1,
'row'=>1,
'size_x'=>6,
'size_y'=>2,
'refresh'=>60
);
$data[] = ['user_widget_id'=>'0',
'widget_id'=>1,
'title'=>'Add a widget',
'widget'=>'placeholder',
'col'=>1,
'row'=>1,
'size_x'=>6,
'size_y'=>2,
'refresh'=>60,
];
}
$bare = $request->bare;
$data = serialize(json_encode($data));
$dash_config = unserialize(stripslashes($data));
$bare = $request->bare;
$data = serialize(json_encode($data));
$dash_config = unserialize(stripslashes($data));
$hide_dashboard_editor = UserPref::getPref($user, 'hide_dashboard_editor');
$widgets = Widget::select('widget_id', 'widget_title')->orderBy('widget_title')->get();
$widgets = Widget::select('widget_id', 'widget_title')->orderBy('widget_title')->get();
return view('overview.default', compact('bare', 'dash_config', 'dashboard', 'hide_dashboard_editor', 'user_dashboards', 'shared_dashboards', 'widgets'));
}
@@ -134,7 +131,6 @@ class OverviewController extends Controller
->with('device')
->get();
// TODO: is inAlarm() equal to: bgpPeerAdminStatus != 'start' AND bgpPeerState != 'established' AND bgpPeerState != '' ?
if (Config::get('enable_bgp')) {
$bgp_down = BgpPeer::hasAccess(Auth::user())