Fix chromephp firephp Syslog infinite loop.

When chromephp/firephp not found ->trans causes infinite loop. Can happen when files moved to other server or location.
Dolibarr · Jul 22, 2018 · b697307 · b697307
1 parent 2811381
commit b697307
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
@@ -121,13 +121,14 @@ public function checkConfiguration()
 
 		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.
 			{
-			    $errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
+				$errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
 			}
 			else
 			{
-		        $errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
+				$errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
 			}
 		}
 

diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
@@ -122,7 +122,15 @@ public function checkConfiguration()
 
 		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;