From dcc098b20675f34d6db81b4cd517c6c223b4e80a Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@koozali.org>
Date: Thu, 12 Jun 2025 19:15:22 +0100
Subject: [PATCH] * Thu Jun 12 2025 Brian Read <brianr@koozali.org>
 11.0.0-90.sme - Error on empty extra chars for success message [SME: 13041] -
 Needed extra open for network-db after add

---
 .../lib/SrvMngr/Controller/Localnetworks.pm   |  3 +-
 .../templates/partials/_ln_add.html.ep        | 45 ++++++++--------
 .../templates/partials/_ln_list.html.ep       | 51 ++++++++-----------
 smeserver-manager.spec                        |  6 ++-
 4 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
index 1bb82ae..fe8d7e9 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
@@ -67,6 +67,7 @@ sub do_display {
 
         #Add a network - called after new network details filled in
         my %ret = add_network($c);
+        $network_db   = esmith::NetworksDB::UTF8->open();
 
         #Return to list page if success
         if ((index($ret{ret}, "SUCCESS") != -1)) {
@@ -267,4 +268,4 @@ sub add_network {
         );
     } ## end else [ if ($totalHosts == 1) ]
 } ## end sub add_network
-1;
+1;
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep
index 288896c..e04a581 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep
@@ -1,32 +1,29 @@
 <div id='ln_add'>
 
 	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
+	% if ($c->app->config->{debug}) {
+	<p>
+		%= dumper { ret_data => \%ret }
+	</p>  
+	% }
 
-   <br>
-	%if ($ret{'ret'} eq "") {
-
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <div class='success'>
-	       <!--<h2> Operation Status Report</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
-		</div>
-	   %} else {
-	   <div class='sme-error'>
-	       <!--<h2> Operation Status Report - Error</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
-    	</div>
-	%}
+	% if ($ret{ret} eq "") {
+		%=l "ln_FIRSTPAGE_DESC"
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
+	<br>
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
 	<br />
     % my $btn = l('ADD');
     % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
index e311df9..b9c2814 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
@@ -3,41 +3,30 @@
     %= form_for '/localnetworksa' => (method => 'POST') => begin
 
 	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
-    % if (config->{debug} == 1) {
+	% if ($c->app->config->{debug}) {
 	<p>
-		%= dumper "Ret:".$ret{ret};
-	</p>	
-	%}
+		%= dumper { ret_data => \%ret }
+	</p>  
+	% }
 
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
-	% my $var7 = @vars[6];
-
-
-	%if ($ret{ret} eq "") {
+	% if ($ret{ret} eq "") {
 		%=l "ln_FIRSTPAGE_DESC"
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <br>
-	   <div class='success'>
-	       <!--<h2> Operation Status Report</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
-		</div>
-	   %} else { 
-	   <br>
-	   <div class='sme-error'>
-	       <!--<h2> Operation Status Report - Error</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
-    	</div>
-	%}
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
+	<br>
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
+
 
 	<p>
 	<br>
diff --git a/smeserver-manager.spec b/smeserver-manager.spec
index 6785216..d211cae 100644
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 89
+%define release 90
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -144,6 +144,10 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Thu Jun 12 2025 Brian Read <brianr@koozali.org> 11.0.0-90.sme
+- Error on empty extra chars for success message [SME: 13041]
+- Needed extra open for network-db after add 
+
 * Thu Jun 12 2025 Brian Read <brianr@koozali.org> 11.0.0-89.sme
 - rework navigation weights to avoid duplicates [SME: 12996]