* 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
2025-06-12 18:15:41 +01:00 · 2025-06-10 07:17:32 -04:00 · 2025-06-10 00:09:39 -04:00 · 2025-06-09 23:49:25 -04:00 · 2025-06-09 12:49:29 -04:00 · 2025-06-09 14:08:56 +02:00
49 changed files with 684 additions and 438 deletions
--- a/12
+++ b/12
@@ -8,12 +8,12 @@ use esmith::Build::CreateLinks  qw(:all);
 my $mngrdir = '/usr/share/smanager';

 # templates to expand
-for (  qw( sme_core.css sme_main.css sme_menu.css styles.css ) )
-{
-    templates2events("$mngrdir/themes/default/public/css/$_", qw(
-        bootstrap-console-save smeserver-manager-update
-        ));
-}
+#for (  qw( sme_core.css sme_main.css sme_menu.css styles.css ) )
+#{
+#    templates2events("$mngrdir/themes/default/public/css/$_", qw(
+#        bootstrap-console-save smeserver-manager-update
+#        ));
+#}

 templates2events("$mngrdir/conf/srvmngr.conf", 
        qw( smeserver-manager-update smanager-theme-change smanager-modify bootstrap-console-save ));
--- a/root/usr/share/smanager/lib/SrvMngr.pm
+++ b/root/usr/share/smanager/lib/SrvMngr.pm
@@ -4,6 +4,7 @@ package SrvMngr;
 use strict;
 use warnings;
 use utf8;
+binmode(STDOUT);

 use Mojo::Base 'Mojolicious';

@@ -29,9 +30,14 @@ use SrvMngr::Model::Main;
 use SrvMngr::Plugin::WithoutCache;

 use esmith::I18N;
+use esmith::ConfigDB::UTF8;
+use esmith::NavigationDB; # no UTF8 raw is ok for ASCII only flat file
+
+# Import the function(s) you need
+use SrvMngr_Auth qw(check_admin_access);

 #this is overwrittrn with the "release" by the spec file - release can be "99.el8.sme"
