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 (#12120)

Browse Source
This commit is contained in:
Jellyfrog
2020-09-21 15:40:17 +02:00
committed by GitHub
parent 77c531527c
commit 82f43cb98d
1733 changed files with 18337 additions and 18540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
includes/init.php
View File

@@ -32,21 +32,21 @@ use LibreNMS\Config;
global $vars, $console_color;
error_reporting(E_ERROR|E_PARSE|E_CORE_ERROR|E_COMPILE_ERROR);
error_reporting(E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR);
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
$install_dir = realpath(__DIR__ . '/..');
chdir($install_dir);
# composer autoload
if (!is_file($install_dir . '/vendor/autoload.php')) {
// composer autoload
if (! is_file($install_dir . '/vendor/autoload.php')) {
require_once $install_dir . '/includes/common.php';
c_echo("%RError: Missing dependencies%n, run: %B./scripts/composer_wrapper.php install --no-dev%n\n\n");
}
require_once $install_dir . '/vendor/autoload.php';
if (!function_exists('module_selected')) {
if (! function_exists('module_selected')) {
function module_selected($module, $modules)
{
return in_array($module, (array) $modules);
@@ -62,7 +62,7 @@ require_once $install_dir . '/includes/billing.php';
require_once $install_dir . '/includes/syslog.php';
if (module_selected('mocksnmp', $init_modules)) {
require_once $install_dir . '/tests/mocks/mock.snmp.inc.php';
} elseif (!in_array($install_dir . '/tests/mocks/mock.snmp.inc.php', get_included_files())) {
} elseif (! in_array($install_dir . '/tests/mocks/mock.snmp.inc.php', get_included_files())) {
require_once $install_dir . '/includes/snmp.inc.php';
}
require_once $install_dir . '/includes/services.inc.php';
@@ -94,13 +94,13 @@ if (module_selected('web', $init_modules)) {
set_debug(false); // disable debug initially (hides legacy errors too)
if (!module_selected('nodb', $init_modules)) {
if (! module_selected('nodb', $init_modules)) {
\LibreNMS\DB\Eloquent::boot();
if (!\LibreNMS\DB\Eloquent::isConnected()) {
if (! \LibreNMS\DB\Eloquent::isConnected()) {
echo "Could not connect to database, check logs/librenms.log.\n";
if (!extension_loaded('mysqlnd') || !extension_loaded('pdo_mysql')) {
if (! extension_loaded('mysqlnd') || ! extension_loaded('pdo_mysql')) {
echo "\nYour PHP is missing required mysql extension(s), please install and enable.\n";
echo "Check the install docs for more info: https://docs.librenms.org/Installation/\n";
}
@@ -114,14 +114,13 @@ $display_bak = ini_get('display_errors');
ini_set('display_errors', 1);
// Load config if not already loaded (which is the case if inside Laravel)
if (!Config::has('install_dir')) {
if (! Config::has('install_dir')) {
Config::load();
}
// set display_errors back
ini_set('display_errors', $display_bak);
if (is_numeric(Config::get('php_memory_limit')) && Config::get('php_memory_limit') > 128) {
ini_set('memory_limit', Config::get('php_memory_limit') . 'M');
}
@@ -134,11 +133,11 @@ try {
exit();
}
if (module_selected('discovery', $init_modules) && !\LibreNMS\Util\OS::updateCache(false)) {
if (module_selected('discovery', $init_modules) && ! \LibreNMS\Util\OS::updateCache(false)) {
// OS::loadAllDefinitions() is called by update_os_cache() if updated, no need to call twice
\LibreNMS\Util\OS::loadAllDefinitions(false, true);
} elseif (module_selected('web', $init_modules)) {
\LibreNMS\Util\OS::loadAllDefinitions(!module_selected('nodb', $init_modules), true);
\LibreNMS\Util\OS::loadAllDefinitions(! module_selected('nodb', $init_modules), true);
}
if (module_selected('web', $init_modules)) {