adjust spf-entry-regex; check for valid spf-entry in updater; set ver…

…sion to 2.1.0-rc2 Signed-off-by: Michael Kaufmann <[email protected]>
froxlor · Nov 11, 2023 · d52f33a · d52f33a
1 parent 287ad84
commit d52f33a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/actions/admin/settings/185.spf.php b/actions/admin/settings/185.spf.php
@@ -43,7 +43,7 @@
 					'settinggroup' => 'spf',
 					'varname' => 'spf_entry',
 					'type' => 'text',
-					'string_regexp' => '/^v=spf[a-z0-9:~?\s\.-]+$/i',
+					'string_regexp' => '/^v=spf[a-z0-9:~?\s.-]+$/i',
 					'default' => 'v=spf1 a mx -all',
 					'save_method' => 'storeSettingField'
 				]

diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php
@@ -391,7 +391,7 @@
 	('admin', 'show_version_footer', '0'),
 	('caa', 'caa_entry', ''),
 	('spf', 'use_spf', '0'),
-	('spf', 'spf_entry', '"v=spf1 a mx -all"'),
+	('spf', 'spf_entry', 'v=spf1 a mx -all'),
 	('dkim', 'dkim_algorithm', 'all'),
 	('dkim', 'dkim_keylength', '1024'),
 	('dkim', 'dkim_servicetype', '0'),
@@ -679,7 +679,7 @@
 	('system', 'distribution', ''),
 	('system', 'update_channel', 'stable'),
 	('system', 'updatecheck_data', ''),
-	('system', 'update_notify_last', '2.1.0-rc1'),
+	('system', 'update_notify_last', '2.1.0-rc2'),
 	('system', 'traffictool', 'goaccess'),
 	('system', 'req_limit_per_interval', 60),
 	('system', 'req_limit_interval', 60),
@@ -727,7 +727,7 @@
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
 	('panel', 'menu_collapsed', '1'),
-	('panel', 'version', '2.1.0-rc1'),
+	('panel', 'version', '2.1.0-rc2'),
 	('panel', 'db_version', '202305240');
 
 

diff --git a/install/updates/froxlor/update_2.1.inc.php b/install/updates/froxlor/update_2.1.inc.php
@@ -108,3 +108,18 @@
 	Update::showUpdateStep("Updating from 2.1.0-beta2 to 2.1.0-rc1", false);
 	Froxlor::updateToVersion('2.1.0-rc1');
 }
+
+if (Froxlor::isFroxlorVersion('2.1.0-rc1')) {
+	Update::showUpdateStep("Updating from 2.1.0-rc1 to 2.1.0-rc2", false);
+
+	Update::showUpdateStep("Adjusting setting spf_entry");
+	$spf_entry = Settings::Get('spf.spf_entry');
+	if (!preg_match('/^v=spf[a-z0-9:~?\s.-]+$/i', $spf_entry)) {
+		Settings::Set('spf.spf_entry', 'v=spf1 a mx -all');
+		Update::lastStepStatus(1, 'corrected');
+	} else {
+		Update::lastStepStatus(0);
+	}
+
+	Froxlor::updateToVersion('2.1.0-rc2');
+}
diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.1.0-rc1';
+	const VERSION = '2.1.0-rc2';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202305240';