From 11a5c384761613e5f8d50b5ebff045ad13e1d03d Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 9 Oct 2024 15:32:57 +0200 Subject: [PATCH] use correct field-name in email-domain-overview; set version to 2.2.3 for upcoming bugfix release Signed-off-by: Michael Kaufmann --- install/froxlor.sql.php | 2 +- install/updates/froxlor/update_2.2.inc.php | 5 +++++ lib/Froxlor/Froxlor.php | 2 +- lib/tablelisting/customer/tablelisting.emails_overview.php | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index 185c9be07..fe2a101d3 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -730,7 +730,7 @@ ('panel', 'logo_overridecustom', '0'), ('panel', 'settings_mode', '0'), ('panel', 'menu_collapsed', '1'), - ('panel', 'version', '2.2.2'), + ('panel', 'version', '2.2.3'), ('panel', 'db_version', '202409280'); diff --git a/install/updates/froxlor/update_2.2.inc.php b/install/updates/froxlor/update_2.2.inc.php index bc4801133..ed3220b4e 100644 --- a/install/updates/froxlor/update_2.2.inc.php +++ b/install/updates/froxlor/update_2.2.inc.php @@ -183,3 +183,8 @@ Update::showUpdateStep("Updating from 2.2.1 to 2.2.2", false); Froxlor::updateToVersion('2.2.2'); } + +if (Froxlor::isFroxlorVersion('2.2.2')) { + Update::showUpdateStep("Updating from 2.2.2 to 2.2.3", false); + Froxlor::updateToVersion('2.2.3'); +} diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index c8ba73944..4c60d35e1 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -31,7 +31,7 @@ final class Froxlor { // Main version variable - const VERSION = '2.2.2'; + const VERSION = '2.2.3'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '202409280'; diff --git a/lib/tablelisting/customer/tablelisting.emails_overview.php b/lib/tablelisting/customer/tablelisting.emails_overview.php index 01de04ca1..1063fd0e8 100644 --- a/lib/tablelisting/customer/tablelisting.emails_overview.php +++ b/lib/tablelisting/customer/tablelisting.emails_overview.php @@ -56,7 +56,7 @@ ], ], 'visible_columns' => Listing::getVisibleColumnsForListing('emaildomain_list', [ - 'd.domain', + 'd.domain_ace', 'addresses', 'accounts', 'forwarder',