mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Laravel 10.x Shift (#14995)
* Apply code style * Remove explicit call to register policies * Shift core files * Shift config files * Default config files In an effort to make upgrading the constantly changing config files easier, Shift defaulted them and merged your true customizations - where ENV variables may not be used. * Bump Laravel dependencies * Add type hints for Laravel 10 * Shift cleanup * wip * wip * sync translation * Sync back config * Public Path Binding * QueryException * monolog * db::raw * monolog * db::raw * fix larastan collections * fix phpstan bug looping forever * larastan errors * larastan: fix column type * styleci * initialize array * fixes * fixes --------- Co-authored-by: Shift <shift@laravelshift.com>
This commit is contained in:
@@ -83,7 +83,7 @@ class AlertDB
|
||||
//Our first table has no valid glue, append the 'devices' table to it!
|
||||
array_unshift($tables, 'devices');
|
||||
}
|
||||
$x = sizeof($tables) - 1;
|
||||
$x = count($tables) - 1;
|
||||
$i = 0;
|
||||
$join = '';
|
||||
while ($i < $x) {
|
||||
|
@@ -76,7 +76,7 @@ class AlertRules
|
||||
$qry[$i]['ip'] = inet6_ntop($qry[$i]['ip']);
|
||||
}
|
||||
}
|
||||
$s = sizeof($qry);
|
||||
$s = count($qry);
|
||||
if ($s == 0 && $inv === false) {
|
||||
$doalert = false;
|
||||
} elseif ($s > 0 && $inv === false) {
|
||||
|
@@ -300,8 +300,8 @@ class RunAlerts
|
||||
$chk[$i]['ip'] = inet6_ntop($chk[$i]['ip']);
|
||||
}
|
||||
}
|
||||
$o = sizeof($alert['details']['rule']);
|
||||
$n = sizeof($chk);
|
||||
$o = count($alert['details']['rule']);
|
||||
$n = count($chk);
|
||||
$ret = 'Alert #' . $alert['id'];
|
||||
$state = AlertState::CLEAR;
|
||||
if ($n > $o) {
|
||||
|
Reference in New Issue
Block a user