From 5328a4508134ce125dc22568dd2dec47af925531 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 14 Aug 2021 13:20:46 -0700
Subject: [PATCH] PHP INI file paths can be globs

---
 phpini/phpini-lib.pl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl
index 51835a3f8..a9ed54600 100755
--- a/phpini/phpini-lib.pl
+++ b/phpini/phpini-lib.pl
@@ -203,9 +203,10 @@ sub get_default_php_ini
 local @inis = split(/\t+/, $config{'php_ini'});
 foreach my $ai (@inis) {
 	local ($f, $d) = split(/=/, $ai);
-	return $f if (-r $f);
+	local @f = glob($f);
+	return $f[0] if (@f && -r $f[0]);
 	}
-if (-r $config{'alt_php_ini'} && @inis) {
+if ($config{'alt_php_ini'} && -r $config{'alt_php_ini'} && @inis) {
 	# Fall back to default file
 	local ($f) = split(/=/, $inis[0]);
 	&copy_source_dest($config{'alt_php_ini'}, $f);
@@ -223,12 +224,16 @@ local @rv;
 if ($access{'global'}) {
 	foreach my $ai (split(/\t+/, $config{'php_ini'})) {
 		local ($f, $d) = split(/=/, $ai);
-		push(@rv, [ $f, $d || $text{'file_global'} ]);
+		foreach my $gf (glob($f)) {
+			push(@rv, [ $gf, $d || $text{'file_global'} ]);
+			}
 		}
 	}
 foreach my $ai (split(/\t+/, $access{'php_inis'})) {
 	local ($f, $d) = split(/=/, $ai);
-	push(@rv, [ $f, $d || $f ]);
+	foreach my $gf (glob($f)) {
+		push(@rv, [ $gf, $d || $gf ]);
+		}
 	}
 foreach my $i (@rv) {
 	if (-d $i->[0] && -r "$i->[0]/php.ini") {