From fe241ea321982b4b7ee30cf6ea03e7e5c7a7b3e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 May 2020 21:49:12 +0200
Subject: [PATCH 1/2] Fix removed not reliabled info in PHP info

---
 htdocs/admin/system/phpinfo.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index ce21c1f3ad8..04439d11710 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -143,7 +143,7 @@ $loadedExtensions    = array_map('strtolower', get_loaded_extensions(false));
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="200">'.$langs->trans("Extension").'</td>';
-print '<td align="center">'.$langs->trans("EnabledInSetup").'</td>';
+//print '<td align="center">'.$langs->trans("EnabledInSetup").'</td>';
 print '<td align="center">'.$langs->trans("Loaded").'</td>';
 print '<td align="center">'.$langs->trans("FunctionTest").'</td>';
 print '<td>'.$langs->trans("Result").'</td>';
@@ -154,7 +154,7 @@ $name      = "GD";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $activatedExtensions);
+//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -165,7 +165,7 @@ $name      = "Curl";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $activatedExtensions);
+//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -178,7 +178,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 
 	print "<tr>";
 	print "<td>".$name."</td>";
-	print getTableColumn($name, $activatedExtensions);
+	//print getTableColumn($name, $activatedExtensions);
 	print getTableColumn($name, $loadedExtensions);
 	print getTableColumnFunction($functions);
 	print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -191,7 +191,7 @@ $name      = "xDebug";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $activatedExtensions);
+//print getTableColumn($name, $activatedExtensions);
 print getTableColumn($name, $loadedExtensions);
 print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -208,7 +208,6 @@ foreach ($phparray as $key => $value)
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder">';
 	print '<tr class="liste_titre">';
-	//print '<td width="220px">'.$langs->trans("Parameter").'</td>';
 	print '<td width="220px">'.$key.'</td>';
 	print '<td colspan="2">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
@@ -408,7 +407,7 @@ function getResultColumn($name, array $activated, array $loaded, array $function
 	global $langs;
 
 	$result = true;
-	$result = $result && in_array(strtolower($name), $activated);
+	//$result = $result && in_array(strtolower($name), $activated);
 	$result = $result && in_array(strtolower($name), $loaded);
 
 	foreach ($functions as $function)

From 310c5f9eb665ac0331f3b727c81bf65b668da569 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 May 2020 21:56:51 +0200
Subject: [PATCH 2/2] Fix size of field

---
 htdocs/install/mysql/migration/8.0.0-9.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index 61f4dc544ba..b7fe131c3f9 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -200,7 +200,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	fk_emailcollector INTEGER NOT NULL,
 	type varchar(128) NOT NULL,
-	rulevalue varchar(255) NULL,
+	rulevalue varchar(128) NULL,
 	date_creation datetime NOT NULL,
 	tms timestamp NOT NULL,
 	fk_user_creat integer NOT NULL,