* 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

root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Backup;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Backup or restore
-# navigation  : 4000 200
+# navigation  : 4000 100
 # Copyright (C) 2002 Mitel Networks Corporation
 #----------------------------------------------------------------------
 # routes : end

root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Bugreport;
 #----------------------------------------------------------------------
 # heading     : Investigation
 # description : Report a bug
-# navigation  : 7000 500
+# navigation  : 7000 300
 # routes : end
 #------------------------------
 use strict;

root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Datetime;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Date and time
-# navigation  : 4000 400
+# navigation  : 4000 300
 # routes : end
 #------------------------------
 use strict;
@@ -361,7 +361,7 @@ sub getYear_list {
     my $c= shift;
     my @yearArray;
     # could use also `/bin/date '+%Y'`
-    my $start=___YEAR___-40; my $max=___YEAR___+40;
+    my $start=2025-40; my $max=2025+40;
     for ( my $i = $start; $i <= $max; $i++ ) {
 
         push @yearArray,$i;

root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Directory;
 #----------------------------------------------------------------------
 # heading     : User management
 # description : Directory
-# navigation  : 2000 300
+# navigation  : 2000 400
 #
 # routes : end
 #----------------------------------------------------------------------

root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Emailsettings;
 #----------------------------------------------------------------------
 # heading     : System
 # description : E-mail
-# navigation  : 4000 500
+# navigation  : 4000 400
 #
 #
 # routes : end

root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm

@@ -17,7 +17,7 @@ use SrvMngr qw(theme_list init_session);
 use HTML::Entities;
 use Net::IPv4Addr qw(ipv4_in_network);
 use esmith::DomainsDB::UTF8;
-use esmith::ConfigDB::UTF8
+use esmith::ConfigDB::UTF8;
 use esmith::HostsDB::UTF8;
 use esmith::NetworksDB::UTF8;
 
@@ -373,7 +373,7 @@ sub domains_list {
     $ddb = esmith::DomainsDB::UTF8->open_ro() or die "Couldn't open DomainsDB";
     my @domains;
 
-    for ($d->domains) {
+    for ($ddb->domains) {
         my $ns = $_->prop("Nameservers") || 'localhost';
         push @domains, $_->key if ($ns eq 'localhost');
     }

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;

root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Logout;
 #----------------------------------------------------------------------
 # heading     : Current User
 # description : Logout
-# navigation  : 1000 900
+# navigation  : 1000 1000
 # menu        : U
 #
 # routes : end

root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Printers;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Printers
-# navigation  : 4000 900
+# navigation  : 4000 800
 #
 #
 # routes : end

root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Proxy;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Proxy settings
-# navigation  : 4000 800
+# navigation  : 4000 200
 #----------------------------------------------------------------------
 #
 # routes : end

root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Pseudonyms;
 #----------------------------------------------------------------------
 # heading     : User management
 # description : Pseudonyms
-# navigation  : 2000 210
+# navigation  : 2000 300
 #----------------------------------------------------------------------
 #
 # routes : end

root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Quota;
 #----------------------------------------------------------------------
 # heading     : User management
 # description : Quotas
-# navigation  : 2000 300
+# navigation  : 2000 500
 #----------------------------------------------------------------------
 #
 # routes : end

root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Review;
 #----------------------------------------------------------------------
 # heading     : Investigation
 # description : Review configuration
-# navigation  : 7000 600
+# navigation  : 7000 400
 # routes : end
 #----------------------------------------------------------------------
 use strict;

root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Yum;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Software installer
-# navigation  : 4000 300
+# navigation  : 4000 500
 #
 # routes : end
 #----------------------------------------------------------------------

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";

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>

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 87
+%define release 90
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -144,9 +144,17 @@ true
 %defattr(-,root,root)
 
 %changelog
-* Mon Jun 09 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-87.sme
+* 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]
+
+* Mon Jun 09 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-88.sme
 - add datetime getYear_list [SME: 13031]
 - use esmith::*DB::UTF8 to access db flat files [SME: 13027]
+- fix typo [SME: 13038]
 
 * Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.00.0-86.sme
 - Fix datetime gen_locale_date_string reference [SME: 13017]