-our $VERSION = '70.el8.sme'; 
+our $VERSION = '78.el8.sme'; 
 #Extract the release value
 if ($VERSION =~ /^(\d+)/) {
    $VERSION = $1;  # $1 contains the matched numeric digits
@@ -46,7 +52,7 @@ our @EXPORT_OK = qw(
 	getNavigation ip_number validate_password is_normal_password email_simple
 	mac_address_or_blank mac_address ip_number_or_blank
 	lang_space get_routes_list subnet_mask get_reg_mask
-	gen_locale_date_string get_public_ip_address
+	gen_locale_date_string get_public_ip_address simpleNavMerge
 	);

 has home => sub {
@@ -301,10 +307,11 @@ sub setup_routing {
    $if_logged_in->get('/userpassword')->to('userpassword#main')->name('passwd');
    $if_logged_in->post('/userpassword')->to('userpassword#change_password')->name('passwd2');

-    my $if_admin = $r->under( sub {
-	my $c =shift;
-	return $c->is_admin || $c->auth_fail($c->l("acs_ADMIN"));
-    });
+	my $if_admin = $r->under( sub {
+	    my $c = shift;
+	    # Call the imported function directly
+	    return check_admin_access($c) || $c->auth_fail($c->l("acs_ADMIN"));
+	});

    $if_admin->get('/backup')->to('backup#main')->name('backup');
    $if_admin->post('/backup')->to('backup#do_display')->name('backupd');
@@ -546,12 +553,10 @@ sub theme_list {
 #------------------------------------------------------------

 sub getNavigation {
-
-    use esmith::NavigationDB;
-
-    my $c  = shift;
+    my $class  = shift; #not the controller as it is called as an external, not part of the controller.
    my $lang = shift || 'en-us';
    my $menu = shift || 'N';
+    my $username = shift || ''; #Username when logged in as a user not admin

 #    my $lang = $c->session->{lang} || 'en-us';

@@ -560,6 +565,26 @@ sub getNavigation {

    my @files = ();
    my %files_hash = ();
+    
+    # Added: Store allowed admin panels for non-admin users
+    my @allowed_admin_panels = ();
+    my $is_admin = 1;  # Default to admin (full access)
+    
+    # Added: Check if user is non-admin and get their allowed panels
+    if ($username ne '') {
+        # Get the AccountsDB to check user permissions
+        my $accountsdb = esmith::AccountsDB::UTF8->open_ro() or
+            die "Couldn't open AccountsDB\n";
+            
+        # Check if user has AdminPanels property
+        my $user_rec = $accountsdb->get($username);
+        if (defined $user_rec && $user_rec->prop('AdminPanels')) {
+            $is_admin = 0;  # User is non-admin with specific panel access
+            # Get comma-separated list of allowed admin panels
+            my $admin_panels = $user_rec->prop('AdminPanels');
+            @allowed_admin_panels = split(/,/, $admin_panels);
+        }
+    }

    #-----------------------------------------------------
    # Determine the directory where the functions are kept
@@ -621,8 +646,7 @@ sub getNavigation {

    my $navinfo = NAVIGATIONDIR . "/navigation.$lang";

-    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
-	die "Couldn't open $navinfo\n";
+    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or die "Couldn't open $navinfo\n"; # no UTF8

    # Check the navdb for anything with a UrlPath, which means that it doesn't
    # have a cgi file to be picked up by the above code. Ideally, only pages
@@ -638,70 +662,110 @@ sub getNavigation {
    }

    foreach my $file (keys %files_hash)
-    {
-	#my $heading = 'Unknown';
-	my $heading = 'Legacy';
-	
-	my $description = $file;
-	my $headingWeight = 99999;
-	my $descriptionWeight = 99999;
-	my $urlpath = '';
-	my $menucat = 'A';	# admin menu (default)
+		{
+		#my $heading = 'Unknown';
+		my $heading = 'Legacy';
+		
+		my $description = $file;
+		my $headingWeight = 99999;
+		my $descriptionWeight = 99999;
+		my $urlpath = '';
+		my $menucat = 'A';	# admin menu (default)

-	my $rec = $navdb->get($file);
+		my $rec = $navdb->get($file);

-	if (defined $rec)
-	{
-	    $heading = $rec->prop('Heading');
-	    $description = $rec->prop('Description');
-	    $headingWeight = $rec->prop('HeadingWeight') || 99999; #Stop noise in logs if file in dir does not have nav header.
-	    $descriptionWeight = $rec->prop('DescriptionWeight');
-	    $urlpath = $rec->prop('UrlPath') || '';
-	    $menucat = $rec->prop('MenuCat') || 'A';	# admin menu (default)
-	}
-	next if $menu ne $menucat;
+		if (defined $rec)
+		{
+			$heading = $rec->prop('Heading');
+			$description = $rec->prop('Description');
+			$headingWeight = $rec->prop('HeadingWeight') || 99999; #Stop noise in logs if file in dir does not have nav header.
+			$descriptionWeight = $rec->prop('DescriptionWeight');
+			$urlpath = $rec->prop('UrlPath') || '';
+			$menucat = $rec->prop('MenuCat') || 'A';	# admin menu (default)
+		}
+		
+		# Added: Check if this is an admin menu item and if user has access
+		if ($menucat eq 'A' && !$is_admin) {
+			# Skip this admin panel if user doesn't have access to it
+			my $has_access = 0;
+			my $file_no_ext = $file;
+			$file_no_ext =~ s/\.pm$//;  # Remove .pm extension if present
+			foreach my $allowed_panel (@allowed_admin_panels) {
+				if ($file_no_ext eq lc($allowed_panel)) {
+					#die("Here!!$file $file_no_ext $allowed_panel ");
+					$has_access = 1;
+					last;
+				}
+			}
+			next if !$has_access;
+		}

-	#-------------------------------------------------- 
-	# add heading, description and weight information to data structure
-	#-------------------------------------------------- 
+		next if $menu ne $menucat;

-	unless (exists $nav {$heading})
-	{
-	    $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
-	}
+		#-------------------------------------------------- 
+		# add heading, description and weight information to data structure
+		#-------------------------------------------------- 

-	$nav {$heading} {'COUNT'} ++;
-	$nav {$heading} {'WEIGHT'} += $headingWeight;
+		unless (exists $nav {$heading})
+		{
+			$nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
+		}

-	# Check for manager panel, and assign the appropriate
-	#  cgi-bin prefix for the links.
-	# Grab the last 2 directories by splitting for '/'s and
-	#  then concatenating the last 2
-	# probably a better way, but I don't know it.
+		$nav {$heading} {'COUNT'} ++;
+		$nav {$heading} {'WEIGHT'} += $headingWeight;

-	my $path;
-	if ( $files_hash{$file} eq 'ctrl') {
-	    $path = "2";
-	} elsif ( $files_hash{$file} eq 'cgim') {
-		$path = "/cgi-bin";
-	} else {
-		my @filename = split /\//, $files_hash{$file};
-		$path = "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
-	};
+		# Check for manager panel, and assign the appropriate
+		#  cgi-bin prefix for the links.
+		# Grab the last 2 directories by splitting for '/'s and
+		#  then concatenating the last 2
+		# probably a better way, but I don't know it.

-	push @{ $nav {$heading} {'DESCRIPTIONS'} },
-		{ DESCRIPTION => $description,
-		  WEIGHT => $descriptionWeight, 
-		  FILENAME => $urlpath ? $urlpath : "$path/$file",
-		  CGIPATH => $path,
-		  MENUCAT => $menucat
+		my $path;
+		if ( $files_hash{$file} eq 'ctrl') {
+			$path = "2";
+		} elsif ( $files_hash{$file} eq 'cgim') {
+			$path = "/cgi-bin";
+		} else {
+			my @filename = split /\//, $files_hash{$file};
+			$path = "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
 		};
+
+		push @{ $nav {$heading} {'DESCRIPTIONS'} },
+			{ DESCRIPTION => $description,
+			  WEIGHT => $descriptionWeight, 
+			  FILENAME => $urlpath ? $urlpath : "$path/$file",
+			  CGIPATH => $path,
+			  MENUCAT => $menucat
+			};
    }

 	return \%nav;

 }

+sub simpleNavMerge {
+	#Used to merge two nav structures - used for the user and selected admin menu.
+    my ($class,$nav1, $nav2) = @_;
+    my %result = %$nav1;  # Start with a copy of first nav
+    
+    # Merge in second nav
+    foreach my $heading (keys %$nav2) {
+        if (exists $result{$heading}) {
+            # Add counts and weights
+            $result{$heading}{COUNT} += $nav2->{$heading}{COUNT};
+            $result{$heading}{WEIGHT} += $nav2->{$heading}{WEIGHT};
+            # Append descriptions
+            push @{$result{$heading}{DESCRIPTIONS}}, @{$nav2->{$heading}{DESCRIPTIONS}};
+        } else {
+            # Just copy the heading
+            $result{$heading} = $nav2->{$heading};
+        }
+    }
+    
+    return \%result;
+}
+
+

 sub _lang_space {

@@ -749,7 +813,7 @@ sub get_routes_list {

    my $c  = shift;

-    my $rtdb = esmith::ConfigDB->open_ro('routes') || die 'Cannot open Routes db';
+    my $rtdb = esmith::ConfigDB::UTF8->open_ro('routes') || die 'Cannot open Routes db';
    my @routes = $rtdb->get_all();
    my @rt;

@@ -831,7 +895,7 @@ sub gen_locale_date_string
 sub get_public_ip_address
 {
    my $self = shift;
-	my $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+	my $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
    my $sysconfig = $cdb->get('sysconfig');
    if ($sysconfig)
    {
@@ -925,4 +989,4 @@ sub get_reg_mask {
 }


-1;
+1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
+++ b/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
@@ -20,14 +20,14 @@ use Locale::gettext;
 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;
 use File::Find;
 use File::Path qw(make_path remove_tree);
 use esmith::Backup;
-use esmith::BackupHistoryDB;
+use esmith::BackupHistoryDB; #no UTF8 and not in use 
 use esmith::util;
 use esmith::lockfile;
 use esmith::BlockDevices;
@@ -36,9 +36,6 @@ use constant DEBUG => $ENV{MOJO_SMANAGER_DEBUG} || 0;
 use constant FALSE => 0;
 use constant TRUE  => 1;

-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open config db"; #remove as cached gives problems
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-#our $rdb = esmith::ConfigDB->open('/etc/e-smith/restore') || die "Couldn't open restore db";
 my ($cdb,$adb,$rdb);
 my $es_backup = new esmith::Backup or die "Couldn't create Backup object\n";
 my @directories = $es_backup->restore_list;
@@ -56,9 +53,9 @@ sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
    my %bac_datas = ();
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$rdb = esmith::ConfigDB->open('/etc/e-smith/restore');
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $rdb = esmith::ConfigDB::UTF8->open('/etc/e-smith/restore');
    my $title     = $c->l('bac_BACKUP_TITLE');
    my $notif;
    $bac_datas{'function'} = 'desktop_backup';
@@ -115,9 +112,9 @@ sub do_display {
    my $rt = $c->current_route;
    my ($res, $result) = '';
    my $function = $c->param('Function');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$rdb = esmith::ConfigDB->open('/etc/e-smith/restore');
+   $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open config db";
+   $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+   $rdb = esmith::ConfigDB::UTF8->open('/etc/e-smith/restore');

    if ($function =~ /^(\S+)$/) {
        $function = $1;
@@ -142,7 +139,7 @@ sub do_display {
        $c->render(template=>"backdown");
        #sleep(30);
        # Redirect to the front page
-		#$c->redirect_to('/backup');
+        #$c->redirect_to('/backup');
        return ""
    } ## end if ($function eq 'desktop_backup')

@@ -279,9 +276,9 @@ sub do_update {
    my $c = shift;
    $c->app->log->info($c->log_req);
    my $rt       = $c->current_route;
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$rdb = esmith::ConfigDB->open('/etc/e-smith/restore');
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $rdb = esmith::ConfigDB::UTF8->open('/etc/e-smith/restore');
    my $function = $c->param('Function');
    DEBUG && warn("do_update $function");
    my %bac_datas = ();
@@ -2132,4 +2129,4 @@ sub vmount {
        return (qx(/bin/mount -t nfs -o nolock,timeo=30,retrans=1,retry=0 "$host:/$share" $mountdir 2>&1));
    }
 } ## end sub vmount
-1;
+1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm
+++ b/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;
@@ -15,7 +15,8 @@ use SrvMngr qw(theme_list init_session);
 use Text::Template;
 use File::Basename;
 use SrvMngr qw( gen_locale_date_string );
-our $cdb = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n";
+use esmith::ConfigDB::UTF8;
+our $cdb = esmith::ConfigDB::UTF8->open or die "Couldn't open ConfigDB\n";

 use constant FALSE => 0;
 use constant TRUE  => 1;
@@ -173,4 +174,4 @@ sub download_config_report {
        'cleanup'             => 1,
    );
 } ## end sub download_config_report
-1;
+1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm
@@ -13,9 +13,9 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::ConfigDB::UTF8;

-#package esmith::FormMagick::Panel::clamav;
-our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
+our $db;

 sub main {
    my $c = shift;
@@ -23,6 +23,7 @@ sub main {
    my %clm_datas = ();
    my $title     = $c->l('clm_FORM_TITLE');
    my $modul     = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD'));
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
    $clm_datas{'FilesystemScan'} = ($db->get_prop('clamav', 'FilesystemScan')) || 'disabled';
    $clm_datas{'Quarantine'}     = ($db->get_prop('clamav', 'Quarantine'))     || 'disabled';
    $clm_datas{'clam_versions'}  = get_clam_versions();
@@ -53,6 +54,7 @@ sub do_update {

 sub change_settings {
    my $c                  = shift;
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
    my $status             = $c->param('status');
    my $FilesystemScan     = ($c->param('FilesystemScan') || 'disabled');
    my $Quarantine         = ($c->param('Quarantine') || 'disabled');
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
+++ b/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;
@@ -14,7 +14,8 @@ use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 use esmith::util;
 use SrvMngr qw( gen_locale_date_string );
-our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+use esmith::ConfigDB::UTF8;
+our $cdb ;

 sub main {
    my $c = shift;
@@ -23,6 +24,7 @@ sub main {
    my $title     = $c->l('dat_FORM_TITLE');
    my $modul     = $c->l('dat_INITIAL_DESC');
    $dat_datas{ntpstatus} = 'disabled';
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
    my $rec = $cdb->get('ntpd');

    if ($rec) {
@@ -54,6 +56,7 @@ sub do_update {
    my $result;
    my $success;
    my $old_ntpstatus = $c->param('Old_ntpstatus');
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
    $dat_datas{ntpstatus} = $c->param('Ntpstatus');

    if ($dat_datas{ntpstatus} ne $old_ntpstatus) {
@@ -70,7 +73,7 @@ sub do_update {
        } else {
            $dat_datas{ntpserver} = ($cdb->get_prop('ntpd', 'NTPServer')) || '';
        }
-        $dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
+        $dat_datas{now_string} = gen_locale_date_string();
        $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
        return $c->render('datetime');
    } ## end if ($dat_datas{ntpstatus...})
@@ -125,6 +128,7 @@ sub do_update {

 sub validate_change_datetime {
    my $c = shift;
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";

    #--------------------------------------------------
    # Untaint parameters and check for validity
@@ -220,15 +224,14 @@ sub validate_change_datetime {
    #--------------------------------------------------
    # Store time zone in configuration database
    #--------------------------------------------------
-    my $conf = esmith::ConfigDB->open();
-    my $old  = $conf->get('UnsavedChanges')->value;
-    my $rec  = $conf->get('TimeZone');
+    my $old  = $cdb->get('UnsavedChanges')->value;
+    my $rec  = $cdb->get('TimeZone');

    unless ($rec) {
-        $rec = $conf->new_record('TimeZone', undef);
+        $rec = $cdb->new_record('TimeZone', undef);
    }
    $rec->set_value($timezone);
-    $conf->get('UnsavedChanges')->set_value($old);
+    $cdb->get('UnsavedChanges')->set_value($old);

    #--------------------------------------------------
    # Signal event to change time zone, system time
@@ -353,4 +356,20 @@ sub getMonth_list {
        [ $c->l('dat_DECEMBER')  => '12' ]
    ];
 } ## end sub getMonth_list
+
+sub getYear_list {
+    my $c= shift;
+    my @yearArray;
+    # could use also `/bin/date '+%Y'`
+    my $start=2025-40; my $max=2025+40;
+    for ( my $i = $start; $i <= $max; $i++ ) {
+
+        push @yearArray,$i;
+    }
+
+    my @yearList = sort @yearArray;
+    return \@yearList;
+
+} ## end sub getYear_list
+
 1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm
+++ b/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
 #----------------------------------------------------------------------
@@ -12,13 +12,16 @@ use warnings;
 use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use SrvMngr qw(theme_list init_session);

-our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
+our $db; 

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
    my %dir_datas = ();
    my $title     = $c->l('dir_FORM_TITLE');
    my $modul     = $c->render_to_string(inline => $c->l('dir_DESCRIPTION'));
@@ -52,7 +55,7 @@ sub do_update {
    $db->get('ldap')->set_prop('defaultPhoneNumber', $phonenumber);

    if ($existing eq 'update') {
-        my $ac = esmith::AccountsDB->open() || die "Couldn't open accounts db";
+        my $ac = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
        my @users = $ac->users();

        foreach my $user (@users) {
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm
@@ -13,16 +13,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::DomainsDB::UTF8;
+use esmith::AccountsDB::UTF8;

-#use Data::Dumper;
-#use esmith::FormMagick::Panel::domains;
-use esmith::DomainsDB;
-use esmith::AccountsDB;
-
-#use URI::Escape;
-my ($ddb,$cdb,$adb);
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+our ($ddb,$cdb,$adb);
 our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);

 sub main {
@@ -30,9 +24,9 @@ sub main {
    $c->app->log->info($c->log_req);
    my %dom_datas = ();
    my $title     = $c->l('dom_FORM_TITLE');
-	$ddb = esmith::DomainsDB->open  || die "Couldn't open domains db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $dom_datas{trt} = 'LST';
    my @domains;

@@ -57,9 +51,9 @@ sub do_display {
    my $rt     = $c->current_route;
    my $trt    = $c->param('trt');
    my $domain = $c->param('Domain') || '';
-	$ddb = esmith::DomainsDB->open  || die "Couldn't open domains db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";

    #$trt = 'DEL' if ( $rt eq 'domaindel1' );
    #$trt = 'UPD' if ( $rt eq 'domainupd1' );
@@ -127,9 +121,9 @@ sub do_update {
    $c->app->log->info($c->log_req);
    my $rt        = $c->current_route;
    my $trt       = $c->param('trt');
-	$ddb = esmith::DomainsDB->open  || die "Couldn't open domains db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    my %dom_datas = ();
    my ($res, $result) = '';

@@ -246,6 +240,7 @@ sub create_modify_domain {
                . ' Ctl'
        );
    } ## end unless ($domain)
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
    my $rec = $ddb->get($domain);

    if ($rec and $action eq 'create') {
@@ -375,6 +370,7 @@ sub nameserver_options_list {

 sub get_nameserver_value {
    my $c = shift;
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
    my $domain = $c->param('Domain') || undef;
    return ($ddb->get_prop($domain, 'Nameservers') || 'internet');
 } ## end sub get_nameserver_value
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm
+++ b/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
@@ -16,16 +16,18 @@ use constant TRUE  => 1;
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session ip_number_or_blank);
-use esmith::ConfigDB;
-use esmith::AccountsDB;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use esmith::util;
 use File::Basename;
-our $pattern_db = esmith::ConfigDB->open("mailpatterns");
-our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+our $pattern_db;
+our $cdb;

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
+    $pattern_db = esmith::ConfigDB::UTF8->open("mailpatterns");
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my %mai_datas = ();
    my $title     = $c->l('mai_FORM_TITLE');
    $mai_datas{'trt'} = 'LIST';
@@ -42,7 +44,7 @@ sub do_display {
    my $title     = $c->l('mai_FORM_TITLE');
    my ($notif, $dest) = '';
    $mai_datas{'trt'} = $trt;
-    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";

    if ($trt eq 'ACC') {
        $dest = 'emailaccess';
@@ -94,7 +96,7 @@ sub do_update {
    my $trt       = $c->param('trt');
    my %mai_datas = ();
    $mai_datas{trt} = $trt;
-    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my $title = $c->l('mai_FORM_TITLE');
    my ($dest, $res, $result) = '';

@@ -231,7 +233,7 @@ sub get_patterns_status {
 sub adjust_patterns {
    my $c        = shift;
    my @selected = @{ $c->every_param('BlockExecutableContent') };
-
+    $pattern_db = esmith::ConfigDB::UTF8->open("mailpatterns");
    foreach my $pattern ($pattern_db->get_all_by_prop(type => "pattern")) {
        my $status
            = (grep $pattern->key eq $_, @selected)
@@ -284,7 +286,7 @@ sub get_current_imap_access {
 sub get_current_smtp_ssl_auth {
    my ($c, $localise, $soru, $debug) = @_;
    die "Error: \$soru must be either 's' or 'u':$soru.\n" unless $soru eq 's' || $soru eq 'u';
-    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";

    # Initialize variables with default values
    my $smtpStatus = 'none';
@@ -485,7 +487,7 @@ sub get_retrieval_opt {

 sub get_emailunknownuser_options {
    my $c                = shift;
-    my $accounts         = esmith::AccountsDB->open_ro();
+    my $accounts         = esmith::AccountsDB::UTF8->open_ro();
    my %existingAccounts = (
        'admin'          => $c->l("mai_FORWARD_TO_ADMIN"),
        'returntosender' => $c->l("mai_RETURN_TO_SENDER")
@@ -503,7 +505,7 @@ sub get_emailunknownuser_options {

 sub get_emailunknownuser_opt {
    my $c        = shift;
-    my $accounts = esmith::AccountsDB->open_ro();
+    my $accounts = esmith::AccountsDB::UTF8->open_ro();
    my @existingAccounts
        = ([ $c->l("mai_FORWARD_TO_ADMIN") => 'admin' ], [ $c->l("mai_RETURN_TO_SENDER") => 'returntosender' ]);

@@ -580,14 +582,13 @@ sub display_multidrop {

 sub change_settings_reception {
    my $c = shift;
-    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    $cdb = esmith::ConfigDBi::UTF8->open || die "Couldn't open config db";
    my $FetchmailMethod      = ($c->param('FetchmailMethod') || 'standard');
    my $FetchmailFreqOffice  = ($c->param('FreqOffice')      || 'every15min');
    my $FetchmailFreqOutside = ($c->param('FreqOutside')     || 'everyhour');
    my $FetchmailFreqWeekend = ($c->param('FreqWeekend')     || 'everyhour');
    my $SpecifyHeader        = ($c->param('SpecifyHeader')   || 'off');
-    my $fetchmail
-        = $cdb->get('fetchmail') || $cdb->new_record("fetchmail", { type => "service", status => "disabled" });
+    my $fetchmail = $cdb->get('fetchmail') || $cdb->new_record("fetchmail", { type => "service", status => "disabled" });

    if ($FetchmailMethod eq 'standard') {
        $fetchmail->set_prop('status', 'disabled');
@@ -662,7 +663,7 @@ sub change_settings_reception {

 sub change_settings_delivery {
    my ($c) = shift;
-    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my $EmailUnknownUser = ($c->param('EmailUnknownUser') || 'returntosender');
    $cdb->set_value('SMTPSmartHost',      $c->param('SMTPSmartHost'));
    $cdb->set_value('DelegateMailServer', $c->param('DelegateMailServer'));
@@ -683,7 +684,7 @@ sub change_settings_delivery {

 sub change_settings_access {
    my $c = shift;
-    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my $pop3Access = ($c->param('POPAccess') || 'private');

    if ($pop3Access eq 'disabled') {
@@ -757,7 +758,7 @@ sub change_settings_access {

 sub change_settings_filtering {
    my $c = shift;
-    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my $virus_status = ($c->param('VirusStatus') || 'disabled');
    $cdb->set_prop("qpsmtpd", 'VirusScan', $virus_status);

--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm
@@ -14,21 +14,18 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::AccountsDB::UTF8;
+use esmith::ConfigDB::UTF8;

-#use Data::Dumper;
-#use esmith::FormMagick::Panel::groups;
-use esmith::AccountsDB;
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-my ($cdb,$adb);
+our ($cdb,$adb);

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
    my %grp_datas = ();
    my $title     = $c->l('grp_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $grp_datas{trt} = 'LST';
    my @groups;

@@ -47,8 +44,8 @@ sub do_display {
    my $group     = $c->param('group');
    my %grp_datas = ();
    my $title     = $c->l('grp_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $grp_datas{'trt'} = $trt;

    if ($trt eq 'ADD') {
@@ -104,8 +101,8 @@ sub do_update {
    my $title     = $c->l('grp_FORM_TITLE');
    my ($res, $result) = '';
    my %grp_datas = ();
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $grp_datas{'trt'}   = $trt;
    $grp_datas{'group'} = $groupName;
    my @members = ();
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm
@@ -14,22 +14,14 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-
-#use Data::Dumper;
-#use esmith::FormMagick::Panel::hostentries;
-use esmith::DomainsDB;
-use esmith::AccountsDB;
-use esmith::HostsDB;
-use esmith::NetworksDB;
 use HTML::Entities;
 use Net::IPv4Addr qw(ipv4_in_network);
+use esmith::DomainsDB::UTF8;
+use esmith::ConfigDB::UTF8;
+use esmith::HostsDB::UTF8;
+use esmith::NetworksDB::UTF8;

-#use URI::Escape;
-#our $ddb = esmith::DomainsDB->open  || die "Couldn't open hostentries db";
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-#our $ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
-my ($ddb,$cdb,$hdb,$ndb);
+our ($ddb,$cdb,$hdb,$ndb);

 sub main {
    my $c = shift;
@@ -37,10 +29,9 @@ sub main {
    my %hos_datas = ();
    my $title     = $c->l('hos_FORM_TITLE');
    my $notif     = '';
-	#my $ddb = esmith::DomainsDB->open  || die "Couldn't open hostentries db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-	$ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $hdb = esmith::HostsDB::UTF8->open    || die "Couldn't open hosts db";
+    $ndb = esmith::NetworksDB::UTF8->open || die "Couldn't open networks db";
    $hos_datas{trt} = 'LIST';
    my %dom_hosts = ();

@@ -73,9 +64,9 @@ sub do_display {
    $trt = 'LST' if ($trt ne 'DEL' && $trt ne 'UPD' && $trt ne 'ADD');
    my %hos_datas = ();
    my $title     = $c->l('hos_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-	$ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $hdb = esmith::HostsDB::UTF8->open    || die "Couldn't open hosts db";
+    $ndb = esmith::NetworksDB::UTF8->open || die "Couldn't open networks db";
    my $notif     = '';
    $hos_datas{'trt'} = $trt;

@@ -120,9 +111,9 @@ sub do_update {
    my $trt       = ($c->param('trt') || 'LIST');
    my %hos_datas = ();
    my $title     = $c->l('hos_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-	$ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $hdb = esmith::HostsDB::UTF8->open    || die "Couldn't open hosts db";
+    $ndb = esmith::NetworksDB::UTF8->open || die "Couldn't open networks db";
    my $notif     = '';
    my $result    = '';
    $hos_datas{'name'}       = lc $c->param('Name');
@@ -379,10 +370,10 @@ sub delete_hostentry {
 } ## end sub delete_hostentry

 sub domains_list {
-    my $d = esmith::DomainsDB->open_ro() or die "Couldn't open DomainsDB";
+    $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');
    }
@@ -516,7 +507,7 @@ sub must_be_local {
    my $localip = shift;

    # Make sure that the IP is indeed local.
-    #my $ndb = esmith::NetworksDB->open_ro;
+    #$ndb = esmith::NetworksDB::UTF8->open_ro;
    my @local_list = $ndb->local_access_spec;

    foreach my $spec (@local_list) {
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm
@@ -14,12 +14,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw( theme_list init_session validate_password );
-use esmith::AccountsDB;
-use esmith::ConfigDB;
-use esmith::DomainsDB;
+use esmith::AccountsDB::UTF8;
+use esmith::ConfigDB::UTF8;
+use esmith::DomainsDB::UTF8;

-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-#our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
 my ($adb,$cdb);

 sub main {
@@ -27,9 +25,9 @@ sub main {
    $c->app->log->info($c->log_req);
    my %iba_datas = ();
    my $title     = $c->l('iba_FORM_TITLE');
-    $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$iba_datas{'trt'} = 'LIST';
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+    $iba_datas{'trt'} = 'LIST';
    my @ibays;

    if ($adb) {
@@ -44,8 +42,8 @@ sub do_display {
    my $rt   = $c->current_route;
    my $trt  = ($c->param('trt') || 'LIST');
    my $ibay = $c->param('ibay') || '';
-    $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";

    #$trt = 'DEL' if ( $ibay );
    #$trt = 'ADD' if ( $rt eq 'ibayadd' );
@@ -99,7 +97,7 @@ sub do_display {

    if ($trt eq 'LIST') {
        my @ibays;
-        $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+        $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";

        if ($adb) {
            @ibays = $adb->ibays();
@@ -120,8 +118,8 @@ sub do_update {
    $iba_datas{'trt'} = $trt;
    my $result = '';
    my $res;
-    $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";

    if ($trt eq 'ADD') {
        my $name = ($c->param('ibay') || '');
@@ -306,7 +304,7 @@ sub print_vhost_message {
    my $c              = shift;
    my $name           = $c->param('ibay');
    my $result         = '';
-    my $domaindb       = esmith::DomainsDB->open();
+    my $domaindb       = esmith::DomainsDB::UTF8->open();
    my @domains        = $domaindb->get_all_by_prop(Content => $name);
    my $vhostListItems = join "\n", (map ($_->key . " " . $_->prop('Description'), @domains));

@@ -328,7 +326,7 @@ sub remove_ibay {
    if (my $acct = $adb->get($name)) {
        if ($acct->prop('type') eq 'ibay') {
            $acct->set_prop('type', 'ibay-deleted');
-            my $domains_db = esmith::DomainsDB->open();
+            my $domains_db = esmith::DomainsDB::UTF8->open();
            my @domains = $domains_db->get_all_by_prop(Content => $name);

            foreach my $d (@domains) {
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
@@ -13,13 +13,12 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session subnet_mask get_reg_mask ip_number);
-
-#use Data::Dumper;
 use esmith::util;
-use esmith::HostsDB;
-#my $network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
+use esmith::HostsDB::UTF8;
+use esmith::NetworksDB::UTF8;
+use esmith::ConfigDB::UTF8;
 my $ret = "OK";
-my ($network_db);
+our ($network_db,$config_db);

 sub main {
    my $c = shift;
@@ -27,7 +26,7 @@ sub main {
    my %ln_datas = ();
    $ln_datas{return} = "";
    my $title = $c->l('ln_LOCAL NETWORKS');
-	$network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
+    $network_db = esmith::NetworksDB::UTF8->open() || die("Couldn't open networks db");
    my $modul = '';
    $ln_datas{trt} = 'LIST';
    my @localnetworks;
@@ -49,7 +48,7 @@ sub do_display {
    $c->app->log->info($c->log_req);
    my $rt = $c->current_route;
    my $trt = ($c->param('trt') || 'LIST');
-	$network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
+    $network_db = esmith::NetworksDB::UTF8->open() || die("Couldn't open networks db");
    $trt = 'DEL'  if ($rt eq 'localnetworksdel');
    $trt = 'ADD'  if ($rt eq 'localnetworksadd');
    $trt = 'ADD1' if ($rt eq 'localnetworksadd1');
@@ -77,14 +76,14 @@ sub do_display {
            #Error - return to Add page
            $trt = "ADD";
        }
-        $network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-3");    #Refresh the network DB
+	#$network_db = esmith::NetworksDB::UTF8->open() || die("Failed to open Networkdb-3");    #Refresh the network DB
        $c->stash(ret => \%ret);    #stash it away for the template
    } ## end if ($trt eq 'ADD1')

    if ($trt eq 'DEL1') {

        #After Remove clicked on Delete network panel
-        $network_db   = esmith::NetworksDB->open() || die("Failed to open Networkdb-1");
+	#$network_db   = esmith::NetworksDB::UTF8->open() || die("Failed to open Networkdb-1");
        my $localnetwork = $c->param("localnetwork");
        my $delete_hosts = $c->param("deletehost") || "1";                                    #default to deleting them.
        my $rec = $network_db->get($localnetwork) || die("Failed to find network on db:$localnetwork");
@@ -93,7 +92,7 @@ sub do_display {
            $ln_datas{localnetwork} = $localnetwork;
        }
        my %ret = remove_network($localnetwork, $delete_hosts);
-        $network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-2");        #Refresh the network DB
+	#$network_db = esmith::NetworksDB::UTF8->open() || die("Failed to open Networkdb-2");        #Refresh the network DB
        my @localnetworks;

        if ($network_db) {
@@ -138,7 +137,7 @@ sub do_display {

 sub remove_network {
    my $network      = shift;
-    $network_db   = esmith::NetworksDB->open();
+    $network_db   = esmith::NetworksDB::UTF8->open();
    my $record       = $network_db->get($network);
    my $delete_hosts = shift;

@@ -174,7 +173,7 @@ sub hosts_on_network {
    my $netmask = shift;
    die if not $network and $netmask;
    my $cidr             = "$network/$netmask";
-    my $hosts            = esmith::HostsDB->open() || die("Couldn't open hosts db");
+    my $hosts            = esmith::HostsDB::UTF8->open() || die("Couldn't open hosts db");
    my @localhosts       = grep { $_->prop('HostType') eq 'Local' } $hosts->hosts;
    my @hosts_on_network = ();

@@ -207,9 +206,9 @@ sub add_network {

    # we transform bit mask to regular mask
    $networkMask = get_reg_mask($networkAddress, $networkMask);
-    my $network_db = esmith::NetworksDB->open()
-        || esmith::NetworksDB->create();
-    my $config_db    = esmith::ConfigDB->open();
+    my $network_db = esmith::NetworksDB::UTF8->open()
+        || esmith::NetworksDB::UTF8->create();
+    my $config_db    = esmith::ConfigDB::UTF8->open();
    my $localIP      = $config_db->get('LocalIP');
    my $localNetmask = $config_db->get('LocalNetmask');
    my ($localNetwork, $localBroadcast)
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Login;
 #----------------------------------------------------------------------
 # heading     : Support
 # description : Login
-# navigation  : 0000 001
+# navigation  : 0 200
 # menu        : N
 #
 # routes : end
@@ -18,7 +18,7 @@ use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
-use esmith::AccountsDB;
+use esmith::AccountsDB::UTF8;
 use SrvMngr::I18N;
 use SrvMngr::Model::Main;
 use SrvMngr qw( theme_list init_session );
@@ -26,7 +26,7 @@ my $MAX_LOGIN_ATTEMPTS   = 3;
 my $DURATION_BLOCKED     = 30 * 60;        # access blocked for 30 min
 my $TIMEOUT_FAILED_LOGIN = 1;
 my $RESET_DURATION       = 2 * 60 * 60;    # 2 hours for resetting
-our $adb = esmith::AccountsDB->open() or die "Couldn't open DB Accounts\n";
+our $adb;
 my $allowed_user_re = qr/^\w{5,10}$/;
 my %Login_Attempts;

@@ -39,6 +39,7 @@ sub main {
 sub login {
    my $c   = shift;
    my $trt = $c->param('Trt');
+    $adb = esmith::AccountsDB::UTF8->open() or die "Couldn't open DB Accounts\n";

    # password reset request
    if ($trt eq 'RESET') {
@@ -85,13 +86,13 @@ sub login {
        $c->session(logged_in => 1);        # set the logged_in flag
        $c->session(username  => $name);    # keep a copy of the username

-        #    if ( $name eq 'admin' || $adb->is_user_in_group($name, 'AdmiN') )  # for futur use
+        #    if ( $name eq 'admin' || $adb->is_user_in_group($name, 'Admin') )  # for futur use
        if ($name eq 'admin') {
            $c->session(is_admin => 1);
        } else {
            $c->session(is_admin => 0);
        }
-        $c->session(expiration => 600);     # expire this session in 10 minutes
+        $c->session(expiration => $c->config->{timeout} );     # expire this session in the time set  in config
        $c->flash(success => $c->l('use_WELCOME'));
        record_login_attempt($c, 'SUCCESS');
    } else {
@@ -114,6 +115,7 @@ sub mail_rescue {
    my $c    = shift;
    my $name = $c->param('Username');
    my $from = $c->param('From');
+    $adb = esmith::AccountsDB::UTF8->open() or die "Couldn't open DB Accounts\n";
    my $res;
    $res .= $c->l('use_TOO_MANY_LOGIN') if (is_denied($c));

--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm
+++ b/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
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Manual;
 #----------------------------------------------------------------------
 # heading     : Support
 # description : Online manual
-# navigation  : 0000 100
+# navigation  : 0 300
 # menu        : N
 #
 # routes : end
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
@@ -13,14 +13,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-
 #use Regexp::Common qw /net/;
-#use Data::Dumper;
 use esmith::util;
-use esmith::HostsDB;
-#our $db = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
-#our $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
-#our $udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+use esmith::ConfigDB::UTF8; 
+
 my ($cdb,$tcp_db,$udp_db);

 my %ret = ();
@@ -34,9 +30,9 @@ sub main {
    $pf_datas{return} = "";
    my $title = $c->l('pf_FORM_TITLE');
    my $modul = '';
-	$cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
-	$tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
-	$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
+    $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+    $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
    $pf_datas{trt} = 'LIST';
    my @tcpforwards = $tcp_db->get_all;
    my @udpforwards = $udp_db->get_all;
@@ -57,9 +53,9 @@ sub do_display {
    $c->app->log->info($c->log_req);
    my $rt = $c->current_route;
    my $trt = ($c->param('trt') || 'LIST');
-	my $cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
-	my $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
-	my $udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+    my $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
+    my $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+    my $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
    $trt = 'DEL'  if ($rt eq 'portforwardingdel');
    $trt = 'ADD'  if ($rt eq 'portforwardingadd');
    $trt = 'ADD1' if ($rt eq 'portforwardingadd1');
@@ -142,6 +138,10 @@ sub do_display {
    if ($trt eq 'LIST') {

        #List all the port forwards
+        # Open them again as maybe written to above 
+        $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+        $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+
        my @tcpforwards = $tcp_db->get_all;
        my @udpforwards = $udp_db->get_all;
        my $empty       = 1 if not @tcpforwards and not @udpforwards;
@@ -168,10 +168,10 @@ sub add_portforward {
    my $fdb;

    if ($proto eq 'TCP') {
-        $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+        $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
        $fdb = $tcp_db;
    } else {
-        $udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+        $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
        $fdb = $udp_db;
    }

@@ -211,6 +211,7 @@ sub add_portforward {

 sub get_destination_host {
    my $q           = shift;
+    $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
    my $dhost       = $q->param("dhost");
    my $localip     = $cdb->get_prop('InternalInterface', 'IPAddress');
    my $external_ip = $cdb->get_prop('ExternalInterface', 'IPAddress') || $localip;
@@ -357,6 +358,7 @@ sub isValidPort() {

 sub validate_destination_host {
    my $c     = shift;
+    $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
    my $dhost = $c->param('dhost');
    $dhost =~ s/^\s+|\s+$//g;
    my $localip = $cdb->get_prop('InternalInterface', 'IPAddress');
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm
@@ -14,15 +14,15 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-my $adb;
+use esmith::AccountsDB::UTF8;
+our $adb;

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
    my %prt_datas = ();
    my $title     = $c->l('prt_FORM_TITLE');
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $prt_datas{'trt'} = 'LIST';
    my @printerDrivers;

@@ -38,7 +38,7 @@ sub do_display {
    my $rt      = $c->current_route;
    my $trt     = ($c->param('trt') || 'LIST');
    my $printer = $c->param('printer') || '';
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";

    #$trt = 'DEL' if ( $printer );
    #$trt = 'ADD' if ( $rt eq 'printeradd' );
@@ -79,7 +79,7 @@ sub do_update {
    my $trt       = ($c->param('trt') || 'LIST');
    my %prt_datas = ();
    my $title     = $c->l('prt_FORM_TITLE');
-   	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $prt_datas{'trt'} = $trt;
    my ($res, $result) = '';

--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Proxy;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Proxy settings
-# navigation  : 4000 710
+# navigation  : 4000 200
 #----------------------------------------------------------------------
 #
 # routes : end
@@ -14,11 +14,14 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-our $db = esmith::ConfigDB->open || die "Couldn't open config db";
+use esmith::ConfigDB::UTF8;
+
+our $db;

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my %prx_datas = ();
    my $title     = $c->l('prx_TITLE');
    my $modul     = $c->render_to_string(inline => $c->l('prx_FIRST_PAGE_DESCRIPTION'));
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm
+++ b/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
@@ -14,15 +14,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::AccountsDB::UTF8;
+use esmith::DomainsDB::UTF8;

-#use Data::Dumper;
-#use esmith::FormMagick::Panel::pseudonyms;
-use esmith::AccountsDB;
-
-#use URI::Escape;
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-my ($cdb,$adb);
+our ($cdb,$adb);

 sub main {
    my $c = shift;
@@ -32,8 +27,7 @@ sub main {
    my $notif     = '';
    $pse_datas{trt} = 'LST';
    my @pseudonyms;
-	#$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";

    if ($adb) {
        @pseudonyms = $adb->pseudonyms();
@@ -50,8 +44,7 @@ sub do_display {
    my $pseudonym = $c->param('pseudonym') || '';
    my $title     = $c->l('pse_FORM_TITLE');
    my %pse_datas = ();
- 	#$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 	$pse_datas{'trt'} = $trt;

    if ($trt eq 'ADD') {
@@ -97,8 +90,7 @@ sub do_update {
    my $rt        = $c->current_route;
    my $trt       = ($c->param('trt') || 'LST');
    my $title     = $c->l('pse_FORM_TITLE');
-   	#$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    my %pse_datas = ();
    $pse_datas{'trt'} = $trt;
    my ($res, $result) = '';
@@ -331,8 +323,7 @@ sub validate_new_pseudonym_name {
    if (defined $acct) {
        return ($c->l('pse_NAME_IN_USE'));
    } elsif ($pseudonym =~ /@/) {
-        use esmith::DomainsDB;
-        my $ddb = esmith::DomainsDB->open_ro
+        my $ddb = esmith::DomainsDB::UTF8->open_ro
            or die "Couldn't open DomainsDB\n";
        my ($lhs, $rhs) = split /@/, $pseudonym;
        return ($c->l('pse_PSEUDONYM_INVALID_DOMAIN')) unless ($ddb->get($rhs));
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
+++ b/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
@@ -16,8 +16,8 @@ use Scalar::Util qw(looks_like_number);
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::AccountsDB::UTF8;

-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
 my $adb;

 sub main {
@@ -25,7 +25,7 @@ sub main {
    $c->app->log->info($c->log_req);
    my %quo_datas = ();
    my $title     = $c->l('quo_FORM_TITLE');
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $quo_datas{'trt'} = 'LIST';
    my @userAccounts;

@@ -44,7 +44,7 @@ sub do_display {
    $trt = 'UPD' if ($user);
    my %quo_datas = ();
    my $title     = $c->l('quo_FORM_TITLE');
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $quo_datas{'trt'} = $trt;

    if ($trt eq 'UPD') {
@@ -73,7 +73,7 @@ sub do_update {
    $quo_datas{trt} = $trt;
    my $result = '';
    my $res;
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";

    if ($trt eq 'UPD') {
        $quo_datas{user}    = ($c->param('user') || '');
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
@@ -14,7 +14,7 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session ip_number subnet_mask get_reg_mask);
-use esmith::ConfigDB;
+use esmith::ConfigDB::UTF8;
 use esmith::util;
 use File::Basename;
 use Exporter;
@@ -30,7 +30,7 @@ our @EXPORT = qw( networkAccess_list passwordLogin_list get_ssh_permit_root_logi
 );

 #		get_pptp_sessions
-our $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+our  $db; 

 sub main {
    my $c = shift;
@@ -38,7 +38,7 @@ sub main {
    my $title     = $c->l('rma_FORM_TITLE');
    my $notif     = '';
    my %rma_datas = ();
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";

    #$rma_datas{ipsecrwSess}  = $c->get_ipsecrw_sessions();
    #$rma_datas{pptpSessions} = $c->get_pptp_sessions();
@@ -60,7 +60,7 @@ sub do_action {
    my $title = $c->l('rma_FORM_TITLE');
    my ($result, $res, $trt) = '';
    my %rma_datas = ();
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    $rma_datas{ipsecrwSess}  = ($c->param('IpsecrwSess')  || '');
    $rma_datas{ipsecrwReset} = ($c->param('IpsecrwReset') || '');

@@ -134,7 +134,7 @@ sub networkAccess_list {
    return [
        [ $c->l('rma_NO_ACCESS')         => 'off' ],
        [ $c->l('NETWORKS_ALLOW_LOCAL')  => 'private' ],
-        [ $c->l('NETWORKS_ALLOW_PUBLIC') => 'normal' ]
+        [ $c->l('NETWORKS_ALLOW_PUBLIC') => 'public' ]
    ];
 } ## end sub networkAccess_list

@@ -144,6 +144,7 @@ sub passwordLogin_list {
 }

 sub get_prop {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    my ($c, $item, $prop) = @_;
    warn "You must specify a record key"    unless $item;
    warn "You must specify a property name" unless $prop;
@@ -154,6 +155,7 @@ sub get_prop {
 sub get_value {
    my $c    = shift;
    my $item = shift;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    return ($db->get($item)->value());
 } ## end sub get_value

@@ -179,8 +181,8 @@ sub get_ssh_password_auth {
 }

 sub get_ssh_access {
-    my $status = get_prop('', 'sshd', 'status');
-
+	my $c = shift;
+    my $status = $c->get_prop('sshd', 'status');
    if (defined($status) && ($status eq 'enabled')) {
        my $access = get_prop('', 'sshd', 'access');
        $access = ($access eq 'public') ? 'public' : 'private';
@@ -202,6 +204,7 @@ sub get_ftp_password_login_access {
 } ## end sub get_ftp_password_login_access

 sub get_telnet_mode {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    my $telnet = $db->get('telnet');
    return ('off') unless $telnet;
    my $status = $telnet->prop('status') || 'disabled';
@@ -211,8 +214,8 @@ sub get_telnet_mode {
 } ## end sub get_telnet_mode

 sub get_ipsecrw_sessions {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    my $status = $db->get('ipsec')->prop('RoadWarriorStatus');
-
    if (defined($status) && ($status eq 'enabled')) {
        return ($db->get('ipsec')->prop('RoadWarriorSessions') || '0');
    } else {
@@ -221,6 +224,7 @@ sub get_ipsecrw_sessions {
 } ## end sub get_ipsecrw_sessions

 sub get_ipsecrw_status {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    return undef unless ($db->get('ipsec'));
    return $db->get('ipsec')->prop('RoadWarriorStatus');
 }
@@ -228,6 +232,7 @@ sub get_ipsecrw_status {
 sub pptp_and_dhcp_range {
    my $c           = shift;
    my $val         = shift || 0;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    my $dhcp_status = $db->get_prop('dhcpd', 'status') || 'disabled';
    my $dhcp_end    = $db->get_prop('dhcpd', 'end') || '';
    my $dhcp_start  = $db->get_prop('dhcpd', 'start') || '';
@@ -245,6 +250,7 @@ sub pptp_and_dhcp_range {

 sub _get_valid_from {
    my $c   = shift;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    my $rec = $db->get('httpd-admin');
    return undef unless ($rec);
    my @vals = (split ',', ($rec->prop('ValidFrom') || ''));
@@ -287,12 +293,12 @@ sub validate_network_and_mask {

 sub change_settings {
    my ($c, %rma_datas) = @_;
-
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    #------------------------------------------------------------
    # good; go ahead and change the access.
    #------------------------------------------------------------
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    my $rec = $db->get('telnet');
-
    if ($rec) {
        if ($rma_datas{telnetAccess} eq "off") {
            $rec->set_prop('status', 'disabled');
@@ -363,7 +369,7 @@ sub change_settings {
 sub set_ipsecrw_sessions {
    my $c        = shift;
    my $sessions = shift;
-
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    if (defined $sessions) {
        $db->get('ipsec')->set_prop('RoadWarriorSessions', $sessions);

@@ -378,6 +384,7 @@ sub add_new_valid_from {
    my $c    = shift;
    my $net  = shift;
    my $mask = shift;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";

    # we transform bit mask to regular mask
    $mask = get_reg_mask($net, $mask);
@@ -400,6 +407,7 @@ sub remove_valid_from {
    my $c           = shift;
    my $remove_nets = shift;
    my @remove      = split /,/, $remove_nets;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";

    #	my @remove = $c->param('Remove_nets');
    my @vals = $c->_get_valid_from();
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Request.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Request.pm
@@ -8,6 +8,8 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::ConfigDB::UTF8 qw(open_ro);
+use esmith::AccountsDB::UTF8 qw(open_ro);

 # retrieve a configuration db record
 sub getconfig {
@@ -16,8 +18,7 @@ sub getconfig {
    $c->app->log->info($c->log_req . ' ' . $key);

    if ($key) {
-        use esmith::ConfigDB qw(open_ro);
-        my $cdb = esmith::ConfigDB->open_ro;
+        my $cdb = esmith::ConfigDB::UTF8->open_ro;
        return getdb($c, $cdb, $key);
    } ## end if ($key)
 } ## end sub getconfig
@@ -29,8 +30,7 @@ sub getaccount {
    $c->app->log->info($c->log_req . ' ' . $key);

    if ($key) {
-        use esmith::AccountsDB qw(open_ro);
-        my $adb = esmith::AccountsDB->open_ro;
+        my $adb = esmith::AccountsDB::UTF8->open_ro;
        return getdb($c, $adb, $key);
    } ## end if ($key)
 } ## end sub getaccount
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
@@ -1,16 +1,11 @@
 package SrvMngr::Controller::Review;

 #----------------------------------------------------------------------
-# heading     : Support
+# heading     : Investigation
 # description : Review configuration
-# navigation  : 000 500
-# menu        : N
+# navigation  : 7000 400
 # routes : end
 #----------------------------------------------------------------------
-# heading-o     : Configuration
-# description-o : Review configuration
-# navigation-o  : 6000 6800
-#----------------------------------------------------------------------
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
@@ -18,17 +13,20 @@ use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 use SrvMngr qw(gen_locale_date_string);
-
+use esmith::ConfigDB::UTF8;
+use esmith::DomainsDB::UTF8;
+use esmith::NetworksDB::UTF8;

 #use SrvMngr::Review_sub qw(print_page);
 #use smeserver::Panel::review;
-our $db       = esmith::ConfigDB->open_ro   || die "Couldn't open config db";
-our $domains  = esmith::DomainsDB->open_ro  || die "Couldn't open domains";
-our $networks = esmith::NetworksDB->open_ro || die "Couldn't open networks";
+our $db;
+our $domains ;
+our $networks;

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
+    $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
    my $title     = $c->l('rvw_FORM_TITLE');
    my $modul     = $c->render_to_string(inline => $c->l('rvw_DESCRIPTION'));
    my %rvw_datas = ();
@@ -102,6 +100,7 @@ sub gen2_email_addresses {

 sub gen2_domains {
    my $c          = shift;
+    $domains  = esmith::DomainsDB::UTF8->open_ro  || die "Couldn't open domains";
    my @virtual    = $domains->get_all_by_prop(type => 'domain');
    my $numvirtual = @virtual;

@@ -130,6 +129,7 @@ serving.	(mojo ver)

 sub get2_local_networks {
    my $c           = shift;
+    $networks = esmith::NetworksDB::UTF8->open_ro || die "Couldn't open networks";
    my @nets        = $networks->get_all_by_prop('type' => 'network');
    my $numNetworks = @nets;

@@ -156,7 +156,7 @@ sub get_net_prop {
  my $fm = shift;
  my $item = shift;
  my $prop = shift;
-
+  $networks = esmith::NetworksDB::UTF8->open_ro || die "Couldn't open networks";
  my $record = $networks->get($item);
  if ($record) {
    return $record->prop($prop);
@@ -170,7 +170,7 @@ sub get_net_prop {

 sub get_local_networks {
    my $fm = shift;
-
+    $networks = esmith::NetworksDB::UTF8->open_ro || die "Couldn't open networks";
    my @nets = $networks->get_all_by_prop('type' => 'network');

    my $numNetworks = @nets;
@@ -270,6 +270,7 @@ sub print2_dhcp_stanza {
 sub get_value {
  my $fm = shift;
  my $item = shift;
+  $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
  my $record = $db->get($item);
  if ($record) {
    return $record->value();
@@ -286,7 +287,7 @@ sub get_prop {
 				 #otherwise, we don't want to grab it
  my $item = shift;
  my $prop = shift;
-
+  $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
  my $record = $db->get($item);
  if ($record) {
    return $record->prop($prop);
@@ -300,6 +301,7 @@ sub get_prop {
 sub get_public_ip_address
 {
    my $self = shift;
+    $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
    my $sysconfig = $db->get('sysconfig');
    if ($sysconfig)
    {
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
@@ -1,9 +1,9 @@
 package SrvMngr::Controller::Roundcubepanel;

 #----------------------------------------------------------------------
-# heading     : System
+# heading     : Network
 # description : Webmail
-# navigation  : 99999 9999
+# navigation  : 6000 900
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # name   : roundcubepanel,    method : get,   url : /roundcubepanel,     ctlact : Roundcubepanel#main
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
@@ -3,7 +3,7 @@ package  SrvMngr::Controller::Support;
 #----------------------------------------------------------------------
 # heading     : Support
 # description : Support and licensing
-# navigation  : 0000 200
+# navigation  : 0 400
 # menu        : N
 #
 # routes : end
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm
@@ -5,19 +5,18 @@ package SrvMngr::Controller::Swttheme;
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
-
+use esmith::ConfigDB::UTF8;
 #use SrvMngr qw(theme_list init_session);
-our $db = esmith::ConfigDB->open() || die "Couldn't open config db";

 sub main {
    my $c     = shift;
+    my $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
    my $from  = $c->param('From') || '/';
    my $theme = $c->param('Theme');
    $c->app->log->info(" swt theme '$from'  '$theme' ");
    my $oldTheme = $c->session->{CurrentTheme};

    if ($theme ne $oldTheme) {
-
        #	$c->app->renderer->paths([$c->app->home->rel_file('themes/default/templates')]);
        #	$c->app->static->paths([$c->app->home->rel_file('themes/default/public')]);
        #	if ( $theme ne 'default' ) {
@@ -31,7 +30,7 @@ sub main {
        system("/sbin/e-smith/signal-event smanager-theme-change") == 0
            or warn "$c->l('ERROR_UPDATING')";
    } ## end if ($theme ne $oldTheme)
-## (not sure)     $c->flash( warning => $c->l('swt_LOGIN_AGAIN') );
+    ## (not sure)     $c->flash( warning => $c->l('swt_LOGIN_AGAIN') );
    $from = '/initial'  if $from eq '/';
    $from = '/' . $from if ($from !~ m|^\/|);
    $c->redirect_to($from);
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
@@ -15,28 +15,20 @@ use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session
    validate_password email_simple);
-
-#use esmith::FormMagick qw( validate_password );
-#use CGI::FormMagick::Validator qw( call_fm_validation );
-use esmith::AccountsDB;
-use esmith::ConfigDB;
+use esmith::AccountsDB::UTF8;
+use esmith::ConfigDB::UTF8;
 use esmith::util;

-#use esmith::FormMagick;
-#use esmith::cgi;
 #use File::Basename;
 #use Exporter;
 #use Carp qw(verbose);
-#use esmith::FormMagick::Panel::useraccounts;
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-#our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
 my ($cdb,$adb);

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    my $notif     = '';
    my %usr_datas = ();
    my $title     = $c->l('usr_FORM_TITLE');
@@ -55,8 +47,8 @@ sub do_display {
    my %usr_datas = ();
    my $title     = $c->l('usr_FORM_TITLE');
    my ($notif, $modul) = '';
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    $usr_datas{'trt'} = $trt;

    if ($trt eq 'ADD') {
@@ -143,8 +135,8 @@ sub do_update {
    $usr_datas{trt} = $trt;
    my $title = $c->l('usr_FORM_TITLE');
    my ($res, $result) = '';
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";

    if ($trt eq 'ADD') {

@@ -363,10 +355,10 @@ sub lock_account {
        $user = $1;

        if (system("/sbin/e-smith/signal-event", "user-lock", $user)) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
            return $c->l("usr_ERR_OCCURRED_LOCKING");
        }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
        return 'OK';
    } else {
        return $c->l('NO_SUCH_USER', $user);
@@ -387,10 +379,10 @@ sub remove_account {
        $user = $1;

        if (system("/sbin/e-smith/signal-event", "user-delete", $user)) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
            return $c->l("ERR_OCCURRED_DELETING");
        }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
        $adb->get($user)->delete;
        return 'OK';
    } else {
@@ -406,7 +398,7 @@ sub reset_password {
        return $c->l('usr_TAINTED_USER');
    }
    $user = $1;
-	my $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	my $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
    my $acct = $adb->get($user);

    if ($acct->prop('type') eq "user") {
@@ -415,10 +407,10 @@ sub reset_password {
        undef $adb;

        if (system("/sbin/e-smith/signal-event", "password-modify", $user)) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
            return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
        }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
        return 'OK';
    } else {
        return $c->l('NO_SUCH_USER', $user);
@@ -671,10 +663,10 @@ sub modify_user {
        undef $adb;

        unless (system("/sbin/e-smith/signal-event", "user-modify", $acctName) == 0) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
            return $c->l('usr_CANNOT_MODIFY_USER');
        }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
    } ## end if ($acctType eq "user")
    return 'OK';
 } ## end sub modify_user
@@ -707,10 +699,10 @@ sub create_user {
    $acctName = $1;

    if (system("/sbin/e-smith/signal-event", "user-create", $acctName)) {
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
        return $c->l("usr_ERR_OCCURRED_CREATING");
    }
-    $adb = esmith::AccountsDB->open();
+    $adb = esmith::AccountsDB::UTF8->open();
    $c->set_groups();
    return 'OK';
 } ## end sub create_user
@@ -735,7 +727,7 @@ sub modify_admin {
    $acct->merge_props(%newProperties);
    undef $adb;
    my $status = system("/sbin/e-smith/signal-event", "user-modify-admin", 'admin');
-    $adb = esmith::AccountsDB->open();
+    $adb = esmith::AccountsDB::UTF8->open();

    if ($status == 0) {
        return 'OK';
@@ -759,8 +751,7 @@ sub system_validate_password {
 sub system_check_password {
    my $c     = shift;
    my $pass1 = shift;
-    use esmith::ConfigDB;
-    my $conf = esmith::ConfigDB->open();
+    my $conf = esmith::ConfigDB::UTF8->open();
    my ($check_type, $rec);

    if ($conf) {
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
@@ -12,12 +12,11 @@ use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
 use esmith::util;
-use esmith::ConfigDB;
-use esmith::AccountsDB;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw( theme_list init_session validate_password );
-#our $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";

 sub main {
    my $c         = shift;
@@ -161,7 +160,7 @@ sub reset_password {
    my $ret;
    return $c->l('usr_TAINTED_USER') unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/));
    $user = $1;
-    my $adb  = esmith::AccountsDB->open();
+    my $adb  = esmith::AccountsDB::UTF8->open();
    my $acct = $adb->get($user);
    return $c->l('NO_SUCH_USER', $user) unless ($acct->prop('type') eq 'user');
    $ret = esmith::util::setUserPasswordRequirePrevious($user, $oldpassword, $password) if $trt ne 'RESET';
@@ -171,10 +170,10 @@ sub reset_password {
    undef $adb;

    if (system("/sbin/e-smith/signal-event", "password-modify", $user)) {
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
        return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
    }
-    $adb = esmith::AccountsDB->open();
+    $adb = esmith::AccountsDB::UTF8->open();
    return 'OK';
 } ## end sub reset_password

@@ -194,7 +193,7 @@ sub check_password {
    my $c        = shift;
    my $password = shift;
    my $strength;
-   	my $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";
+    my $cdb = esmith::ConfigDB::UTF8->open_ro || die "Couldn't open configuration db";
    my $rec = $cdb->get('passwordstrength');
    $strength = ($rec ? ($rec->prop('Users') || 'none') : 'none');
    return validate_password($c, $strength, $password);
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
@@ -15,14 +15,15 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-use esmith::ConfigDB;
 use File::Basename;
 use HTML::Entities;
 use SrvMngr qw(gen_locale_date_string);
 use File::Temp qw(tempfile);
 use constant TRUE  => 1;
 use constant FALSE => 0;
-our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+use esmith::ConfigDB::UTF8;
+
+our $cdb;
 our @logfiles = ();    # with array

 sub main {
@@ -31,7 +32,9 @@ sub main {
    my %log_datas = ();
    my $title     = $c->l('log_FORM_TITLE');
    my $notif     = '';
-    $log_datas{default_op} = ($cdb->get('viewlogfiles')->prop('DefaultOperation')) || 'view';
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+    my $viewlog = $cdb->get('viewlogfiles');
+    $log_datas{default_op} = ($viewlog ? $viewlog->prop('DefaultOperation') : undef) || 'view';
    $c->stash(title => $title, notif => $notif, log_datas => \%log_datas);
    $c->render(template => 'viewlogfiles');
 } ## end sub main
@@ -230,6 +233,7 @@ sub showlogFile {
 sub download_logFile {
    my ($c, %log_datas) = @_;
    my $fullpath = "/var/log/$log_datas{filename}";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";

    # Save this information for later.
    $cdb->get('viewlogfiles')->merge_props('DefaultOperation', $log_datas{operation});
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
@@ -13,11 +13,13 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-our $db = esmith::ConfigDB->open || die "Couldn't open config db";
+use esmith::ConfigDB::UTF8;
+our $db ;

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my %wkg_datas = ();
    my $title     = $c->l('wkg_FORM_TITLE');
    my $modul     = '';
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm
+++ b/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
 #----------------------------------------------------------------------
@@ -13,28 +13,30 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session ip_number_or_blank);
-use esmith::ConfigDB;
+# dnf_* should remain ASCII; yum_repositories do not need to be UTF-8
+use esmith::ConfigDB::UTF8;
 use esmith::util;
 use File::Basename;
-our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+our $cdb;
 my $dnf_status_file = '/var/cache/dnf/dnf.status';

 #use File::stat;
 our %dbs;

 for (qw(available installed updates)) {
-    $dbs{$_} = esmith::ConfigDB->open_ro("dnf_$_")
+    $dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
        or die "Couldn't open dnf_$_ DB\n";
 }

 for (qw(repositories)) {
-    $dbs{$_} = esmith::ConfigDB->open("yum_$_")
+    $dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
        or die "Couldn't open yum_$_ DB\n";
 }

 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my %yum_datas = ();
    my $title     = $c->l('yum_FORM_TITLE');
    my $dest      = 'yum';
@@ -60,6 +62,7 @@ sub do_display {
    my $c         = shift;
    my $rt        = $c->current_route;
    my $trt       = ($c->param('trt') || 'STAT');
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my %yum_datas = ();
    my $title     = $c->l('yum_FORM_TITLE');
    my ($notif, $dest) = '';
--- a/root/usr/share/smanager/lib/SrvMngr/Model/Main.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Model/Main.pm
@@ -4,19 +4,19 @@ use strict;
 use warnings;
 use utf8;

-use esmith::ConfigDB;
-use esmith::AccountsDB;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use esmith::util;

 use Net::LDAP qw/LDAP_INVALID_CREDENTIALS/;
-
+our ($cdb,$adb);


 sub init_data {

    my %datas = ();

-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Config DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Config DB");
    my $sysconfig = $cdb->get("sysconfig");

    $datas{'lang'} = $sysconfig->prop('Language') || 'en_US';
@@ -42,7 +42,7 @@ sub init_data {

 sub reconf_needed {

-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Config DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Config DB");
    #my $unsafe = ($cdb->get('bootstrap-console') and $cdb->get('bootstrap-console')->prop('Run') eq 'yes') ||
    #     ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0';
 	my $unsafe = ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0';   
@@ -55,7 +55,7 @@ sub check_credentials {
    my ($c, $username, $password) = @_;
    return unless $username || $password;

-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Configuration DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Configuration DB");
    my $l = $cdb->get('ldap');
    my $status = $l->prop('status') || "disabled";
    unless ($status eq "enabled" ) {
@@ -88,13 +88,13 @@ sub check_adminalias {
    my $c = shift;

    my $alias;
-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Configuration DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Configuration DB");
    if (defined $cdb->get('AdminAlias')) {
 	$alias = $cdb->get('AdminAlias')->value;
    }
    return undef unless $alias;

-    my $adb = esmith::AccountsDB->open_ro() or die("can't open Accounts DB");
+    $adb = esmith::AccountsDB::UTF8->open_ro() or die("can't open Accounts DB");
    my $arec = $adb->get( $alias );
    return undef unless $arec;

@@ -105,4 +105,4 @@ sub check_adminalias {
 }


-1;
+1;
--- a/root/usr/share/smanager/lib/SrvMngr_Auth.pm
+++ b/root/usr/share/smanager/lib/SrvMngr_Auth.pm
@@ -0,0 +1,100 @@
+# Optimized SrvMngr_Auth module using stash caching and Exporter
+
+package SrvMngr_Auth;
+
+use strict;
+use warnings;
+use Exporter qw(import); # Import the Exporter module
+use esmith::AccountsDB::UTF8;
+
+# Define functions to be exported upon request
+our @EXPORT_OK = qw(check_admin_access load_user_auth_info has_panel_access get_panel_from_path);
+
+# Helper function to extract panel name from path
+sub get_panel_from_path {
+    my ($path) = @_;
+    
+    if ($path =~ m{^/([^/]+)}) {
+        return $1;
+    }
+    
+    return ''; # Return empty string if no panel found
+}
+
+# Load user authentication info and cache it in the stash
+sub load_user_auth_info {
+    my ($c) = @_;
+    
+    # Check if auth info is already cached in the stash
+    return if exists $c->stash->{auth_info};
+    
+    my %auth_info = (
+        username => '', # Initialize username
+        is_admin => 0,
+        allowed_panels => [],
+    );
+    
+    # Get username from session
+    $auth_info{username} = $c->session->{username} || ''; # Provide default empty string
+    
+    # Check if user is admin
+    $auth_info{is_admin} = $c->is_admin || 0;
+    
+    # If not admin, get allowed panels
+    if (!$auth_info{is_admin} && $auth_info{username}) {
+        my $accountsdb = esmith::AccountsDB::UTF8->open_ro();
+        if ($accountsdb) {
+            my $user_rec = $accountsdb->get($auth_info{username});
+            # Check if the property exists before trying to get its value
+            if (defined $user_rec && $user_rec->prop('AdminPanels')) {
+                # Get comma-separated list of allowed admin panels
+                my $admin_panels = $user_rec->prop('AdminPanels');
+                $auth_info{allowed_panels} = [split(/,/, $admin_panels)];
+            }
+        }
+    }
+    
+    # Store the calculated info in the stash
+    $c->stash(auth_info => \%auth_info);
+}
+
+# Check if a user has access to a specific panel (uses cached info)
+sub has_panel_access {
+    my ($c, $panel) = @_;
+    
+    # Ensure auth info is loaded
+    load_user_auth_info($c);
+    
+    my $auth_info = $c->stash->{auth_info};
+    
+    # Check if requested panel is in allowed panels
+    foreach my $allowed_panel (@{$auth_info->{allowed_panels}}) {
+		return 1 if lc($panel) eq lc($allowed_panel) 
+         || lc(substr($panel, 0, length($allowed_panel))) eq lc($allowed_panel);
+    }
+    
+    return 0;
+}
+
+# Main function to check admin access (uses cached info)
+sub check_admin_access {
+    my ($c) = @_;
+    
+    # Ensure auth info is loaded
+    load_user_auth_info($c);
+    
+    my $auth_info = $c->stash->{auth_info};
+    
+    # First check if user is admin
+    return 1 if $auth_info->{is_admin};
+    
+    # If not admin, check if they have access to the specific panel
+    my $current_path = $c->req->url->path;
+    my $requested_panel = $current_path;  
+    return 0 unless $requested_panel;
+    
+    # Check if user has access to this panel using the cached info
+    return has_panel_access($c, $requested_panel);
+}
+
+1; # Return true value for module loading
--- a/root/usr/share/smanager/script/routes.pl
+++ b/root/usr/share/smanager/script/routes.pl
@@ -5,11 +5,11 @@
 use strict;
 use warnings;

-use esmith::ConfigDB;
+use esmith::ConfigDB::UTF8;

 use constant WEBFUNCTIONS => '/usr/share/smanager/lib/SrvMngr/Controller/';

-my $rtdb = esmith::ConfigDB->open('routes') or
+my $rtdb = esmith::ConfigDB::UTF8->open('routes') or
        die "Couldn't access Routes database\n";

 my @routes = $rtdb->get_all_by_prop( type => 'route' );
--- a/root/usr/share/smanager/script/secrets.pl
+++ b/root/usr/share/smanager/script/secrets.pl
@@ -7,7 +7,7 @@
 use strict;
 use warnings;

-use esmith::ConfigDB;
+use esmith::ConfigDB::UTF8;

 sub gen_pwd {
    use MIME::Base64 qw(encode_base64);
@@ -29,7 +29,7 @@ sub gen_pwd {
    return $p;
 }

-my $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+my $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";

 my $pwds = $cdb->get_prop('smanager','Secrets');

--- a/root/usr/share/smanager/script/srvmngr
+++ b/root/usr/share/smanager/script/srvmngr
@@ -14,6 +14,10 @@ BEGIN
    $ENV{'HOME'} = '/usr/share/smanager';
    delete $ENV{'ENV'};
    esmith::util::setRealToEffective();
+    #to help debug UTF8, see perlrun and perlvar -CSAD or -CLSD
+    #print '$ENV{PERL_UNICODE}='.$ENV{'PERL_UNICODE'}."\n" if $ENV{'PERL_UNICODE'};
+    #print '${^UNICODE}='.${^UNICODE}.' ; ${^UTF8LOCALE}='.${^UTF8LOCALE} ."\n";
+    #print '${^OPEN}'.${^OPEN}."\n" if ${^OPEN} ;
 } 


--- a/root/usr/share/smanager/t/002_basic.t
+++ b/root/usr/share/smanager/t/002_basic.t
@@ -6,8 +6,8 @@ use Test::Mojo;
 use FindBin;
 use lib "$FindBin::Bin/../lib";

-eval "use esmith::ConfigDB";
-plan skip_all => 'esmith::ConfigDB (and others) required for testing 002_basic' if $@;
+eval "use esmith::ConfigDB::UTF8";
+plan skip_all => 'esmith::ConfigDB::UTF8 (and others) required for testing 002_basic' if $@;

 plan tests => 3;

--- a/root/usr/share/smanager/t/004_panels.t
+++ b/root/usr/share/smanager/t/004_panels.t
@@ -6,8 +6,8 @@ use Test::Mojo;
 use FindBin;
 use lib "$FindBin::Bin/../lib";

-eval "use esmith::ConfigDB";
-plan skip_all => 'esmith::ConfigDB (and others) required for testing 004_panels' if $@;
+eval "use esmith::ConfigDB::UTF8";
+plan skip_all => 'esmith::ConfigDB::UTF8 (and others) required for testing 004_panels' if $@;

 my $tests;
 plan tests => $tests;
@@ -17,8 +17,8 @@ BEGIN { $tests += 2 * 3 };
 my $t = Test::Mojo->new('SrvMngr');
 $t->ua->max_redirects(1);

-$t->get_ok('/')->status_is(200)->content_like(qr/SME Server 10/);
-$t->get_ok('/manual')->status_is(200)->content_like(qr/SME Server 10/);
+$t->get_ok('/')->status_is(200)->content_like(qr/SME Server 11/);
+$t->get_ok('/manual')->status_is(200)->content_like(qr/SME Server 11/);

 BEGIN { $tests += 5 * 2 };
 my @panels = qw/ Initial Login Manual Support Request /;
--- a/root/usr/share/smanager/themes/default/public/css/new-sme-main.css
+++ b/root/usr/share/smanager/themes/default/public/css/new-sme-main.css
@@ -201,11 +201,13 @@ body.menu {

 div.error, div.sme-error, span.error, span.sme-error {
    color: red;
-    background-color: #fff;
+    background-color: #f9f9f9;
    border-width: 1px;
    border-style: solid;
    border-color: red;
-    padding: 2px;
+    padding: 10px;
+    border-radius: 10px;
+    
 }

 form {
@@ -493,5 +495,11 @@ div.success, span.success {
     border-width: 1px;
     border-style: solid;
     border-color: #006400 ;
-     padding: 8px;
+     padding: 10px;
+     border-radius: 10px;
+}
+
+div.roundcube #roundcube{
+	width:100%;
+	height:600px;
 }
--- a/root/usr/share/smanager/themes/default/public/css/new_sme.css
+++ b/root/usr/share/smanager/themes/default/public/css/new_sme.css
@@ -125,7 +125,7 @@
 }

 #header2 {
-    width: 94.2%;
+    width:96%;
    margin-left: 1px;
    margin-top: 4px;
 }
--- a/root/usr/share/smanager/themes/default/templates/backdown.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/backdown.html.ep
@@ -1,6 +1,6 @@
 <%

-    my $backups = esmith::BackupHistoryDB->open;
+    my $backups = esmith::BackupHistoryDB->open; # no UTF8
    my $now = time();
    my $backup_rec = $backups->new_record($now, {
 	type => 'backup_record', BackupType => 'desktop',
@@ -64,4 +64,4 @@
    $backup_rec->set_prop('Result', "0");

 %>
-1;
+1;
--- 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
@@ -4,7 +4,7 @@
 	% my %ret;
 	% unless (length($retref)) {%ret = (ret=>"");}
 	% else {%ret = %$retref;}
-	
+
 	% my @vars = split(",",$ret{vars});
 	% my $var1 = @vars[0];
 	% my $var2 = @vars[1];
@@ -13,30 +13,31 @@
 	% my $var5 = @vars[4];
 	% my $var6 = @vars[5];

+   <br>
 	%if ($ret{'ret'} eq "") {
-   	
+
 	%} elsif (index($ret{ret},"SUCCESS") != -1) {
 	   <div class='success'>
-	       <h2> Operation Status Report</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+	       <!--<h2> Operation Status Report</h2>-->
+		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
 		</div>
-	   %} else { 
+	   %} else {
 	   <div class='sme-error'>
-	       <h2> Operation Status Report - Error</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+	       <!--<h2> Operation Status Report - Error</h2>-->
+		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
    	</div>
 	%}
 	<br />
    % my $btn = l('ADD');
-    % my $network_db = esmith::NetworksDB->open();
-    
+    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
+
   % if (config->{debug} == 1) {
 	<p>
 	%= dumper $c->current_route
 	%= dumper $c->stash("ret")
 	</p>
    % }
-     
+
    %= form_for '/localnetworksb' => (method => 'POST') => begin
 		<h2>
 		%=l "ln_ADD_TITLE"
@@ -66,5 +67,4 @@
 			</p>
 	%end

-</div>
-
+</div>
--- 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
@@ -26,13 +26,15 @@
 	%if ($ret{ret} eq "") {
 		%=l "ln_FIRSTPAGE_DESC"
 	%} elsif (index($ret{ret},"SUCCESS") != -1) {
+	   <br>
 	   <div class='success'>
-	       <h2> Operation Status Report</h2>
+	       <!--<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>
+	       <!--<h2> Operation Status Report - Error</h2>-->
 		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
    	</div>
 	%}
@@ -103,4 +105,4 @@
 		</table>
 			%= hidden_field 'trt' => $ln_datas->{trt}
 	%}
-</div>
+</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep
@@ -13,16 +13,17 @@
 	% my $var5 = @vars[4];
 	% my $var6 = @vars[5];

+	<br>
 	%if ($ret{'ret'} eq "") {
   	
 	%} elsif (index($ret{ret},"SUCCESS") != -1) {
 	   <div class='success'>
-	       <h2> Operation Status Report</h2>
+	       <!--<h2> Operation Status Report</h2>-->
 			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
 		</div>
 	   %} else { 
 	   <div class='sme-error'>
-	       <h2> Operation Status Report - Error</h2>
+	       <!--<h2> Operation Status Report - Error</h2>-->
 			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
    	</div>
 	%}
@@ -84,4 +85,4 @@

 	%end

-</div>
+</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
@@ -21,13 +21,15 @@
 	%if ($ret{ret} eq "") {
 	    %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION'));
 	%} elsif (index($ret{ret},"SUCCESS") != -1) {
+		<br>
 	   <div class='success'>
-	       <h2> Operation Status Report</h2>
+	       <!--<h2> Operation Status Report</h2>-->
 			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
 		</div>
 	   %} else { 
+		<br>
 	   <div class='sme-error'>
-	       <h2> Operation Status Report - Error</h2>
+	       <!--<h2> Operation Status Report - Error</h2>-->
 			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
    	</div>
 	%}
@@ -113,4 +115,4 @@
 	</table>
 	%= hidden_field 'trt' => $pf_datas->{trt}
 
-</div>
+</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep
@@ -1,5 +1,7 @@
-%	use SrvMngr qw( getNavigation );
-%	my %nav = %{SrvMngr->getNavigation( $c->languages(), 'U' )};
+%	use SrvMngr qw( getNavigation simpleNavMerge );
+%	my %nav1 = %{SrvMngr->getNavigation( $c->languages(), 'U' )};
+% 	my %nav2 = %{SrvMngr->getNavigation( $c->languages(), 'A', session('username') )};
+%	my %nav = $c->session->{is_admin} ? %nav1 : %{SrvMngr->simpleNavMerge(\%nav1, \%nav2)};

 	<div id='usermenu'>
 	<a href='#' id='toguser' class='section section-title'>Current User (<%= session 'username' %>)</a>
@@ -7,26 +9,24 @@
 %    my $cc = 300;
 %    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
 %		<=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
-	<!-- div class='section'><%= $h %></div -->
-%	my ($classNew, $target, $href) = '';
-%	foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
-
-%	next if ($_->{'MENUCAT'} ne 'U' );	# menu User 
-
-%	    if ( $_->{'FILENAME'} =~ m/^2\// ) {
-%		$target = '_self';
-%	    	(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
-%	    	$href = '/smanager/' . $file2;
-%	    } else {
-%		$target = 'main';
-%	    	$href = '/server-manager' . $_->{'FILENAME'};
-%	    }
-	    <div class='menu-cell'><a class='item<%= $classNew %>' target='<%= $target %>'
-	    id='sme<%= $cc %>' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
+		<!-- div class='section'><%= $h %></div -->
+%		my ($classNew, $target, $href) = '';
+%		foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
+%			next if ($_->{'MENUCAT'} ne 'A' && $_->{'MENUCAT'} ne 'U' );	# menu User 
+%		    if ( $_->{'FILENAME'} =~ m/^2\// ) {
+%				$target = '_self';
+%				(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
+%				$href = '/smanager/' . $file2;
+%		    } else {
+%				$target = 'main';
+%				$href = '/server-manager' . $_->{'FILENAME'};
+%		    }
+			<div class='menu-cell'><a class='item<%= $classNew %>' target='<%= $target %>'
+			id='sme<%= $cc %>' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
 %           $cc++;
-%	}
+%		}

 %    }

    </div>
-    </div>
+    </div>
--- a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
@@ -85,7 +85,7 @@
            %= t td => (class => 'sme-border') => $net
            %= t td => (class => 'sme-border') => $mask
            %= t td => (class => 'sme-border') => $numhosts
-            <td class='sme-border'><input type='checkbox' name='Remote_nets' value='<%= $net.'/'.$mask %>'> </td>
+            <td class='sme-border'><input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'> </td>
    	</tr>
    %    }

--- 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 72
+%define release 89
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,8 +22,9 @@ BuildRequires: smeserver-devtools
 #BuildRequires:  perl(Net::Netmask) >= 1.9
 #</Build tests>

-Requires: smeserver-lib >= 1.18.0-26
-Requires: smeserver-manager >= 2.4.0-22
+Requires: smeserver-lib >= 11.0.0-13
+# old manager is needed to handle access (ValidFrom)
+Requires: e-smith-manager >= 2.4.0-22
 Requires: smeserver-apache >= 2.6.0-19
 Requires: smeserver-php >= 3.0.0-43
 #Requires: smeserver-manager-locale >= 11.0.0
@@ -37,7 +38,6 @@ Requires: perl(Mojo::JWT) >= 0.08-1
 #Requires: perl(Time::TAI64) >= 2.11
 Requires: mutt >= 1.5.21
 Requires: smeserver-manager-jsquery >= 1.0
-Requires: smeserver-lib >= 11.0
 Requires: smeserver-certificates >= 11.0
 #Requires: js-jquery > 2.2.4-3 (optional)

@@ -82,7 +82,8 @@ This RPM contributes the navigation bars for the smeserver-manager. New Mojolici

 #extract the release number and drop it in to the version for SM2 footer.
 sed -i "s/our \$VERSION = '[^']*'/our \$VERSION = '%{release}'/g" root/usr/share/smanager/lib/SrvMngr.pm
-
+year=`date +%Y`
+sed -i "s/___YEAR___/$year/g" root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm

 perl createlinks

@@ -130,7 +131,7 @@ true
 %post
 if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
 then
-    [ -d %{dir_mngr}/themes/default/public/js ] || 
+    [ -d %{dir_mngr}/themes/default/public/js ] ||
 	mkdir %{dir_mngr}/themes/default/public/js
    [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] ||
 	ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js
@@ -143,21 +144,75 @@ true
 %defattr(-,root,root)

 %changelog
+* 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]
+
+* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-85.sme
+- fix ln_add templates for UTF8 [SME: 13030]
+- remove extraneous require line in spec file
+
+* Mon Jun 09 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-84.sme
+- fix Directory caching issue [SME: 13026]
+- WIP use esmith::*DB::UTF8 to access db flat files [SME: 13027]
+
+* Mon May 05 2025 Brian Read <brianr@koozali.org> 11.0.0-83.sme
+- Mod to SrvMngr-Auth to account for partials matching AdminPanels options
+
+* Thu May 01 2025 Brian Read <brianr@koozali.org> 11.0.0-82.sme
+- Correct Weights for menus [SME: 12996]
+
+* Wed Apr 30 2025 Brian Read <brianr@koozali.org> 11.0.0-80.sme
+- Remove expansion of css files from createlinks [SME: 12989]
+
+* Wed Apr 30 2025 Brian Read <brianr@koozali.org> 11.0.0-79.sme
+- Add code in SrvMngr to take note of user panel setting
+
+* Thu Apr 17 2025 Brian Read <brianr@koozali.org> 11.0.0-78.sme
+- typo in remoteaccess panel
+- Fix crash in veiwlogfiles if viewlogfiles key not in DB
+
+* Sat Apr 12 2025 Brian Read <brianr@koozali.org> 11.0.0-77.sme
+- Sort out local and pulic access setting in remote panel  [SME: 12988]
+- caching problem, plus confusion between normal and public setting in sshd / access in DB
+
+* Fri Apr 11 2025 Brian Read <brianr@koozali.org> 11.0.0-76.sme
+- Restore css for roundcube embedded  [SME: 12987]
+
+* Wed Apr 09 2025 Brian Read <brianr@koozali.org> 11.0.0-75.sme
+- Move review configuration to behind login [SME: 12984]
+- Fix crash in port forwarding [SME: 12985]
+
+* Wed Mar 26 2025 Brian Read <brianr@koozali.org> 11.0.0-74.sme
+- Fix error message and success message format in Local Networking panel [SME: 12969]
+
+* Tue Mar 25 2025 Brian Read <brianr@koozali.org> 11.0.0-73.sme
+- Some changes to error message format in css.
+- Fix DB Cache problem with port forwarding panel [SME: 12970]
+- Fix error and success message display for port forwarding panel [SME: 12969]
+
 * Mon Mar 24 2025 Brian Read <brianr@koozali.org> 11.0.0-72.sme
 - Remove css files from template structure [SME: 12967]
- Rationalise and merge css files 
+- Rationalise and merge css files
 - Adjust some gaps around panels
 - Remove HR lines

 * Thu Mar 20 2025 Brian Read <brianr@koozali.org> 11.0.0-71.sme
 - Sort out navigation menu error on startup [SME: 12946]
 - More places where floating panel needed
- Adjust floating panel to make space around it the same 
+- Adjust floating panel to make space around it the same
 - clean up some css

 * Wed Mar 19 2025 Brian Read <brianr@koozali.org> 11.0.0-70.sme
 - Re-cast the default theme - use proper koozali logo image, unwind multiple divs
- Enhance responsiveness 
+- Enhance responsiveness
 - Revert Ibay menu name to Ibays
 - Remove legacy SM1 button on header
 - Remove "?" access to wiki help on header
@@ -167,8 +222,8 @@ true

 * Mon Mar 17 2025 Brian Read <brianr@koozali.org> 11.0.0-68.sme
 - re-write qmailanalog for postfix [SME: 12951]
- Clean up backup.pm 
- Enhance module panel - used by mail log analysis and Licence display 
+- Clean up backup.pm
+- Enhance module panel - used by mail log analysis and Licence display

 * Tue Mar 11 2025 Brian Read <brianr@koozali.org> 11.0.0-66.sme
 - Move the button for each backup panel to the left to conform to all the other panels.
@@ -224,7 +279,7 @@ true

 * Sun Feb 09 2025 Brian Read <brianr@koozali.org> 11.0.0-50.sme
 - Move all routines from FormMagic still called by SM2 panels to SM2 [SME: 12906]
- delete all references to FormMagic 
+- delete all references to FormMagic

 * Fri Feb 07 2025 Brian Read <brianr@koozali.org> 11.0.0-49.sme
 - Fix delete of ibay - typo in link
@@ -236,7 +291,7 @@ true

 * Tue Jan 28 2025 Brian Read <brianr@koozali.org> 11.0.0-47.sme
 - Temp (we hope) remove CSRF protection plugin  [SME: ]
- Fix comparison in footer with config->mode 
+- Fix comparison in footer with config->mode

 * Tue Jan 28 2025 Brian Read <brianr@koozali.org> 11.0.0-46.sme
 - Adjust conditions for showing "Reconfigure required" to only check UnSavedChanges DB entry [SME: 12891]
@@ -294,7 +349,7 @@ true

 * Wed Dec 18 2024 Brian Read <brianr@koozali.org> 11.0.0-32.sme
 - Fix for User and localnetwork panel [SME: 6278]
- Fix menu entry for proxy to stop it moving 
+- Fix menu entry for proxy to stop it moving

 * Tue Dec 17 2024 Brian Read <brianr@koozali.org> 11.0.0-31.sme
 - Edit html to avoid w3c html validation warnings [SME: 6278]
@@ -346,7 +401,7 @@ true

 * Wed Aug 21 2024 Brian Read <brianr@koozali.org> 11.0.0-16.sme
 - Typo uc DNF changed to lc dnf in Yum.pm [SME: 127245]
- Monitor dnf running using dnf status file 
+- Monitor dnf running using dnf status file

 * Wed Aug 21 2024 Brian Read <brianr@koozali.org> 11.0.0-15.sme
 - Migrate SM2 Software installer panel from use of yum to dnf [SME: 12718]
@@ -477,7 +532,7 @@ true
 - untainting printer [SME: 12110]

 * Fri Jan 21 2022 Michel Begue <mab974@misouk.com> 0.1.4-14.sme
- Fix jquery map link missing 
+- Fix jquery map link missing
 - Fix jquery link deleted during update
 - Remove generated file during remove

@@ -514,7 +569,7 @@ true
 * Mon Nov 15 2021 Michel Begue <mab974@misouk.com> 0.1.4-3.sme
 - Fix error message when linking, unlinking jquery in spec
 - Correct the 'review' panel presentation
- Modify CSRFDefender plugin to take into account GET method 
+- Modify CSRFDefender plugin to take into account GET method
 - Add TOKEN param where the GET method is used in templates
 - Remove smanager from local url address

@@ -749,7 +804,7 @@ true
 * Sun Feb 04 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.1.0-1.sme
 - first smeserver-manager package [SME: 10506]
  this is a sandbox to dev the next server-manager based on mojolicious
-  this package is based on part of the old e-smith-manager and needs it 
+  this package is based on part of the old e-smith-manager and needs it
  to work until we moved the httpd-admin part.

 * Sun Apr 16 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-26.sme
@@ -781,7 +836,7 @@ true

 * Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-12.sme
 - Update server-manager to Koozali branding [SME: 9676]
- We thanks John Crisp for his wonderful work. 
+- We thanks John Crisp for his wonderful work.

 * Wed Jun 15 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-11.sme
 - change link for donation to koozali.org  [SME: 9599]
@@ -833,7 +888,7 @@ true
  [SME: 9163]

 * Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 2.6.0-1.sme
- Roll new stream to remove obsolete images [SME: 7962] 
+- Roll new stream to remove obsolete images [SME: 7962]

 * Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 2.4.0-9.sme
 - Remove references to obsolete images, by Stephane de Labrusse [SME: 7962]
@@ -871,10 +926,10 @@ true
 * Wed Dec  9 2009 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-4.sme
 - Fix css validation errors. [SME: 5656]

-* Fri Sep 18 2009 Stephen Noble <support@dungog.net> 2.2.0-4.sme 
+* Fri Sep 18 2009 Stephen Noble <support@dungog.net> 2.2.0-4.sme
 - display reconfigure warning once if UnsavedChanges=yes [SME: 5475]

-* Fri Sep 18 2009 Stephen Noble <support@dungog.net> 2.2.0-3.sme 
+* Fri Sep 18 2009 Stephen Noble <support@dungog.net> 2.2.0-3.sme
 - display reconfigure warning if UnsavedChanges=yes [SME: 5475]

 * Sun Apr 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
@@ -915,13 +970,13 @@ true
 - Fix UTF-8 encoding in header and nav-conf [SME: 4072]

 * Tue Jan 08 2008 Stephen Noble <support@dungog.net> 1.14.0-11
- Fix to remove spaces and newlines in panel headers [SME: 3346] 
+- Fix to remove spaces and newlines in panel headers [SME: 3346]

 * Tue Jan 08 2008 Stephen Noble <support@dungog.net> 1.14.0-10
 - remove the FormMagick session files [SME: 3723]

 * Tue Jan 08 2008 Stephen Noble <support@dungog.net> 1.14.0-9
- Remove spaces and newlines in panel headers [SME: 3346] 
+- Remove spaces and newlines in panel headers [SME: 3346]

 * Sun Jul 01 2007 Shad L. Lords <slords@mail.com> 1.14.0-8
 - Make login/logout no quite so verbose. [SME: 2660]
@@ -1214,10 +1269,10 @@ true

 * Wed Jan  1 2003 Gordon Rowell <gordonr@e-smith.com>
 - [1.9.3-08]
- Generate navigation.info files (config db format) for each supported 
+- Generate navigation.info files (config db format) for each supported
  language in /etc/e-smith/locale/{language}/etc/e-smith/web/functions
- Read the navigation.info file for the preferred language when 
-  displaying the navigation bar 
+- Read the navigation.info file for the preferred language when
+  displaying the navigation bar
 - TODO: Actually select the correct navigation.info file [gordonr 5493]

 * Tue Dec 31 2002 Gordon Rowell <gordonr@e-smith.com>
@@ -1258,7 +1313,7 @@ true
 * Fri Nov 22 2002 Gordon Rowell <gordonr@e-smith.com>
 - [1.9.1-02]
 - templated header.htm [miked 5826]
- modified header.htm template to link to online-manual and blades 
+- modified header.htm template to link to online-manual and blades
  [gordonr 5826]

 * Thu Nov 21 2002 Mike Dickson <miked@e-smith.com>
@@ -1305,7 +1360,7 @@ true
 * Thu May 16 2002 Tony Clayton <apc@e-smith.com>
 - [1.5.8-01]
 - Remove unnecessary <p> tags in navigation html [tonyc 3377]
- Fix navigation panel to not import symbols from fm subclasses 
+- Fix navigation panel to not import symbols from fm subclasses
  [tonyc 3109]

 * Mon May 13 2002 Tony Clayton <apc@e-smith.com>
@@ -1350,7 +1405,7 @@ true

 * Thu Mar 14 2002 Gordon Rowell <gordonr@e-smith.com>
 - [1.4.3-01]
- Fixed regexp for ignoring pleasewait(-.*?). Two each in 
+- Fixed regexp for ignoring pleasewait(-.*?). Two each in
  pleasewait/noframes. Reduced to one in each [gordonr]

 * Fri Mar 1 2002 Tony Clayton <tonyc@e-smith.com>
@@ -1383,7 +1438,7 @@ true

 * Wed Nov 21 2001 Charlie Brady <charlieb@e-smith.com>
 - [1.3.0-06]
- Remove troublesome "Requires: e-smith-base". 
+- Remove troublesome "Requires: e-smith-base".
 - Remove obsolete "Requires: e-smith".

 * Thu Nov 1 2001 Gordon Rowell <gordonr@e-smith.com>
@@ -1422,7 +1477,7 @@ true
 * Tue Jul 31 2001 Adrian Chung <adrianc@e-smith.com>
 - [1.1.0-03]
 - Adding SSL enabling templates for port 981.
- Adding 01localAccessString fragment for use in SSL 
+- Adding 01localAccessString fragment for use in SSL
  enabling templates.

 * Fri Jul 27 2001 Charlie Brady <charlieb@e-smith.com>
Author	SHA1	Message	Date
Brian Read	1a8f935431	* Thu Jun 12 2025 Brian Read <brianr@koozali.org> 11.0.0-89.sme - rework navigation weights to avoid duplicates [SME: 12996]	2025-06-12 18:15:41 +01:00
Jean-Philippe Pialasse	e8d6d39583	* 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]	2025-06-10 07:17:32 -04:00
Jean-Philippe Pialasse	91201b7b02	* Mon Jun 09 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-87.sme - add datetime getYear_list [SME: 13031] - use esmith::*DB::UTF8 to access db flat files [SME: 13027]	2025-06-10 00:09:39 -04:00
Jean-Philippe Pialasse	c85022c49e	* Mon Jun 09 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-87.sme - add datetime getYear_list [SME: 13031] - use esmith::*DB::UTF8 to access db flat files [SME: 13027]	2025-06-09 23:49:25 -04:00
Jean-Philippe Pialasse	fd076895ba	* Mon Jun 09 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-87.sme - add datetime getYear_list [SME: 13031] - WIP use esmith::*DB::UTF8 to access db flat files [SME: 13027]	2025-06-09 12:49:29 -04:00
John Crisp	d993bd9d19	Fix DateTime gen_locale_date_string	2025-06-09 14:08:56 +02:00
John Crisp	a31806f205	Add UTF8 support to local network panel	2025-06-09 13:39:32 +02:00
Jean-Philippe Pialasse	b44f1c5000	* Mon Jun 09 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-84.sme - fix Directory caching issue [SME: 13026] - WIP use esmith::*DB::UTF8 to access db flat files [SME: 13027]	2025-06-09 00:46:19 -04:00
Brian Read	2538ac9ea0	* Mon May 05 2025 Brian Read <brianr@koozali.org> 11.0.0-83.sme - Mod to SrvMngr-Auth to account for partials matching AdminPanels options	2025-05-05 07:01:25 +01:00
Brian Read	dbfeaa18a3	* Thu May 01 2025 Brian Read <brianr@koozali.org> 11.0.0-82.sme - Correct Weights for menus [SME: 12996]	2025-05-01 18:16:25 +01:00
Brian Read	ced08b28d4	Update version in spec	2025-05-01 13:29:52 +01:00
Brian Read	c74a71dee1	* Thu May 01 2025 Brian Read <brianr@koozali.org> 11.0.0-81.sme - Correct Weights for menus [SME: 12996]	2025-05-01 12:07:55 +01:00
Brian Read	96b002e7a9	* Wed Apr 30 2025 Brian Read <brianr@koozali.org> 11.0.0-80.sme - Remove expansion of css files from createlinks [SME: 12989]	2025-05-01 06:33:46 +01:00
Brian Read	f30b4ab2b5	* Wed Apr 30 2025 Brian Read <brianr@koozali.org> 11.0.0-79.sme - Add code in SrvMngr to take note of user panel setting	2025-04-30 09:09:16 +01:00
Brian Read	fa286e966d	* Thu Apr 17 2025 Brian Read <brianr@koozali.org> 11.0.0-78.sme - typo in remoteaccess panel - Fix crash in veiwlogfiles if viewlogfiles key not in DB	2025-04-17 12:16:38 +01:00
Brian Read	9bb2128891	Typo in name for remoteaccess panel	2025-04-16 17:48:37 +01:00
Brian Read	accf96df0d	* Sat Apr 12 2025 Brian Read <brianr@koozali.org> 11.0.0-77.sme - Sort out local and pulic access setting in remote panel [SME: 12988] - caching problem, plus confusion between normal and public setting in sshd / access in DB	2025-04-12 09:08:12 +01:00
Brian Read	1c601f0ace	* Fri Apr 11 2025 Brian Read <brianr@koozali.org> 11.0.0-76.sme - Restore css for roundcube embedded [SME: 12987]	2025-04-11 07:09:03 +01:00
Brian Read	cffbe53fb4	* Wed Apr 09 2025 Brian Read <brianr@koozali.org> 11.0.0-75.sme - Move review configuration to behind login [SME: 12984] - Fix crash in port forwarding [SME: 12985]	2025-04-09 10:43:14 +01:00
Brian Read	aad1a458f4	* Wed Mar 26 2025 Brian Read <brianr@koozali.org> 11.0.0-74.sme - Fix error message and success message format in Local Networking panel [SME: 12969]	2025-03-26 08:58:32 +00:00
Brian Read	252bf20410	* Tue Mar 25 2025 Brian Read <brianr@koozali.org> 11.0.0-73.sme - Some changes to error message format in css. - Fix DB Cache problem with port forwarding panel [SME: 12970] - Fix error and success message display for port forwarding panel [SME: 12969]	2025-03-25 15:05:34 +00:00