From 163a3afc0f84988fb2854eec2177572cc752c0b9 Mon Sep 17 00:00:00 2001 From: odain Date: Thu, 16 May 2024 15:27:40 +0200 Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B07426=20-=20no=20session=20created=20?= =?UTF-8?q?-=20replace=20php=5Fsapi=5Fname()=20by=20PHP=5FSAPI=20in=20unat?= =?UTF-8?q?tended?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup/unattended-install/unattended-install.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup/unattended-install/unattended-install.php b/setup/unattended-install/unattended-install.php index fdf1ca5e0..2ac9eafb7 100644 --- a/setup/unattended-install/unattended-install.php +++ b/setup/unattended-install/unattended-install.php @@ -25,7 +25,9 @@ EOF; exit(-1); } ///////////////////////////////////////////////// -if (! utils::IsModeCLI()) + +$sCleanName = strtolower(trim(PHP_SAPI)); +if ($sCleanName !== 'cli') { echo "Mode CLI only"; exit(-1); From 62caf161538f157d1cb0b810e0313d39e6e10e8e Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Tue, 21 May 2024 14:20:30 +0200 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B07364=20-=20Code=20hardening?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/simplegraph.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/simplegraph.class.inc.php b/core/simplegraph.class.inc.php index f0487480b..2e7f0c71e 100644 --- a/core/simplegraph.class.inc.php +++ b/core/simplegraph.class.inc.php @@ -537,7 +537,7 @@ EOF } else { - throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')'); + throw new Exception('graphviz not found'); } return $sHtml; } @@ -592,7 +592,7 @@ EOF } else { - throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')'); + throw new Exception('graphviz not found'); } return $sHtml; }