From 661e8b7a9d09a8ec366e406abe584bc1c0a9f264 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Thu, 16 Oct 2025 18:16:17 +0100 Subject: [PATCH] * Thu Oct 16 2025 Brian Read 11.1-15.sme - Revert to 11.1-13 [SME: 13233] - Add "\" to escape @ in SQL script for db init [SME: 13233] --- .../e-smith/templates/etc/e-smith/sql/init/99mailstats | 6 +++--- .../share/smanager/lib/SrvMngr/Controller/Mailstats.pm | 10 ++++------ smeserver-mailstats.spec | 7 ++++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/99mailstats b/root/etc/e-smith/templates/etc/e-smith/sql/init/99mailstats index 5c2941a..80b36e1 100644 --- a/root/etc/e-smith/templates/etc/e-smith/sql/init/99mailstats +++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/99mailstats @@ -16,9 +16,9 @@ Hour INT, logData TEXT ); - CREATE USER {$user}@localhost IDENTIFIED BY '{$pass}'; - GRANT SELECT, INSERT, UPDATE, DELETE ON $db.* TO {$user}@localhost; + CREATE USER $user\@localhost IDENTIFIED BY '$pass'; + GRANT SELECT, INSERT, UPDATE, DELETE ON $db.* TO $user\@localhost; FLUSH PRIVILEGES; EOF END -} \ No newline at end of file +} diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Mailstats.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Mailstats.pm index 0e66609..eeaa841 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Mailstats.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Mailstats.pm @@ -236,8 +236,6 @@ sub do_display { my $modul = ""; # Accessing all parameters - - my %params = %{ $c->req->params->to_hash }; # Get number of parameters @@ -246,10 +244,10 @@ sub do_display { #Tag as Post or Get (ie. create new entry or edit existing one my $is_new_record = ($c->req->method() eq 'POST'); - Params are available in the hash "params" - copy to the prefix_data hash - while (my ($key, $value) = each %{$c->req->params->to_hash}) { - $mst_data{$key} = $value; - } + #Params are available in the hash "params" - copy to the prefix_data hash + #while (my ($key, $value) = each %{$c->req->params->to_hash}) { + # $mst_data{$key} = $value; + #} # the value of trt will tell you which panel has returned if (! $trt){ diff --git a/smeserver-mailstats.spec b/smeserver-mailstats.spec index d542791..143abd0 100644 --- a/smeserver-mailstats.spec +++ b/smeserver-mailstats.spec @@ -6,7 +6,7 @@ Summary: Daily mail statistics for SME Server %define name smeserver-mailstats Name: %{name} %define version 11.1 -%define release 14 +%define release 15 %define full_version %{version}.%{release}) Version: %{version} Release: %{release}%{?dist} @@ -88,8 +88,9 @@ chmod u+s /usr/bin/journalwrap /sbin/ldconfig %changelog -* Tue Oct 14 2025 Brian Read 11.1-14.sme -- Sort out perl variables in SQL init script [SME: 13233] +* Thu Oct 16 2025 Brian Read 11.1-15.sme +- Revert to 11.1-13 [SME: 13233] +- Add "\" to escape @ in SQL script for db init [SME: 13233] * Mon Oct 06 2025 Brian Read 11.1-13.sme - Add UTF8 and avoid potential DB caching problems [SME: 13209]