From ec6b312c355f94bde555ece16b5ac477a16baf9e Mon Sep 17 00:00:00 2001 From: Brian Read Date: Sun, 5 Oct 2025 11:34:03 +0100 Subject: [PATCH] * Sun Oct 05 2025 Brian Read 0.2-21.sme - Add UTF8 and avoid potential DB caching problems [SME: 13209] --- .../lib/SrvMngr/Controller/Backuppc.pm | 69 ++++++------------- smeserver-BackupPC.spec | 5 +- 2 files changed, 24 insertions(+), 50 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Backuppc.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Backuppc.pm index 5e438a7..eceb5d8 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Backuppc.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Backuppc.pm @@ -18,8 +18,8 @@ use SrvMngr::I18N; use SrvMngr qw(theme_list init_session ip_number_or_blank); use Quota; -use esmith::ConfigDB; -use esmith::AccountsDB; +use esmith::ConfigDB::UTF8; +use esmith::AccountsDB::UTF8; use esmith::util; use File::Basename; @@ -28,23 +28,22 @@ use File::Path qw(make_path remove_tree); use esmith::Backup; use esmith::BackupHistoryDB; -use esmith::util; use esmith::lockfile; use constant DEBUG => $ENV{MOJO_SMANAGER_DEBUG} || 0; -our $cdb = esmith::ConfigDB->open || die "Couldn't open config db"; -our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db"; +my $cdb; +my $adb; sub main { my $c = shift; $c->app->log->info($c->log_req); - #my $modul = get_backuppc( $c ); - + $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db"; + $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db"; + my $url = "https://".$c->session->{'SystemName'}.".".$c->session->{"DomainName"}."/BackupPC"; - #my $url = 'https://sme10.thereadclan.me.uk/BackupPC'; $c->stash(url => $url ); $c->render(template => 'backuppc'); @@ -53,52 +52,24 @@ sub main { sub get_backuppc { - my ($c) = @_; - - my $tx = $c->tx; - my $req = $tx->req; - -# 3 env variables for durep.cgi - #$ENV{'SCRIPT_NAME'} = 'durep'; - #$ENV{'REQUEST_METHOD'} = $req->method; - #$ENV{'QUERY_STRING'} = $req->url->query->to_string; - - my $res = `https:////sme10.thereadclan.me.uk//BackupPC`; - + my ($c) = @_; + my $tx = $c->tx; + my $req = $tx->req; my $res = `/usr/share/BackupPC/sbin/BackupPC_Admin`; # - my $step = 0; my $out; + my $step = 0; + my $out; my @lines = split /\n/, $res; # remove except 'body' foreach my $line (@lines) { - if ( $line =~ m|| ) { - $step = 1; - } elsif ( $line =~ m|| ) { - $step = 2; - } elsif ( $step == 1 ) { - $out .= $line; + if ( $line =~ m|| ) { + $step = 1; + } elsif ( $line =~ m|| ) { + $step = 2; + } elsif ( $step == 1 ) { + $out .= $line; + } } - } return $out; } -#sub main { - -# my $c = shift; -# $c->app->log->info($c->log_req); - -# BEGIN -# { -# $ENV {'PATH'} = '/bin:/usr/bin:/sbin'; -# $ENV {'SHELL'} = '/bin/bash'; -# delete $ENV {'ENV'}; -# } - - - #$c = $c->redirect_to("https://".$ENV {'HTTP_X_FORWARDED_HOST'}."/BackupPC"); -# $c = $c->redirect_to("https://sme10.thereadclan.me.uk//BackupPC"); - -#} - - -1; - +1; \ No newline at end of file diff --git a/smeserver-BackupPC.spec b/smeserver-BackupPC.spec index d112196..4f877e4 100644 --- a/smeserver-BackupPC.spec +++ b/smeserver-BackupPC.spec @@ -4,7 +4,7 @@ Name: smeserver-BackupPC Version: 0.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: BackupPC integration into SME server Group: Applications/System @@ -52,6 +52,9 @@ This package contains specific configuration for SME server #---------------------------------------------------- %changelog +* Sun Oct 05 2025 Brian Read 0.2-21.sme +- Add UTF8 and avoid potential DB caching problems [SME: 13209] + * Wed Sep 24 2025 Jean-Philippe Pialasse 0.2-20.sme - relaxed CSP