From 7a75b26cb55b672464aa590bd05defba761d7935 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Mon, 6 Oct 2025 11:45:14 +0100 Subject: [PATCH] * Mon Oct 06 2025 Brian Read 11.0.0-2.sme - Add UTF8 and avoid potential DB caching problems [SME: 13209] --- .../Controller/Remoteuseraccess-Custom.pm | 16 ++++++++-------- smeserver-remoteuseraccess.spec | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteuseraccess-Custom.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteuseraccess-Custom.pm index 52bfc36..b2cefd6 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteuseraccess-Custom.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteuseraccess-Custom.pm @@ -7,11 +7,11 @@ # use esmith::util; use esmith::util::network; -use esmith::ConfigDB; -use esmith::HostsDB; -use esmith::AccountsDB; +use esmith::ConfigDB::UTF8; +use esmith::HostsDB::UTF8; +use esmith::AccountsDB::UTF8; use esmith::NetworksDB; -use esmith::DomainsDB; +use esmith::DomainsDB::UTF8; use constant FALSE => 0; use constant TRUE => 1; @@ -82,7 +82,7 @@ my $adb; # Return a hash with the fields required which will be loaded into the shared data my $c = shift; my $user = $c->param('Selected'); - $adb = esmith::AccountsDB->open(); + $adb = esmith::AccountsDB::UTF8->open(); #die("$user"); $userrec = $adb->get($user) || return ('Account' => "$user not found"); @@ -122,8 +122,8 @@ my $adb; sub actual_getAllUsers { my $c = shift; # Actual code for extracting getAllUsers - $cdb = esmith::ConfigDB->open(); - $adb = esmith::AccountsDB->open(); + $cdb = esmith::ConfigDB::UTF8->open(); + $adb = esmith::AccountsDB::UTF8->open(); my @data = (); my @users = $adb->users; @@ -322,7 +322,7 @@ sub userpanel_change_settings my $VPNClientAccess = $c->param ('VPNClientAccess'); my $ChrootDir = $c->param ('ChrootDir'); my $ChrootDir2 = $c->param ('ChrootDir2'); - $adb = esmith::AccountsDB->open(); + $adb = esmith::AccountsDB::UTF8->open(); my $user = $c->param('Selected'); diff --git a/smeserver-remoteuseraccess.spec b/smeserver-remoteuseraccess.spec index f366bf3..91178c6 100644 --- a/smeserver-remoteuseraccess.spec +++ b/smeserver-remoteuseraccess.spec @@ -6,7 +6,7 @@ Summary: Smeserver module to configure Shell and FTP access for individual users %define name smeserver-remoteuseraccess Name: %{name} %define version 11.0.0 -%define release 1 +%define release 2 Version: %{version} Release: %{release}%{?dist} License: GNU GPL version 2 @@ -38,6 +38,9 @@ Also sets Chroots FTP access, VPN Client Access, and allows you to enter ssh keys %changelog +* Mon Oct 06 2025 Brian Read 11.0.0-2.sme +- Add UTF8 and avoid potential DB caching problems [SME: 13209] + * Mon May 19 2025 Brian Read 11.0.0-1.sme - Add in SM2 panels