From 4922567a27f31f07171e09d660acb715cc0ef3a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Jan 2020 15:01:22 +0100
Subject: [PATCH 1/2] Add .noexec extension for old php4, php5... files

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7f5c3c351c7..add0dba599d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8499,7 +8499,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
  */
 function isAFileWithExecutableContent($filename)
 {
-    if (preg_match('/\.(htm|html|js|php|phtml|pl|py|cgi|ksh|sh|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
+    if (preg_match('/\.(htm|html|js|php|php\d+|phtml|pl|py|cgi|ksh|sh|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
     {
         return true;
     }

From fd02ed43174281c7e72ab362b672744951bff6cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Jan 2020 20:50:58 +0100
Subject: [PATCH 2/2] Fix label

---
 htdocs/product/list.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 6bf3beb6dde..9fc5eaa62d4 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -922,7 +922,10 @@ if ($resql)
 		// Type
 		if (!empty($arrayfields['p.fk_product_type']['checked']))
 		{
-			print '<td>'.$obj->fk_product_type.'</td>';
+			print '<td>';
+			if ($obj->fk_product_type == 0) print $langs->trans("Product");
+			else print $langs->trans("Service");
+			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}