Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop

Browse Source 
Fix chromephp firephp Syslog infinite loop
This commit is contained in:
Laurent Destailleur
2018-07-24 16:53:32 +02:00
committed by GitHub
parent aa5319fc4d b697307bac
commit 3e54ee5df7
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/syslog/mod_syslog_chromephp.php
View File

@@ -121,13 +121,14 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php')) if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
{ {
$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
if (is_object($langs)) // $langs may not be defined yet. if (is_object($langs)) // $langs may not be defined yet.
{ {
$errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php'); $errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
} }
else else
{ {
$errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php"; $errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
} }
} }

10
htdocs/core/modules/syslog/mod_syslog_firephp.php
View File

@@ -122,7 +122,15 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH . self::$firephp_class_path)) if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH . self::$firephp_class_path))
{ {
$errors[] = $langs->trans("ErrorFailedToOpenFile", self::$firephp_class_path); $conf->global->MAIN_SYSLOG_DISABLE_FIREPHP = 1; // avoid infinite loop
if (is_object($langs)) // $langs may not be defined yet.
{
$errors[] = $langs->trans("ErrorFailedToOpenFile", self::$firephp_class_path);
}
else
{
$errors[] = "ErrorFailedToOpenFile " . self::$firephp_class_path;
}
} }
return $errors; return $errors;