From 0a72aed3d7b1af170901a08fda85e10d648d43f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Dec 2021 13:35:38 +0100
Subject: [PATCH 1/2] Fix missing space before union

---
 htdocs/expensereport/class/expensereport.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index b9e60ed50d5..14d3c8fc178 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2123,7 +2123,7 @@ class ExpenseReport extends CommonObject
         $sql = "SELECT DISTINCT ur.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
         $sql.= " WHERE ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'";                                              // Permission 'Approve';
-        $sql.= "UNION";
+        $sql.= " UNION";
         $sql.= " SELECT DISTINCT ugu.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
         $sql.= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'";       // Permission 'Approve';

From 10e32c056ec3d7c5b35bd75c3405edcfa46a798b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Jan 2022 15:35:33 +0100
Subject: [PATCH 2/2] FIX avoid infinite loop on dump with popen

---
 htdocs/core/class/utils.class.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 37ccea748f1..58c1179e1c0 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -291,18 +291,20 @@ class Utils
 				$ok=0;
 				dol_syslog("Run command ".$fullcommandcrypted);
 				$handlein = popen($fullcommandclear, 'r');
-				$i=0;
-				while (!feof($handlein))
-				{
-					$i++;   // output line number
-					$read = fgets($handlein);
-					// Exclude warning line we don't want
-					if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-					fwrite($handle,$read);
-					if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-					elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+				if ($handlein) {
+					$i=0;
+					while (!feof($handlein))
+					{
+						$i++;   // output line number
+						$read = fgets($handlein);
+						// Exclude warning line we don't want
+						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+						fwrite($handle,$read);
+						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+					}
+					pclose($handlein);
 				}
-				pclose($handlein);
 
 				if ($compression == 'none') fclose($handle);
 				if ($compression == 'gz')   gzclose($handle);