smecontribs/smeserver-mailstats
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mon Oct 06 2025 Brian Read <brianr@koozali.org> 11.1-13.sme

Browse Source 
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
This commit is contained in:
Brian Read
2025-10-06 10:59:27 +01:00
parent b98d6d4e20
commit 93395e10d9
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
root/usr/share/smanager/lib/SrvMngr/Controller/Mailstats-Custom.pm
View File

@@ -7,11 +7,11 @@
# #
use esmith::util; use esmith::util;
use esmith::util::network; use esmith::util::network;
use esmith::ConfigDB; use esmith::ConfigDB::UTF8;
use esmith::HostsDB; use esmith::HostsDB::UTF8;
use esmith::AccountsDB; use esmith::AccountsDB::UTF8;
use esmith::NetworksDB; use esmith::NetworksDB;
use esmith::DomainsDB; use esmith::DomainsDB::UTF8;
use POSIX 'strftime'; use POSIX 'strftime';
@@ -96,7 +96,7 @@ use constant TRUE => 1;
sub get_data_for_panel_CONFIG { sub get_data_for_panel_CONFIG {
# Return a hash with the fields required which will be loaded into the shared data # Return a hash with the fields required which will be loaded into the shared data
my $c = shift; my $c = shift;
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
my $key = 'mailstats'; my $key = 'mailstats';
my %ret = ( my %ret = (
'Data1'=>'Data for CONFIG', #Example 'Data1'=>'Data for CONFIG', #Example
@@ -171,7 +171,7 @@ use constant TRUE => 1;
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
my $db = $cdb; #maybe one of the others my $db = $cdb; #maybe one of the others
my $dbkey = 'mailstats'; my $dbkey = 'mailstats';
# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g." # To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."

36
root/usr/share/smanager/lib/SrvMngr/Controller/Mailstats.pm
View File

@@ -36,11 +36,11 @@ use Data::Dumper;
use esmith::util; use esmith::util;
use esmith::util::network; use esmith::util::network;
use esmith::ConfigDB; use esmith::ConfigDB::UTF8;
use esmith::AccountsDB; use esmith::AccountsDB::UTF8;
use esmith::NetworksDB; use esmith::NetworksDB;
use esmith::HostsDB; use esmith::HostsDB::UTF8;
use esmith::DomainsDB; use esmith::DomainsDB::UTF8;
my $cdb; my $cdb;
my $adb; my $adb;
@@ -66,11 +66,11 @@ sub main {
$c->app->log->info( $c->log_req ); $c->app->log->info( $c->log_req );
#The most common ones #The most common ones
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
$adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); $adb = esmith::AccountsDB::UTF8->open() || die("Couldn't open Accounts db");
$ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
$hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); $hdb = esmith::HostsDB::UTF8->open() || die("Couldn't open Hosts db");
$ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); $ddb = esmith::DomainsDB::UTF8->open() || die("Couldn't open Domains db");
my %mst_data = (); my %mst_data = ();
my $title = $c->l('mst_Mailstats'); my $title = $c->l('mst_Mailstats');
@@ -118,11 +118,11 @@ sub do_update {
my $modul = ''; my $modul = '';
#The most common ones - you might want to comment out any not used. #The most common ones - you might want to comment out any not used.
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
$adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); $adb = esmith::AccountsDB::UTF8->open() || die("Couldn't open Accounts db");
$ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
$hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); $hdb = esmith::HostsDB::UTF8->open() || die("Couldn't open Hosts db");
$ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); $ddb = esmith::DomainsDB::UTF8->open() || die("Couldn't open Domains db");
my %mst_data = (); my %mst_data = ();
my $title = $c->l('mst_Mailstats'); my $title = $c->l('mst_Mailstats');
@@ -225,18 +225,18 @@ sub do_display {
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
#The most common ones - you might want to comment out any not used. #The most common ones - you might want to comment out any not used.
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
$adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); $adb = esmith::AccountsDB::UTF8->open() || die("Couldn't open Accounts db");
$ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
$hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); $hdb = esmith::HostsDB::UTF8->open() || die("Couldn't open Hosts db");
$ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); $ddb = esmith::DomainsDB::UTF8->open() || die("Couldn't open Domains db");
my %mst_data = (); my %mst_data = ();
my $title = $c->l('mst_Mailstats'); my $title = $c->l('mst_Mailstats');
my $modul = ""; my $modul = "";
# Accessing all parameters # Accessing all parameters
my %params = $c->req->params->to_hash; my %params = %{ $c->req->params->to_hash };
# Get number of parameters # Get number of parameters
my $num_params = keys %params; my $num_params = keys %params;
@@ -312,4 +312,4 @@ sub do_display {
); );
$c->render(template => "mailstats"); $c->render(template => "mailstats");
} }
1; 1;

5
smeserver-mailstats.spec
View File

@@ -6,7 +6,7 @@ Summary: Daily mail statistics for SME Server
%define name smeserver-mailstats %define name smeserver-mailstats
Name: %{name} Name: %{name}
%define version 11.1 %define version 11.1
%define release 12 %define release 13
%define full_version %{version}.%{release}) %define full_version %{version}.%{release})
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
@@ -88,6 +88,9 @@ chmod u+s /usr/bin/journalwrap
/sbin/ldconfig /sbin/ldconfig
%changelog %changelog
* Mon Oct 06 2025 Brian Read <brianr@koozali.org> 11.1-13.sme
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
* Tue Sep 30 2025 Brian Read <brianr@koozali.org> 11.1-12.sme * Tue Sep 30 2025 Brian Read <brianr@koozali.org> 11.1-12.sme
- Fix httpd conf fragment and add in ValidFrom Ips [SME: 13204] - Fix httpd conf fragment and add in ValidFrom Ips [SME: 13204]