From 1605054f83051c064aa5f079a79ce10cc3bb2a52 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Sun, 11 May 2025 11:17:25 +0100 Subject: [PATCH] * Sun May 11 2025 Brian Read 11.0.0-4.sme - Fix generation of cmd option [SME: 13001] --- root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm | 6 +++--- .../default/templates/partials/_ddc_paramlist.html.ep | 4 ++-- smeserver-ddclient.spec | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm index 7d19b1d..a65737d 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Ddclient.pm @@ -243,7 +243,7 @@ sub do_display { [ $c->l('Router/Firewall') => 'router' ], [ $c->l('Interface') => 'if' ], [ $c->l('IP') => 'ip' ], - [ $c->l('Command') => 'cmd' ] + [ $c->l('Command') => 'cmdv4' ] ] ); @@ -597,7 +597,7 @@ sub get_params { "DeamonUpdate" => $DeamonUpdate, "method" => $method, "Extinterface" => $Extinterface, - "cmd" => $cmd, + "cmdv4" => $cmd, "ForceIP" => $forceIP, "urlcheckip" => $urlcheckip, "FWlogin" => $fwlogin, @@ -632,7 +632,7 @@ sub pushParams { } else { $ddclient->set_prop( 'Extinterface' => $retrieveinterface ); } - $ddclient->set_prop( 'cmd' => $retrievecmd ); + $ddclient->set_prop( 'cmdv4' => $retrievecmd ); $ddclient->set_prop( 'ForceIP' => $retrieveip ); $ddclient->set_prop( 'fwlogin' => $retrievefwlogin ); $ddclient->set_prop( 'fwpassword' => $retrievefwpassword ); diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep index de52877..0303eea 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_ddc_paramlist.html.ep @@ -69,11 +69,11 @@ %# Only if "cmd" is chosen -
+
%=l 'RETRIEVE_CMD' - % param retrievecmd=>$ddc_datas->{"params"}->{"cmd"} unless param 'retrievecmd'; + % param retrievecmd=>$ddc_datas->{"params"}->{"cmdv4"} unless param 'retrievecmd'; %=text_field 'retrievecmd'
diff --git a/smeserver-ddclient.spec b/smeserver-ddclient.spec index e160ae2..d30658c 100644 --- a/smeserver-ddclient.spec +++ b/smeserver-ddclient.spec @@ -4,7 +4,7 @@ %define name smeserver-ddclient %define version 11.0.0 -%define release 3 +%define release 4 Summary: ddclient panel for SME Server Name: %{name} @@ -25,6 +25,9 @@ Requires: smeserver-formmagick AutoReqProv: no %changelog +* Sun May 11 2025 Brian Read 11.0.0-4.sme +- Fix generation of cmd option [SME: 13001] + * Sat May 10 2025 Brian Read 11.0.0-3.sme - Get javascript working and password visible icon [SME: 13001] - Fix missing cmd in panel