From a2c3f3cdb48976fcdae5cae1239d58dfd5792b49 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Fri, 3 Oct 2025 15:33:04 +0100 Subject: [PATCH] * Fri Oct 03 2025 Brian Read 1.0-28.sme - Add in UTF8 to ConfigDB open [SME: 13209] --- .../smanager/lib/SrvMngr/Controller/Wireguard.pm | 16 ++++++++-------- smeserver-wireguard.spec | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Wireguard.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Wireguard.pm index bbe8788..6fbaecd 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Wireguard.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Wireguard.pm @@ -18,7 +18,7 @@ use Mojo::Base 'Mojolicious::Controller'; use Locale::gettext; use SrvMngr::I18N; use SrvMngr qw( theme_list init_session is_normal_password ); -use esmith::ConfigDB; +use esmith::ConfigDB::UTF8; use Net::IP; my $adb; my $cdb; @@ -29,10 +29,10 @@ sub main { my $c = shift; $c->app->log->info($c->log_req); my %wrg_datas = (); - $wdb = esmith::ConfigDB->open('wireguard') || esmith::ConfigDB->create('wireguard'); + $wdb = esmith::ConfigDB::UTF8->open('wireguard') || esmith::ConfigDB::UTF8->create('wireguard'); my $title = $c->l('wrg_FORM_TITLE'); $wrg_datas{'trt'} = 'LST'; - $cdb = esmith::ConfigDB->open() || die "Couldn't open config DB\n"; + $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config DB\n"; my $wg = $cdb->get('wg-quick@wg0'); $wrg_datas{'wgpub'} = $wg->prop('public'); $wrg_datas{'wgip'} = $wg->prop('ip'); @@ -61,8 +61,8 @@ sub do_display { my $title = $c->l('wrg_FORM_TITLE'); my $modul = ''; $adb = esmith::AccountsDB->open() || die "Couldn't open accounts DB\ndb"; - $cdb = esmith::ConfigDB->open() || die "Couldn't open config DB\n"; - $wdb = esmith::ConfigDB->open('wireguard') || esmith::ConfigDB->create('wireguard'); + $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config DB\n"; + $wdb = esmith::ConfigDB::UTF8->open('wireguard') || esmith::ConfigDB::UTF8->create('wireguard'); #$ndb = esmith::NetworksDB->open_ro || die "Error opening networks DB\n"; $wrg_datas{'trt'} = $trt; @@ -125,8 +125,8 @@ sub do_action { my $result = ''; my $res = ''; $adb = esmith::AccountsDB->open() || die "Couldn't open accounts DB\ndb"; - $cdb = esmith::ConfigDB->open() || die "Couldn't open config DB\n"; - $wdb = esmith::ConfigDB->open('wireguard') || esmith::ConfigDB->create('wireguard'); + $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config DB\n"; + $wdb = esmith::ConfigDB::UTF8->open('wireguard') || esmith::ConfigDB::UTF8->create('wireguard'); $ndb = esmith::NetworksDB->open_ro || die "Error opening networks DB\n"; if ($trt eq 'QRC') { @@ -216,7 +216,7 @@ sub do_action { } #force reload as successfull (for Main) - $wdb = esmith::ConfigDB->open('wireguard'); + $wdb = esmith::ConfigDB::UTF8->open('wireguard'); my $message = "'Wireguard' update ($trt) DONE"; $c->app->log->info($message); $c->flash(success => $result); diff --git a/smeserver-wireguard.spec b/smeserver-wireguard.spec index 94b32c0..5be2f69 100644 --- a/smeserver-wireguard.spec +++ b/smeserver-wireguard.spec @@ -1,4 +1,4 @@ -%define release 27 +%define release 28 %define version 1.0 %define debug_package %{nil} @@ -57,6 +57,9 @@ cat %{name}-%{version}-filelist %changelog +* Fri Oct 03 2025 Brian Read 1.0-28.sme +- Add in UTF8 to ConfigDB open [SME: 13209] + * Fri Oct 03 2025 Brian Read 1.0-27.sme - Remove smanager-refresh from spec file [SME: 13212]