From 99b3deda91922ac11c289be5e7332a75dfb2fd34 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Thu, 24 Oct 2024 12:11:39 +0200
Subject: [PATCH 1/3] fix editing email-address catchall-flag, fixes #1288

---
 lib/formfields/customer/email/formfield.emails_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formfields/customer/email/formfield.emails_edit.php b/lib/formfields/customer/email/formfield.emails_edit.php
index 2642c091f..925acb1af 100644
--- a/lib/formfields/customer/email/formfield.emails_edit.php
+++ b/lib/formfields/customer/email/formfield.emails_edit.php
@@ -89,7 +89,7 @@
 							]
 						]
 					],
-					'mail_catchall' => [
+					'iscatchall' => [
 						'visible' => Settings::Get('catchall.catchall_enabled') == '1',
 						'label' => lng('emails.catchall'),
 						'type' => 'checkbox',

From 103d321003b24a72a332b3458d553361858814d9 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Tue, 29 Oct 2024 13:36:31 +0100
Subject: [PATCH 2/3] do not use /var/run/nginx as directory for php-fpm
 sockets by default as it usually does not exist

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 lib/configfiles/bookworm.xml | 2 +-
 lib/configfiles/bullseye.xml | 2 +-
 lib/configfiles/focal.xml    | 2 +-
 lib/configfiles/jammy.xml    | 2 +-
 lib/configfiles/noble.xml    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/configfiles/bookworm.xml b/lib/configfiles/bookworm.xml
index 153ddd2dc..f60744fbc 100644
--- a/lib/configfiles/bookworm.xml
+++ b/lib/configfiles/bookworm.xml
@@ -16,7 +16,7 @@
 			<default for="nginx" settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/nginx/froxlor-htpasswd/"></default>
 			<default for="nginx" settinggroup="system" varname="apachereload_command" value="service nginx reload"></default>
 			<default for="nginx" settinggroup="system" varname="letsencryptacmeconf" value="/etc/nginx/acme.conf"></default>
-			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/nginx/"></default>
+			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/php/"></default>
 		</defaults>
 		<services>
 			<!-- HTTP -->
diff --git a/lib/configfiles/bullseye.xml b/lib/configfiles/bullseye.xml
index 984c4c895..062def863 100644
--- a/lib/configfiles/bullseye.xml
+++ b/lib/configfiles/bullseye.xml
@@ -16,7 +16,7 @@
 			<default for="nginx" settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/nginx/froxlor-htpasswd/"></default>
 			<default for="nginx" settinggroup="system" varname="apachereload_command" value="service nginx reload"></default>
 			<default for="nginx" settinggroup="system" varname="letsencryptacmeconf" value="/etc/nginx/acme.conf"></default>
-			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/nginx/"></default>
+			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/php/"></default>
 		</defaults>
 		<services>
 			<!-- HTTP -->
diff --git a/lib/configfiles/focal.xml b/lib/configfiles/focal.xml
index d6d2ce1cc..7054a2f30 100644
--- a/lib/configfiles/focal.xml
+++ b/lib/configfiles/focal.xml
@@ -16,7 +16,7 @@
 			<default for="nginx" settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/nginx/froxlor-htpasswd/"></default>
 			<default for="nginx" settinggroup="system" varname="apachereload_command" value="service nginx reload"></default>
 			<default for="nginx" settinggroup="system" varname="letsencryptacmeconf" value="/etc/nginx/acme.conf"></default>
-			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/nginx/"></default>
+			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/php/"></default>
 		</defaults>
 		<services>
 			<!-- HTTP -->
diff --git a/lib/configfiles/jammy.xml b/lib/configfiles/jammy.xml
index 028d60f1a..ace26c6b4 100644
--- a/lib/configfiles/jammy.xml
+++ b/lib/configfiles/jammy.xml
@@ -16,7 +16,7 @@
 			<default for="nginx" settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/nginx/froxlor-htpasswd/"></default>
 			<default for="nginx" settinggroup="system" varname="apachereload_command" value="service nginx reload"></default>
 			<default for="nginx" settinggroup="system" varname="letsencryptacmeconf" value="/etc/nginx/acme.conf"></default>
-			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/nginx/"></default>
+			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/php/"></default>
 		</defaults>
 		<services>
 			<!-- HTTP -->
diff --git a/lib/configfiles/noble.xml b/lib/configfiles/noble.xml
index 58726403e..9a7279927 100644
--- a/lib/configfiles/noble.xml
+++ b/lib/configfiles/noble.xml
@@ -16,7 +16,7 @@
 			<default for="nginx" settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/nginx/froxlor-htpasswd/"></default>
 			<default for="nginx" settinggroup="system" varname="apachereload_command" value="service nginx reload"></default>
 			<default for="nginx" settinggroup="system" varname="letsencryptacmeconf" value="/etc/nginx/acme.conf"></default>
-			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/nginx/"></default>
+			<default for="nginx" settinggroup="phpfpm" varname="fastcgi_ipcdir" value="/var/run/php/"></default>
 		</defaults>
 		<services>
 			<!-- HTTP -->

From ee986e519ed426e28a071b8a361e0d5b1434c7c9 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Tue, 29 Oct 2024 13:37:05 +0100
Subject: [PATCH 3/3] corrected wrong settings-index-name, fixes #1290

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 actions/admin/settings/130.webserver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php
index 84861fd9b..fd1494012 100644
--- a/actions/admin/settings/130.webserver.php
+++ b/actions/admin/settings/130.webserver.php
@@ -49,7 +49,7 @@
 					],
 					'requires_reconf' => ['http']
 				],
-				'system_apache_24' => [
+				'system_apache24' => [
 					'label' => lng('serversettings.apache_24'),
 					'settinggroup' => 'system',
 					'varname' => 'apache24',