Merge remote-tracking branch 'origin/main' into v2.2

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

install/froxlor.sql.php

@@ -730,7 +730,7 @@ opcache.validate_timestamps'),
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
 	('panel', 'menu_collapsed', '1'),
-	('panel', 'version', '2.2.3'),
+	('panel', 'version', '2.2.4'),
 	('panel', 'db_version', '202409280');
 
 

install/updates/froxlor/update_2.2.inc.php

@@ -188,3 +188,8 @@ if (Froxlor::isFroxlorVersion('2.2.2')) {
 	Update::showUpdateStep("Updating from 2.2.2 to 2.2.3", false);
 	Froxlor::updateToVersion('2.2.3');
 }
+
+if (Froxlor::isFroxlorVersion('2.2.3')) {
+	Update::showUpdateStep("Updating from 2.2.3 to 2.2.4", false);
+	Froxlor::updateToVersion('2.2.4');
+}

lib/Froxlor/Cron/Mail/Rspamd.php

@@ -55,7 +55,7 @@ class Rspamd
 
 		// get all email addresses
 		$antispam_stmt = Database::prepare("
-			SELECT email, spam_tag_level, spam_kill_level, bypass_spam, policy_greylist, iscatchall
+			SELECT email, spam_tag_level, rewrite_subject, spam_kill_level, bypass_spam, policy_greylist, iscatchall
 			FROM `" . TABLE_MAIL_VIRTUAL . "`
 			ORDER BY email
 		");

lib/Froxlor/Froxlor.php

@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.2.3';
+	const VERSION = '2.2.4';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202409280';