From 6475521528cb4dabf2df6384200d26b6f7d22363 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Thu, 7 Aug 2025 16:33:12 +0100 Subject: [PATCH] * Thu Aug 07 2025 Brian Read 11.0.0-112.sme - Fix sprintf fail in viewlogfiles when % in log line [SME: 13099] - Fix reboot/shutdown failure - reported by Massimo - fixed by JC [SME: 13097] --- .../lib/SrvMngr/Controller/Viewlogfiles.pm | 6 +++--- .../themes/default/templates/reboot.html.ep | 2 +- smeserver-manager.spec | 16 ++++++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm index 06edd59..939f403 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm @@ -211,8 +211,8 @@ sub showlogFile { $_ = timestamp2local($_); $_ = HTML::Entities::encode_entities($_); ($log_datas{highlightpattern} && /$log_datas{highlightpattern}/) - ? $out .= sprintf("$_") - : $out .= sprintf("$_"); + ? $out .= "$_" + : $out .= "$_"; } ## end while () $out .= sprintf(""); @@ -297,4 +297,4 @@ sub download_logFile { ); return undef; } ## end sub download_logFile -1; +1; \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/reboot.html.ep b/root/usr/share/smanager/themes/default/templates/reboot.html.ep index c4daef2..595265c 100644 --- a/root/usr/share/smanager/themes/default/templates/reboot.html.ep +++ b/root/usr/share/smanager/themes/default/templates/reboot.html.ep @@ -34,7 +34,7 @@ % end - %= hidden_field 'debug' => '1' + %= hidden_field 'debug' => '0' %end \ No newline at end of file diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 87941bb..649d0ed 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -1,8 +1,8 @@ -Summary: Sme server navigation module : manager 2 +Summary: Sme Server Configuration : Manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 111 +%define release 112 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -17,7 +17,7 @@ BuildRequires: smeserver-devtools #BuildRequires: perl >= 0:5.016 #BuildRequires: perl(Test::More) #BuildRequires: perl(Test::Mojo) -#BuildRequires: perl(Mojolicious) >= 7.56 +#BuildRequires: perl(Mojolicious) >= 9.39 #BuildRequires: perl(Mojolicious::Plugin::I18N) >= 1.6 #BuildRequires: perl(Net::Netmask) >= 1.9 # @@ -146,12 +146,16 @@ true %defattr(-,root,root) %changelog +* Thu Aug 07 2025 Brian Read 11.0.0-112.sme +- Fix sprintf fail in viewlogfiles when % in log line [SME: 13099] +- Fix reboot/shutdown failure - reported by Massimo - fixed by JC [SME: 13097] + * Mon Jul 28 2025 Brian Read 11.0.0-111.sme -- Add password strength details to passowrd panels [SME: 13081] +- Add password strength details to password panels [SME: 13081] * Sat Jul 26 2025 Brian Read 11.0.0-110.sme - Get cifs workstation backup restore to show backup sets [SME: 12645] - Add lex file for roundcubepanel to provide lex environment for lex strings + Add lex file for roundcubepanel to provide lex environment for lex strings * Wed Jul 16 2025 Brian Read 11.0.0-109.sme - A few more error message corrections [SME: 13078] @@ -218,7 +222,7 @@ true * Thu Jun 12 2025 Brian Read 11.0.0-90.sme - Local Networks - Error on empty extra chars for success message [SME: 13041] - Needed extra open for network-db after add + Needed extra open for network-db after add * Thu Jun 12 2025 Brian Read 11.0.0-89.sme - rework navigation weights to avoid duplicates [SME: 12996]