From bd9ef50e94bf8a02caff91762e06ead8e485a361 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 12 May 2016 09:47:36 +0200 Subject: [PATCH] correct SPF dns entry for new layout Signed-off-by: Michael Kaufmann (d00p) --- actions/admin/settings/185.spf.php | 2 +- install/froxlor.sql | 4 ++-- install/updates/froxlor/0.9/update_0.9.inc.php | 12 ++++++++++++ lib/version.inc.php | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/actions/admin/settings/185.spf.php b/actions/admin/settings/185.spf.php index c4d14cf5..55a44782 100644 --- a/actions/admin/settings/185.spf.php +++ b/actions/admin/settings/185.spf.php @@ -34,7 +34,7 @@ return array( 'settinggroup' => 'spf', 'varname' => 'spf_entry', 'type' => 'string', - 'default' => '@ IN TXT "v=spf1 a mx -all"', + 'default' => '"v=spf1 a mx -all"', 'save_method' => 'storeSettingField' ) ) diff --git a/install/froxlor.sql b/install/froxlor.sql index ad61eec2..8758e141 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -376,7 +376,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('admin', 'show_version_login', '0'), ('admin', 'show_version_footer', '0'), ('spf', 'use_spf', '0'), - ('spf', 'spf_entry', '@ IN TXT "v=spf1 a mx -all"'), + ('spf', 'spf_entry', '"v=spf1 a mx -all"'), ('dkim', 'dkim_algorithm', 'all'), ('dkim', 'dkim_add_adsp', '1'), ('dkim', 'dkim_keylength', '1024'), @@ -557,7 +557,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char', '!?<>ยง$%+#=@'), ('panel', 'version', '0.9.35.1'), - ('panel', 'db_version', '201605090'); + ('panel', 'db_version', '201605120'); DROP TABLE IF EXISTS `panel_tasks`; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 4af29fef..ef9dbe27 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -3335,3 +3335,15 @@ if (isFroxlorVersion('0.9.35.1') && isDatabaseVersion('201604270')) { updateToDbVersion('201605090'); } + +if (isFroxlorVersion('0.9.35.1') && isDatabaseVersion('201605090')) { + + showUpdateStep("Adjusting SPF record setting"); + $current_spf = Settings::Get('spf.spf_entry'); + // @ IN TXT "v=spf1 a mx -all" + $new_spf = substr($current_spf, strpos($current_spf, '"')); + Settings::Set('spf.spf_entry', $new_spf, true); + lastStepStatus(0); + + updateToDbVersion('201605120'); +} diff --git a/lib/version.inc.php b/lib/version.inc.php index 5bc79f20..bc203f9b 100644 --- a/lib/version.inc.php +++ b/lib/version.inc.php @@ -19,7 +19,7 @@ $version = '0.9.35.1'; // Database version (YYYYMMDDC where C is a daily counter) -$dbversion = '201605090'; +$dbversion = '201605120'; // Distribution branding-tag (used for Debian etc.) $branding = '';