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

Show full path to ini file for timezone errors. (#11444)

Browse Source
This commit is contained in:
Tony Murray
2020-04-21 07:30:19 -05:00
committed by GitHub
parent 36e54ab9f1
commit cc60a76c7b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LibreNMS/Validations/Php.php
View File

@@ -145,17 +145,19 @@ class Php extends BaseValidation
); );
} elseif ($sh_tz !== $php_tz) { } elseif ($sh_tz !== $php_tz) {
// check if system timezone matches the timezone of the current running php // check if system timezone matches the timezone of the current running php
$ini_file = php_ini_loaded_file();
$validator->fail( $validator->fail(
"You have a different system timezone ($sh_tz) than the php configured timezone ($php_tz)", "You have a different system timezone ($sh_tz) than the php configured timezone ($php_tz)",
"Please correct either your system timezone or your timezone set in php.ini." "Please correct either your system timezone or your timezone set in $ini_file."
); );
} elseif ($php_tz !== $php_cli_tz) { } elseif ($php_tz !== $php_cli_tz) {
// check if web and cli timezones match (this does nothing if validate.php is run on cli) // check if web and cli timezones match (this does nothing if validate.php is run on cli)
// some distros have different php.ini for cli and the web server // some distros have different php.ini for cli and the web server
if ($sh_tz !== $php_cli_tz) { if ($sh_tz !== $php_cli_tz) {
$ini_file = rtrim(shell_exec('php -r "echo php_ini_loaded_file();"'));
$validator->fail( $validator->fail(
"The CLI php.ini ($php_cli_tz) timezone is different than your system's timezone ($sh_tz)", "The CLI php.ini ($php_cli_tz) timezone is different than your system's timezone ($sh_tz)",
"Edit your CLI php.ini file and set the correct timezone ($sh_tz)." "Edit your CLI ini file $ini_file and set the correct timezone ($sh_tz)."
); );
} }
} }