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

Miscellaneous fixes, mostly undefined variables (#14432)

Browse Source 
* Miscellaneous fixes, mostly undefined variables

* Update phpstan-baseline.neon
This commit is contained in:
Jellyfrog
2022-10-11 11:30:00 +02:00
committed by GitHub
parent 071173ffb9
commit be1a2cec50
23 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LibreNMS/Config.php
View File

@@ -114,7 +114,9 @@ class Config
private static function loadUserConfigFile(&$config)
{
// Load user config file
@include base_path('config.php');
if (is_file(base_path('config.php'))) {
@include base_path('config.php');
}
}
/**
@@ -412,10 +414,10 @@ class Config
isset($_SERVER['HTTPS']) ||
(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
) {
self::set('base_url', preg_replace('/^http:/', 'https:', self::get('base_url')));
self::set('base_url', preg_replace('/^http:/', 'https:', self::get('base_url', '')));
}
self::set('base_url', Str::finish(self::get('base_url'), '/'));
self::set('base_url', Str::finish(self::get('base_url', ''), '/'));
if (! self::get('email_from')) {
self::set('email_from', '"' . self::get('project_name') . '" <' . self::get('email_user') . '@' . php_uname('n') . '>');