* Fri Jun 27 2025 Brian Read <brianr@koozali.org> 11.0.0-96.sme

- fix [SME: ]
* Tue Jun 24 2025 Brian Read <brianr@koozali.org> 11.0.0-95.sme
2025-06-27 13:52:21 +01:00 · 2025-06-25 10:35:16 +01:00 · 2025-06-19 10:36:50 +01:00 · 2025-06-19 06:26:38 +01:00 · 2025-06-18 11:17:51 +01:00 · 2025-06-13 17:04:22 +01:00
52 changed files with 1551 additions and 985 deletions
--- 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,12 +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 = '78.el8.sme'; 
+our $VERSION = '94.el8.sme'; 
 #Extract the release value
 if ($VERSION =~ /^(\d+)/) {
    $VERSION = $1;  # $1 contains the matched numeric digits
@@ -323,7 +326,10 @@ sub setup_routing {
    $if_admin->post('/clamav')->to('clamav#do_update')->name('clamav2');

    $if_admin->get('/datetime')->to('datetime#main')->name('datetime');
-    $if_admin->post('/datetime')->to('datetime#do_update')->name('datetime2');
+    $if_admin->post('/datetimeu')->to('datetime#do_update')->name('datetimeu');
+    $if_admin->get('/datetimed')->to('datetime#do_display')->name('datetimed');
+    $if_admin->post('/datetimet')->to('datetime#do_testntp')->name('datetimet');
+

    $if_admin->get('/directory')->to('directory#main')->name('directory');
    $if_admin->post('/directory')->to('directory#do_update')->name('directory2');
@@ -418,28 +424,59 @@ sub setup_routing {
    # additional routes (for contribs) got from 'routes' db
    #my @routes = @{SrvMngr::get_routes_list()};

-    foreach (@{SrvMngr::get_routes_list()}) {
-
-	if ( defined $_->{method} and defined $_->{url} and defined $_->{ctlact} and defined $_->{name} ) {
-	    my $menu = defined $_->{menu} ? $_->{menu} : 'A';
-	    if ( $menu eq 'N' ) {
-	    	$r->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
-			if ( $_->{method} eq 'get');
-		$r->post($_->{url})->to($_->{ctlact})->name($_->{name})
-			if ( $_->{method} eq 'post');
-	    } elsif ( $menu eq 'U' ) {
-	    	$if_logged_in->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
-			if ( $_->{method} eq 'get');
-		$if_logged_in->post($_->{url})->to($_->{ctlact})->name($_->{name})
-			if ( $_->{method} eq 'post');
-	    } else {
-	    	$if_admin->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
-			if ( $_->{method} eq 'get');
-		$if_admin->post($_->{url})->to($_->{ctlact})->name($_->{name})
-			if ( $_->{method} eq 'post');
-	    }
+    #foreach (@{SrvMngr::get_routes_list()}) {
+		#if ( defined $_->{method} and defined $_->{url} and defined $_->{ctlact} and defined $_->{name} ) {
+			#my $menu = defined $_->{menu} ? $_->{menu} : 'A';
+			#if ( $menu eq 'N' ) {
+				#$r->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
+				#if ( $_->{method} eq 'get');
+			#$r->post($_->{url})->to($_->{ctlact})->name($_->{name})
+				#if ( $_->{method} eq 'post');
+			#} elsif ( $menu eq 'U' ) {
+				#$if_logged_in->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
+				#if ( $_->{method} eq 'get');
+			#$if_logged_in->post($_->{url})->to($_->{ctlact})->name($_->{name})
+				#if ( $_->{method} eq 'post');
+			#} else {
+				#$if_admin->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
+				#if ( $_->{method} eq 'get');
+			#$if_admin->post($_->{url})->to($_->{ctlact})->name($_->{name})
+				#if ( $_->{method} eq 'post');
+			#}
+		#}
+    #}
+    
+    foreach my $route (@{SrvMngr::get_routes_list()}) {
+		if (defined $route->{method} && defined $route->{url} && defined $route->{ctlact} && defined $route->{name}) {
+			my $menu = defined $route->{menu} ? $route->{menu} : 'A';
+			
+			# Fix controller case: convert "ControllerName" to "controllername" in "ControllerName#action"
+			# this is so that AdminLTE breadcrumb works  - it appears that perl Packages names are NOT case sensitive 
+			# and that the breadcrumb package assumes that the package name is the same as the main route.
+			my ($controller, $action) = split /#/, $route->{ctlact}, 2;
+			my $fixed_ctlact = lc($controller) . '#' . $action;
+			
+			if ($menu eq 'N') {
+				$r->get($route->{url})->to($fixed_ctlact)->name($route->{name}) 
+					if $route->{method} eq 'get';
+				$r->post($route->{url})->to($fixed_ctlact)->name($route->{name})
+					if $route->{method} eq 'post';
+			}
+			elsif ($menu eq 'U') {
+				$if_logged_in->get($route->{url})->to($fixed_ctlact)->name($route->{name}) 
+					if $route->{method} eq 'get';
+				$if_logged_in->post($route->{url})->to($fixed_ctlact)->name($route->{name})
+					if $route->{method} eq 'post';
+			}
+			else {  # Default: menu 'A'
+				$if_admin->get($route->{url})->to($fixed_ctlact)->name($route->{name}) 
+					if $route->{method} eq 'get';
+				$if_admin->post($route->{url})->to($fixed_ctlact)->name($route->{name})
+					if $route->{method} eq 'post';
+			}
+		}
 	}
-    }
+

    $if_admin->get('/config/:key' => {key => qr/[a-z0-9]{2,32}/})->to('request#getconfig')->name('getconfig');
    $if_admin->get('/account/:key' => {key => qr/[a-z0-9]{2,32}/})->to('request#getaccount')->name('getaccount');
@@ -550,9 +587,6 @@ sub theme_list {
 #------------------------------------------------------------

 sub getNavigation {
-
-    use esmith::NavigationDB;
-
    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';
@@ -573,7 +607,7 @@ sub getNavigation {
    # 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->open_ro() or
+        my $accountsdb = esmith::AccountsDB::UTF8->open_ro() or
            die "Couldn't open AccountsDB\n";
            
        # Check if user has AdminPanels property
@@ -646,8 +680,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
@@ -814,7 +847,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;

@@ -896,7 +929,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)
    {
@@ -990,4 +1023,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-Custom.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime-Custom.pm
@@ -0,0 +1,359 @@
+#
+# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-15 12:45:47 
+#
+#
+# Routines to be edited by the developer to provide content and validation for parameters
+# and provison of the control data for table(s)
+#
+use esmith::util;
+use esmith::util::network;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB;
+use esmith::NetworksDB::UTF8;
+use esmith::HostsDB;
+use esmith::DomainsDB::UTF8;
+
+use DateTime;
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
+
+#The most common ones - open DB when required.
+my $cdb; 
+my $adb; 
+my $ndb; 
+my $hdb; 
+my $ddb; 
+
+#The most common ones - you might want to use these if you need to make sure that the DB is refreshed.
+#$cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+#$adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+#$ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+#$hdb = esmith::HostsDB::UTF8->open() 	  || die("Couldn't open Hosts db");
+#$ddb = esmith::DomainsDB::UTF8->open()  || die("Couldn't open Domains db");
+
+
+# Validation routines - parameters for each panel
+
+	sub validate_PARAMS {
+		my $c = shift;
+		my $dat_data = shift; #Data hash as parameter
+		# Validation for each field 
+		my $ret = '';
+		
+		if (! TRUE) #validate $c->param('time_mode')
+			{$ret .= 'Validation for time_mode failed';}	
+		if (! TRUE) #validate $c->param('ntpserver')
+			{$ret .= 'Validation for ntpserver failed';}	
+		if (! TRUE) #validate $c->param('year')
+			{$ret .= 'Validation for year failed';}	
+		if (! TRUE) #validate $c->param('month')
+			{$ret .= 'Validation for month failed';}	
+		if (! TRUE) #validate $c->param('day')
+			{$ret .= 'Validation for day failed';}	
+		if (! TRUE) #validate $c->param('hour')
+			{$ret .= 'Validation for hour failed';}	
+		if (! TRUE) #validate $c->param('minute')
+			{$ret .= 'Validation for minute failed';}	
+		if (! TRUE) #validate $c->param('second')
+			{$ret .= 'Validation for second failed';}	
+		if ($ret eq '') {$ret = 'ok';}
+		return $ret;
+	}
+
+
+# Get singleton data for each panel
+
+	sub get_data_for_panel_PARAMS {
+		# Return a hash with the fields required which will be loaded into the shared data 
+		my $c = shift;
+		$cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+		# --- Setup options ---
+		# Get today's date and time
+		my ($today_sec, $today_min, $today_hour, $today_mday, $today_mon, $today_year) = localtime;
+		$today_year  += 1900;
+		$today_mon   += 1;
+		my $today_mon = sprintf('%02d', $today_mon);
+		my $today_mday   = sprintf('%02d', $today_mday);
+		my $now_hour    = sprintf('%02d', $today_hour);
+		my $now_min     = sprintf('%02d', $today_min);
+		my $now_sec     = sprintf('%02d', $today_sec);
+		my $current_year = $today_year;
+		my $ntpserverurl = $cdb->get_prop('ntpd','NTPServer');
+		my $now = DateTime->now( time_zone => 'local' );
+		my %ret = (
+			# fields from Inputs 
+			'time_mode'=>($ntpserverurl eq '' ? 'dat_manually_set' : 'dat_ntp_server'),
+			'ntpserver'=>"$ntpserverurl",
+			'year'=>"$today_year",
+			'month'=>"$today_mon",
+			'day'=>"$today_mday",,
+			'hour'=>"$now_hour",
+			'minute'=>"$now_min",
+			'second'=>"$now_sec",
+			'ntpstatus' => $cdb->get_prop('ntpd','status') || 'disabled',
+			# and the current time as a full format 
+			'currentdatetime' => $now->strftime('%Y-%m-%dT%H:%M:%S')
+			
+		);
+		return %ret;
+	}
+
+
+
+# Get control data for table(s)
+
+
+
+# Return hash with values from row in which link clicked on table
+
+	sub get_selected_PARAMS {
+		my $c = shift;
+		my $selected = shift; #Parameter is name of selected row.
+		my $is_new_record = shift; #Indicates new record required (defaults)
+		my %ret = ();
+		#gather the values here
+		return %ret;
+	}
+
+
+#after sucessful modify or create or whatever and submit then perfom (if the params validate)
+
+	sub perform_PARAMS {
+		my $c = shift;
+		my $dat_data = shift; #Data hash as parameter
+		my $ret = '';
+		$cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+		my $db = $cdb; #maybe one of the others
+		my $dbkey = 'ntpd';
+		# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
+		#$ntpserverurl = ( $c->param('time_mode') eq 'dat_manually_set' ? '' : $c->param('ntpserver'));
+		#if (!$db->set_prop($dbkey,'NTPServer',$ntpserverurl,type=>'service'))
+			#{$ret .= 'Perform/save failed for NTPServer';}
+		#if (! TRUE) #copy or perform with value: year e.g. $db->set_prop($dbkey,'year',$c->param('year'),type=>'service'))
+			#{$ret .= 'Perform/save failed for year';}
+		#if (! TRUE) #copy or perform with value: month e.g. $db->set_prop($dbkey,'month',$c->param('month'),type=>'service'))
+			#{$ret .= 'Perform/save failed for month';}
+		#if (! TRUE) #copy or perform with value: day e.g. $db->set_prop($dbkey,'day',$c->param('day'),type=>'service'))
+			#{$ret .= 'Perform/save failed for day';}
+		#if (! TRUE) #copy or perform with value: hour e.g. $db->set_prop($dbkey,'hour',$c->param('hour'),type=>'service'))
+			#{$ret .= 'Perform/save failed for hour';}
+		#if (! TRUE) #copy or perform with value: minute e.g. $db->set_prop($dbkey,'minute',$c->param('minute'),type=>'service'))
+			#{$ret .= 'Perform/save failed for minute';}
+		#if (! TRUE) #copy or perform with value: second e.g. $db->set_prop($dbkey,'second',$c->param('second'),type=>'service'))
+			#{$ret .= 'Perform/save failed for second';}
+		if ($c->param('time_mode') eq 'dat_manually_set'){
+			# Time and date set manually
+			$ret .= $c->disable_ntp();
+			$ret .= $c->validate_change_datetime()
+		} else {
+			# Time set by ntp server - set up parameters to it
+			$ret = $c->update_ntpserver($c->param('ntpserver'))
+		}
+		if ($ret eq '') {$ret = 'ok';}
+		return $ret;
+	}
+
+
+sub create_link{
+	# WIP
+	my ($c,$route, $panel, $index) = @_;
+	my $link = "$route?trt=$panel&Selected=$index";
+	return $link;
+}
+
+sub getZone_list {
+    my $c = shift;
+
+    #--------------------------------------------------
+    # Get a sorted list of time zones
+    #--------------------------------------------------
+    $ENV{BASH_ENV} = '';
+
+    if (!open(ZONES, "cd /usr/share/zoneinfo; /usr/bin/find . -type f -or -type l | /bin/grep '^./[A-Z]' |")) {
+        warn($c->l('COULD_NOT_OPEN_TZ_FILE') . $! . '.');
+        return undef;
+    }
+    my $zone;
+    my @zones = ();
+
+    while (defined($zone = <ZONES>)) {
+        chop($zone);
+        $zone =~ s/^.\///;
+        push @zones, $zone;
+    } ## end while (defined($zone = <ZONES>...))
+    close ZONES;
+    my @zt = sort @zones;
+    return \@zt;
+} ## end sub getZone_list
+
+sub getTimezone {
+
+    #--------------------------------------------------
+    # Figure out time zone by looking first looking at
+    # the configuration database value of TimeZone.
+    # If that is not defined, try and get it from /etc/localtime.
+    # If that doesn't work, default to US/Eastern.
+    #--------------------------------------------------
+    my $localtime;
+    my $timezonedefault = "US/Eastern";
+
+    if (defined $cdb->get('TimeZone')) {
+        $timezonedefault = $cdb->get('TimeZone')->value;
+    } else {
+
+        if (defined($localtime = readlink '/etc/localtime')) {
+            my $pos = index $localtime, 'zoneinfo/';
+
+            if ($pos > -1) {
+                $timezonedefault = substr $localtime, ($pos + 9);
+            }
+        } ## end if (defined($localtime...))
+    } ## end else [ if (defined $cdb->get(...))]
+    return $timezonedefault;
+} ## end sub getTimezone
+
+sub validate_change_datetime {
+    my $c = shift;
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+
+    #--------------------------------------------------
+    # Untaint parameters and check for validity
+    #--------------------------------------------------
+    my $timezone = $c->param('Timezone');
+
+    if ($timezone =~ /^([\w\-]+\/?[\w\-+]*)$/) {
+        $timezone = $1;
+    } else {
+        $timezone = "US/Eastern";
+    }
+    my $month = $c->param('month');
+    my $day = $c->param('day');
+    my $year = $c->param('year');
+    if (!is_valid_date($year, $month, $day)){
+		return $c->l('dat_Invalid_date')
+	}
+
+    my $hour = $c->param('hour');
+
+    if ($hour =~ /^(\d{1,2})$/) {
+        $hour = $1;
+    } else {
+        $hour = "12";
+    }
+
+    if (($hour < 1) || ($hour > 23)) {
+        return $c->l('dat_INVALID_HOUR') . " $hour. " . $c->l('dat_BETWEEN_0_AND_23');
+    }
+    my $minute = $c->param('minute');
+
+    if ($minute =~ /^(\d{1,2})$/) {
+        $minute = $1;
+    } else {
+        $minute = "0";
+    }
+
+    if (($minute < 0) || ($minute > 59)) {
+        return $c->l('datINVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
+    }
+    my $second = $c->param('second');
+
+    if ($second =~ /^(\d{1,2})$/) {
+        $second = $1;
+    } else {
+        $second = "0";
+    }
+
+    if (($second < 0) || ($second > 59)) {
+        return $c->l('dat_INVALID_SECOND') . " $second. " . $c->l('dat_BETWEEN_0_AND_59');
+    }
+
+    #--------------------------------------------------
+    # Store time zone in configuration database
+    #--------------------------------------------------
+    my $old  = $cdb->get('UnsavedChanges')->value;
+    my $rec  = $cdb->get('TimeZone');
+
+    unless ($rec) {
+        $rec = $cdb->new_record('TimeZone', undef);
+    }
+    $rec->set_value($timezone);
+    $cdb->get('UnsavedChanges')->set_value($old);
+
+    #--------------------------------------------------
+    # Signal event to change time zone, system time
+    # and hardware clock
+    #--------------------------------------------------
+    my $newdate = sprintf "%02d%02d%02d%02d%04d.%02d", $month, $day, $hour, $minute, $year, $second;
+    $c->app->log->info("Changing date manually to $newdate");
+    esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timezone-update", $newdate); #TEMP!!!
+    return '';
+} ## end sub validate_change_datetime
+
+sub is_valid_date {
+  my ($year, $month, $day) = @_;
+
+  # Check if all parts are defined and integers
+  return 0 unless defined $year && defined $month && defined $day;
+  return 0 unless $year =~ /^\d+$/ && $month =~ /^\d+$/ && $day =~ /^\d+$/;
+
+  # Try to construct a DateTime object
+  eval {
+    DateTime->new(year => $year, month => $month, day => $day);
+    1;
+  } or return 0;
+
+  return 1;
+}
+
+sub update_ntpserver {
+    my $c         = shift;
+    my $ntpserver = shift;
+    my $msg = '';
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+
+    #------------------------------------------------------------
+    # Looks good; go ahead and change the parameters.
+    #------------------------------------------------------------
+    my $old = $cdb->get('UnsavedChanges')->value;
+    my $rec = $cdb->get('ntpd');
+
+    if ($rec) {
+        $rec->set_prop('status',    'enabled');
+        $rec->set_prop('NTPServer', $ntpserver);
+    } else {
+        $rec = $cdb->new_record('ntpd',
+            { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => $ntpserver });
+    }
+    $cdb->get('UnsavedChanges')->set_value($old);
+    $msg = ''; #$c->l('dat_SETTINGS_CHANGED');
+
+    if ($ntpserver =~ /^\s*$/) {
+        $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
+        $rec->set_prop('NTPServer', '');
+        $msg = $c->l('dat_INVALID_NTP_SERVER') if ($rec->prop('SyncToHWClockSupported') || 'yes') ne 'yes';
+    } ## end if ($ntpserver =~ /^\s*$/)
+    esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timeserver-update");
+    return $msg;
+} ## end sub update_ntpserver
+
+sub disable_ntp {
+
+    # make sure that the parameters are set for disabled
+    my $old = $cdb->get('UnsavedChanges')->value;
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+    my $rec = $cdb->get('ntpd');
+
+    if ($rec) {
+        $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
+        $rec->set_prop('NTPServer', '');
+    } else {
+        $rec = $cdb->new_record('ntpd',
+            { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => '' });
+    }
+    $cdb->get('UnsavedChanges')->set_value($old);
+    return '';
+} ## end sub disable_ntp
+
+1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
@@ -1,356 +1,333 @@
 package SrvMngr::Controller::Datetime;
-
+#
+# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-15 12:45:47 
+# Remember that each route must be unique (else they just overwrite each other).
+# you cannot have get and post on the same name and url.
+#
 #----------------------------------------------------------------------
 # heading     : System
 # description : Date and time
-# navigation  : 4000 400
+# navigation  : 4000 300
+#
+# ######name   : datetimet,    method : post,   url : /datetimet,     ctlact : datetime#testntp
+#
 # routes : end
-#------------------------------
+#
+# Documentation: https://wiki.contribs.org/Datetime
+#----------------------------------------------------------------------
+
+#
+# Scheme of things:
+#
+# TBA!!
+
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+
+use Data::Dumper;
+
 use esmith::util;
-use SrvMngr qw( gen_locale_date_string );
-our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+use esmith::util::network;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB;
+use esmith::NetworksDB;
+use esmith::HostsDB::UTF8;
+use esmith::DomainsDB::UTF8;
+
+my $cdb;
+my $adb;
+my $ndb; 
+my $hdb; 
+my $ddb; 
+
+my %dat_data;
+
+require '/usr/share/smanager/lib/SrvMngr/Controller/Datetime-Custom.pm';  #The code that is to be added by the developer

 sub main {
+#
+# Initial entry - route is "/<whatever>"
+#
+#set initial panel
+#for initial panel:
+	#Specifiy panel to enter
+	#load up _data hash with DB fields
+	#load up stash with pointer(s) to control fields hash(= get-))
+		#and a pointer to the prefix_data hash
+#render initial panel
+
+    my $c = shift;
+    $c->app->log->info( $c->log_req );
+
+	#The most common ones - you might want to delete some of these if they are not used.
+	 $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+	 $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	 $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	 $hdb = esmith::HostsDB::UTF8->open() 	  || die("Couldn't open Hosts db");
+	 $ddb = esmith::DomainsDB::UTF8->open()  || die("Couldn't open Domains db");
+
+     %dat_data = ();
+    my $title     = $c->l('dat_FORM_TITLE');
+    my $modul     = $c->l('dat_INITIAL_DESC');
+
+    $dat_data{'trt'} = 'PARAMS';
+    
+    #Load any DB entries into the <prefix>_data area so as they are preset in the form
+    # which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
+    my $db = $cdb; #pickup local or global db or Default to config
+    
+	
+	$c->do_display($dat_data{'trt'});
+	
+}
+
+# Post request with params - submit from the form 
+sub do_update {
+#
+# Return after submit pushed on panel (this is a post) - route is "/<whatever>u"
+# parameters in the params hash.
+#
+#load up all params into prefix_data hash:
+#By panel (series of if statements - only one executed):
+		#call validate-PANEL() - return ret = ok or error message
+			
+#if validation not ok:
+	#render back to current panel with error message in stash
+#otherwise:
+	#By panel (series of if statements - only one executed):
+		#do whatever is required: call perform-PANEL() - return 'ok' or Error Message
+			#call signal-event for any global actions specified (check it exists - error and continue?)
+			#if action smeserver-<whatever>-update exists
+				#signal_event smeserver-<whatever>-update
+			#call signal-event for any specific actions for thids panel (check it exists first - error and continue)
+		#set success in stash
+		#if no "nextpanel" entry:
+			#set firstpanel
+		#else 
+			#set nextpanel
+		#call render
+	
    my $c = shift;
    $c->app->log->info($c->log_req);
-    my %dat_datas = ();
+    
+    #$c->app->log->info($c->param('month'));
+    
+
+	#The most common ones - you might want to delete some of these if they are not used.
+	 $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+	 $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	 $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	 $hdb = esmith::HostsDB::UTF8->open() 	  || die("Couldn't open Hosts db");
+	 $ddb = esmith::DomainsDB::UTF8->open()  || die("Couldn't open Domains db");
+
    my $title     = $c->l('dat_FORM_TITLE');
    my $modul     = $c->l('dat_INITIAL_DESC');
-    $dat_datas{ntpstatus} = 'disabled';
-    my $rec = $cdb->get('ntpd');

-    if ($rec) {
-        $dat_datas{'ntpserver'} = $rec->prop('NTPServer') || '';
+	# Accessing all POST/GET parameters
+    #my $params = $c->req->params->to_hash;

-        if ($rec->prop('status') eq 'enabled') {
-            $dat_datas{ntpstatus} = 'enabled'
-                unless ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' and $dat_datas{ntpserver} =~ m#^\s*$#;
-        }
-    } ## end if ($rec)
-    (   $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month},  $dat_datas{day}, $dat_datas{year},
-        $dat_datas{hour},    $dat_datas{minute},    $dat_datas{second}, $dat_datas{ampm}
-        )
-        = split /\|/,
-        `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
+    # Get number of POST parameters
+    #my $num_params = keys scaler %$params;
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $dat_data{$key} = $value;
+    #}

-    # get rid of trailing carriage return on last field
-    chop($dat_datas{ampm});
-    $dat_datas{'now_string'} = gen_locale_date_string;
-    $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
-    $c->render('datetime');
-} ## end sub main
+    # the value of trt will tell you which panel has returned    
+    my $trt = $c->param('trt') || 'PARAMS'; #hidden control on every form.
+    my $ret = 'ok';

-sub do_update {
-    my $c         = shift;
-    my %dat_datas = ();
+    #Validate the parameters in a custom sub one for each panel (although only one of these will be executed)
+    my $thispanel;
+    
+		if ($trt eq 'PARAMS'){
+			#Validate form parameters for panel PARAMS
+			$ret = $c->validate_PARAMS(\%dat_data);
+			$thispanel = 'PARAMS';
+		}
+	
+	if ($ret ne 'ok'){
+		$c->stash(error => $c->l($ret));
+		$c->do_display($thispanel);
+	} else {
+		#Do whatever is needed, including writing values to the DB
+		
+		
+			if ($trt eq 'PARAMS'){
+				#do whatever is required ...
+				$ret = $c->perform_PARAMS(\%dat_data);
+				if ($ret ne 'ok') {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->stash( 
+						title => $title, 
+						modul => $modul,
+						dat_data  => \%dat_data
+					);
+					$c->render(template => "datetime");	
+					return
+				} else {
+					if ($c->param('time_mode') eq 'dat_manually_set') {
+						$c->stash( success => $c->l('dat_UPDATING_CLOCK')); 
+					} else {
+						$c->stash( success => $c->l('dat_SETTINGS_CHANGED')); 
+					}
+				}
+			}
+
+	
+		# and call any signal-events needed
+		#TBD
+		# Setup shared data and call panel
+		if ('none' eq 'none') {
+			$dat_data{'trt'} = 'PARAMS';
+		} else {
+			$dat_data{'trt'} = 'none';
+		}	
+		$c->do_display($dat_data{'trt'});
+	} 
+}
+
+sub do_display {
+#
+# Return after link clicked in table (this is a get) - route is "/<whatever>d"
+# Expects ?trt=PANEL&selected="TableRowName" plus any other required
+#
+# OR it maybe a post from the main panel to add a new record 
+#
+#load up all supplied params into prefix_data hash
+#call get-selected-PANEL() - returns hash of all relevent parameters
+#load up returned hash into prefix_data
+#render - to called panel
+
+    my ($c,$trt) = @_;
+    $c->app->log->info($c->log_req);
+
+	#The most common ones - you might want to delete some of these if they are not used.
+	 $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+	 $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	 $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	 $hdb = esmith::HostsDB::UTF8->open() 	  || die("Couldn't open Hosts db");
+	 $ddb = esmith::DomainsDB::UTF8->open()  || die("Couldn't open Domains db");
+    
    my $title     = $c->l('dat_FORM_TITLE');
    my $modul     = $c->l('dat_INITIAL_DESC');
-    my $result;
-    my $success;
-    my $old_ntpstatus = $c->param('Old_ntpstatus');
-    $dat_datas{ntpstatus} = $c->param('Ntpstatus');

-    if ($dat_datas{ntpstatus} ne $old_ntpstatus) {
-        if ($dat_datas{ntpstatus} eq 'disabled') {
-            (   $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month},
-                $dat_datas{day},     $dat_datas{year},      $dat_datas{hour},
-                $dat_datas{minute},  $dat_datas{second},    $dat_datas{ampm}
-                )
-                = split /\|/,
-                `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
+	# Accessing all parameters
+    #my $params = $c->req->params->to_hash;

-            # get rid of trailing carriage return on last field
-            chop($dat_datas{ampm});
-        } else {
-            $dat_datas{ntpserver} = ($cdb->get_prop('ntpd', 'NTPServer')) || '';
-        }
-        $dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
-        $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
-        return $c->render('datetime');
-    } ## end if ($dat_datas{ntpstatus...})
+    # Get number of parameters
+    #my $num_params = keys %$params;
+    
+    #Tag as Post or Get (ie. create new entry or edit existing one
+    my $is_new_record = ($c->req->method() eq 'POST');
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $dat_data{$key} = $value;
+    #}

-    if ($dat_datas{ntpstatus} eq 'enabled') {
+    # the value of trt will tell you which panel has returned   
+    if (! $trt){ 
+		$trt = $c->param('trt') || 'PARAMS'; #Indicates where to go now
+	}
+ 
+    # Now add in the params from the selected row from the table
+		
+    my %selectedrow;
+    
+		if ($trt eq 'PARAMS'){
+			#Validate Get selected row (if applicable)  PARAMS
+				%selectedrow = $c->get_selected_PARAMS($dat_data{'Selected'},$is_new_record);
+		}
+	
+ 
+	#Copy in the selected row params to the prefix_data hash to pass to the panel
+	while (my ($key, $value) = each %selectedrow){
+        $dat_data{$key} = $value;
+    }
+	# Where to go now
+	$dat_data{'trt'} = $trt;
+	
+	# Set up other shared data according to the panel to go to
+    
+		if ($trt eq 'PARAMS'){
+			# pickup any other contents needed and load them into hash shared with panel
+			my %returned_hash;
+			# subroutine returns a hash directly
+			%returned_hash = $c->get_data_for_panel_PARAMS();
+			# Copy each key-value pair from the returned hash to the prefix data hash
+			while (my ($key, $value) = each %returned_hash) {
+				$dat_data{$key} = $value;
+			}
+		}
+	
+	
+	# and table control fields
+     
+	
+	# Data for panel
+	$c->stash( 
+		title 			=> $title, 
+		modul => $modul,
+		dat_data  => \%dat_data
+	);
+	$c->render(template => "datetime");
+}  

-        # update ntpserver
-        $dat_datas{ntpserver} = $c->param('Ntpserver') || '';
-
-        if ($dat_datas{ntpserver} eq "pool.ntp.org") {
-            $result .= $c->l('dat_INVALID_NTP_ADDR');
-        } elsif ($dat_datas{ntpserver} =~ /^([a-zA-Z0-9\.\-]+)$/) {
-            $dat_datas{ntpserver} = $1;
-
-            #        } elsif ( $dat_datas{ntpserver} =~ /^\s*$/ ) {
-            #            $dat_datas{ntpserver} = "";
-        } else {
-            $result .= $c->l('dat_INVALID_NTP_ADDR');
-        }
-
-        if (!$result) {
-            $success = update_ntpserver($c, $dat_datas{ntpserver});
-        }
-    } else {
-
-        # set Locale time & clean ntpserver
-        #my $servername = ($c->param('ServerName') || 'WS');
-        if (!$result) {
-            $result = validate_change_datetime($c);
-
-            if ($result eq 'OK') {
-                $success = $c->l('dat_UPDATING_CLOCK');
-                $result  = '';
-                disable_ntp();
-                $success .= '<br>' . $c->l('dat_SERVER_DISABLED_DESC');
-            } ## end if ($result eq 'OK')
-        } ## end if (!$result)
-    } ## end else [ if ($dat_datas{ntpstatus...})]
-
-    if ($result) {
-        $c->stash(error => $result);
-        $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
-        return $c->render('datetime');
-    } ## end if ($result)
-
-    #$result = $c->l('dat_SUCCESS');
-    my $message = "'Datetime' update DONE";
-    $c->app->log->info($message);
-    $c->flash(success => $success);
-    $c->redirect_to('/datetime');
-} ## end sub do_update
-
-sub validate_change_datetime {
+sub do_testntp {
    my $c = shift;
+    my $server = $c->req->json->{ntpserver} // '';

-    #--------------------------------------------------
-    # Untaint parameters and check for validity
-    #--------------------------------------------------
-    my $timezone = $c->param('Timezone');
-
-    if ($timezone =~ /^([\w\-]+\/?[\w\-+]*)$/) {
-        $timezone = $1;
-    } else {
-        $timezone = "US/Eastern";
-    }
-    my $month = $c->param('Month');
-
-    if ($month =~ /^(\d{1,2})$/) {
-        $month = $1;
-    } else {
-        $month = "1";
+    # Strict validation: hostname or IPv4
+    unless ($server =~ /^(?=.{1,253}$)([a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*|\d{1,3}(?:\.\d{1,3}){3})$/) {
+        return $c->render(json => { success => 0, error => 'Invalid server name or IP' });
    }

-    if (($month < 1) || ($month > 12)) {
-        return $c->l('dat_INVALID_MONTH') . " $month. " . $c->l('dat_MONTH_BETWEEN_1_AND_12');
-    }
-    my $day = $c->param('Day');
+    my $timeout = 5;
+    my @cmd = ('timeout', $timeout, 'ntpdate', '-q', $server);

-    if ($day =~ /^(\d{1,2})$/) {
-        $day = $1;
-    } else {
-        $day = "1";
+    # Run ntpdate and capture output
+    my $output = qx{@cmd 2>&1};
+    $c->app->log->info($output);
+    my $exit_code = $? >> 8;
+
+    # Parse for known errors
+    if ($exit_code == 124) {
+        return $c->render(json => { success => 0, error => "Timeout: NTP server did not respond within $timeout seconds" });
+    }
+    if ($output =~ /no server suitable for synchronization found/i) {
+        return $c->render(json => { success => 0, error => "No suitable NTP server found or server unreachable" });
+    }
+    if ($output =~ /Name or service not known|Temporary failure in name resolution/i) {
+        return $c->render(json => { success => 0, error => "DNS resolution failed for $server" });
+    }
+    if ($output =~ /ntpdig: no eligible servers/i) {
+        return $c->render(json => { success => 0, error => "Not a an NTP server" });
+    }
+    if ($output =~ /permission denied/i) {
+        return $c->render(json => { success => 0, error => "Permission denied running ntpdate" });
+    }
+    if ($exit_code != 0) {
+        return $c->render(json => { success => 0, error => "ntpdate failed (exit code $exit_code): $output" });
    }

-    if (($day < 1) || ($day > 31)) {
-        return $c->l('dat_INVALID_DAY') . " $day. " . $c->l('dat_BETWEEN_1_AND_31');
-    }
-    my $year = $c->param('Year');
+    # Extract date and time down to seconds from adjust line
+	my ($datetime) = $output =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/m;

-    if ($year =~ /^(\d{4})$/) {
-        $year = $1;
-    } else {
-        $year = "2000";
-    }
+	if ($datetime) {
+		return $c->render(json => { success => 1, time => $datetime });
+	} else {
+		return $c->render(json => { success => 0, error => "Could not parse date/time from NTP server response." });}
+}

-    if (($year < 1900) || ($year > 2200)) {
-        return $c->l('dat_INVALID_YEAR') . " $year. " . $c->l('dat_FOUR_DIGIT_YEAR');
-    }
-    my $hour = $c->param('Hour');
-
-    if ($hour =~ /^(\d{1,2})$/) {
-        $hour = $1;
-    } else {
-        $hour = "12";
-    }
-
-    if (($hour < 1) || ($hour > 12)) {
-        return $c->l('dat_INVALID_HOUR') . " $hour. " . $c->l('dat_BETWEEN_1_AND_12');
-    }
-    my $minute = $c->param('Minute');
-
-    if ($minute =~ /^(\d{1,2})$/) {
-        $minute = $1;
-    } else {
-        $minute = "0";
-    }
-
-    if (($minute < 0) || ($minute > 59)) {
-        return $c->l('datINVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
-    }
-    my $second = $c->param('Second');
-
-    if ($second =~ /^(\d{1,2})$/) {
-        $second = $1;
-    } else {
-        $second = "0";
-    }
-
-    if (($second < 0) || ($second > 59)) {
-        return $c->l('dat_INVALID_SECOND') . " $second. " . $c->l('dat_BETWEEN_0_AND_59');
-    }
-    my $ampm = $c->param('Ampm');
-
-    if ($ampm =~ /^(AM|PM)$/) {
-        $ampm = $1;
-    } else {
-        $ampm = "AM";
-    }
-
-    # convert to 24 hour time
-    $hour = $hour % 12;
-
-    if ($ampm eq "PM") {
-        $hour = $hour + 12;
-    }
-
-    #--------------------------------------------------
-    # Store time zone in configuration database
-    #--------------------------------------------------
-    my $conf = esmith::ConfigDB->open();
-    my $old  = $conf->get('UnsavedChanges')->value;
-    my $rec  = $conf->get('TimeZone');
-
-    unless ($rec) {
-        $rec = $conf->new_record('TimeZone', undef);
-    }
-    $rec->set_value($timezone);
-    $conf->get('UnsavedChanges')->set_value($old);
-
-    #--------------------------------------------------
-    # Signal event to change time zone, system time
-    # and hardware clock
-    #--------------------------------------------------
-    my $newdate = sprintf "%02d%02d%02d%02d%04d.%02d", $month, $day, $hour, $minute, $year, $second;
-    esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timezone-update", $newdate);
-    return 'OK';
-} ## end sub validate_change_datetime
-
-sub update_ntpserver {
-    my $c         = shift;
-    my $ntpserver = shift;
-    my $msg;
-
-    #------------------------------------------------------------
-    # Looks good; go ahead and change the parameters.
-    #------------------------------------------------------------
-    my $old = $cdb->get('UnsavedChanges')->value;
-    my $rec = $cdb->get('ntpd');
-
-    if ($rec) {
-        $rec->set_prop('status',    'enabled');
-        $rec->set_prop('NTPServer', $ntpserver);
-    } else {
-        $rec = $cdb->new_record('ntpd',
-            { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => $ntpserver });
-    }
-    $cdb->get('UnsavedChanges')->set_value($old);
-    $msg = $c->l('dat_SETTINGS_CHANGED');
-
-    if ($ntpserver =~ /^\s*$/) {
-        $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
-        $rec->set_prop('NTPServer', '');
-        $msg = $c->l('dat_INVALID_NTP_SERVER') if ($rec->prop('SyncToHWClockSupported') || 'yes') ne 'yes';
-    } ## end if ($ntpserver =~ /^\s*$/)
-    esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timeserver-update");
-    return $msg;
-} ## end sub update_ntpserver
-
-sub disable_ntp {
-
-    # make sure that the parameters are set for disabled
-    my $old = $cdb->get('UnsavedChanges')->value;
-    my $rec = $cdb->get('ntpd');
-
-    if ($rec) {
-        $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
-        $rec->set_prop('NTPServer', '');
-    } else {
-        $rec = $cdb->new_record('ntpd',
-            { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => '' });
-    }
-    $cdb->get('UnsavedChanges')->set_value($old);
-} ## end sub disable_ntp
-
-sub getTimezone {
-
-    #--------------------------------------------------
-    # Figure out time zone by looking first looking at
-    # the configuration database value of TimeZone.
-    # If that is not defined, try and get it from /etc/localtime.
-    # If that doesn't work, default to US/Eastern.
-    #--------------------------------------------------
-    my $localtime;
-    my $timezonedefault = "US/Eastern";
-
-    if (defined $cdb->get('TimeZone')) {
-        $timezonedefault = $cdb->get('TimeZone')->value;
-    } else {
-
-        if (defined($localtime = readlink '/etc/localtime')) {
-            my $pos = index $localtime, 'zoneinfo/';
-
-            if ($pos > -1) {
-                $timezonedefault = substr $localtime, ($pos + 9);
-            }
-        } ## end if (defined($localtime...))
-    } ## end else [ if (defined $cdb->get(...))]
-    return $timezonedefault;
-} ## end sub getTimezone
-
-sub getZone_list {
-    my $c = shift;
-
-    #--------------------------------------------------
-    # Get a sorted list of time zones
-    #--------------------------------------------------
-    $ENV{BASH_ENV} = '';
-
-    if (!open(ZONES, "cd /usr/share/zoneinfo; /usr/bin/find . -type f -or -type l | /bin/grep '^./[A-Z]' |")) {
-        warn($c->l('COULD_NOT_OPEN_TZ_FILE') . $! . '.');
-        return undef;
-    }
-    my $zone;
-    my @zones = ();
-
-    while (defined($zone = <ZONES>)) {
-        chop($zone);
-        $zone =~ s/^.\///;
-        push @zones, $zone;
-    } ## end while (defined($zone = <ZONES>...))
-    close ZONES;
-    my @zt = sort @zones;
-    return \@zt;
-} ## end sub getZone_list
-
-sub getMonth_list {
-    my $c = shift;
-    return [
-        [ $c->l('dat_JANUARY')   => '1' ],
-        [ $c->l('dat_FEBRUARY')  => '2' ],
-        [ $c->l('dat_MARCH')     => '3' ],
-        [ $c->l('dat_APRIL')     => '4' ],
-        [ $c->l('dat_MAY')       => '5' ],
-        [ $c->l('dat_JUNE')      => '6' ],
-        [ $c->l('dat_JULY')      => '7' ],
-        [ $c->l('dat_AUGUST')    => '8' ],
-        [ $c->l('dat_SEPTEMBER') => '9' ],
-        [ $c->l('dat_OCTOBER')   => '10' ],
-        [ $c->l('dat_NOVEMBER')  => '11' ],
-        [ $c->l('dat_DECEMBER')  => '12' ]
-    ];
-} ## end sub getMonth_list
-1;
+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');
@@ -68,23 +67,23 @@ sub do_display {

        #Add a network - called after new network details filled in
        my %ret = add_network($c);
+        $network_db   = esmith::NetworksDB::UTF8->open();

        #Return to list page if success
        if ((index($ret{ret}, "SUCCESS") != -1)) {
            $trt = "LIST";
        } else {
-
            #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)
@@ -222,17 +221,18 @@ sub add_network {
    # in the form itself, but it just seemed too fiddly to do that
    # at the moment.  -- Skud 2002-04-11
    # I agree --bjr 2020-04-18
-    if ($routerNetwork ne $localNetwork) {
-        return (ret => 'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK');
-    }
    my ($network, $broadcast) = esmith::util::computeNetworkAndBroadcast($networkAddress, $networkMask);

+    if ($routerNetwork ne $localNetwork) {
+        return (ret => 'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK', vars => "$network,$networkMask,$networkRouter");
+    }
+
    if ($network eq $localNetwork) {
-        return (ret => 'ln_NETWORK_ALREADY_LOCAL');
+        return (ret => 'ln_NETWORK_ALREADY_LOCAL', vars => "$network,$networkMask,$networkRouter");
    }

    if ($network_db->get($network)) {
-        return (ret => 'ln_NETWORK_ALREADY_ADDED');
+        return (ret => 'ln_NETWORK_ALREADY_ADDED', vars => "$network,$networkMask,$networkRouter");
    }
    $network_db->new_record(
        $network,
@@ -246,7 +246,7 @@ sub add_network {
    $network =~ /(.+)/;
    $network = $1;
    system("/sbin/e-smith/signal-event", "network-create", $network) == 0
-        or (return (ret => 'ln_ERROR_CREATING_NETWORK'));
+        or (return (ret => 'ln_ERROR_CREATING_NETWORK', vars => "$network,$networkMask,$networkRouter"));
    my ($totalHosts, $firstAddr, $lastAddr) = esmith::util::computeHostRange($network, $networkMask);
    my $msg;

@@ -268,4 +268,4 @@ sub add_network {
        );
    } ## end else [ if ($totalHosts == 1) ]
 } ## end sub add_network
-1;
+1;
--- 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');
@@ -143,8 +139,8 @@ sub do_display {

        #List all the port forwards
        # Open them again as maybe written to above 
-        $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";
+        $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;
@@ -172,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;
    }

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

 sub get_destination_host {
    my $q           = shift;
-	$cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
+    $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;
@@ -362,7 +358,7 @@ sub isValidPort() {

 sub validate_destination_host {
    my $c     = shift;
-	$cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
+    $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');
@@ -401,4 +397,4 @@ sub validate_allowed_hosts {
    } ## end foreach (split(/[\s,]+/, $ahost...))
    return %valid_ahost_list;
 } ## end sub validate_allowed_hosts
-1;
+1;
--- 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'));
@@ -40,6 +43,7 @@ sub do_update {
    my $http_proxy_status = $c->param('http_proxy_status') || 'disabled';
    my $smtp_proxy_status = $c->param('smtp_proxy_status') || '';
    my $result            = "";
+    $db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
    my $squid = $db->get('squid') or $result = $c->l('prx_ERR_NO_SQUID_REC');

    # smtpd is allowed to not exist, as the relevant packages may not be
@@ -51,10 +55,10 @@ sub do_update {
    # Update the system
    #
    system("/sbin/e-smith/signal-event proxy-update") == 0
-        or $result = $c->l('prx_ERR_PROXY_UPDATE_FAILED');
+        or $result = $c->l('prx_ERR_PROXY_UPDATE_FAILED');  
    my $title = $c->l('prx_TITLE');
    if ($result eq '') { $result = $c->l('prx_SUCCESS'); }
    $c->stash(title => $title, modul => $result);
    $c->render(template => 'module');
 } ## end sub do_update
-1;
+1;
--- 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
-my  $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') || '');

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

 sub get_prop {
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $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;
@@ -155,8 +155,7 @@ sub get_prop {
 sub get_value {
    my $c    = shift;
    my $item = shift;
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    return ($db->get($item)->value());
 } ## end sub get_value

@@ -205,7 +204,7 @@ sub get_ftp_password_login_access {
 } ## end sub get_ftp_password_login_access

 sub get_telnet_mode {
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $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';
@@ -215,7 +214,7 @@ sub get_telnet_mode {
 } ## end sub get_telnet_mode

 sub get_ipsecrw_sessions {
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $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');
@@ -225,7 +224,7 @@ sub get_ipsecrw_sessions {
 } ## end sub get_ipsecrw_sessions

 sub get_ipsecrw_status {
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
    return undef unless ($db->get('ipsec'));
    return $db->get('ipsec')->prop('RoadWarriorStatus');
 }
@@ -233,7 +232,7 @@ sub get_ipsecrw_status {
 sub pptp_and_dhcp_range {
    my $c           = shift;
    my $val         = shift || 0;
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $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') || '';
@@ -251,7 +250,7 @@ sub pptp_and_dhcp_range {

 sub _get_valid_from {
    my $c   = shift;
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $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') || ''));
@@ -294,11 +293,11 @@ sub validate_network_and_mask {

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

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

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

    #	my @remove = $c->param('Remove_nets');
    my @vals = $c->_get_valid_from();
@@ -439,4 +438,4 @@ sub remove_valid_from {
    $db->get('httpd-admin')->set_prop('ValidFrom', $prop);
    return 1;
 } ## end sub remove_valid_from
-1;
+1;
--- 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
@@ -3,7 +3,7 @@ package SrvMngr::Controller::Review;
 #----------------------------------------------------------------------
 # heading     : Investigation
 # description : Review configuration
-# navigation  : 6000 6800
+# navigation  : 7000 400
 # routes : end
 #----------------------------------------------------------------------
 use strict;
@@ -13,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 = ();
@@ -97,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;

@@ -125,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;

@@ -151,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);
@@ -165,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;
@@ -265,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();
@@ -281,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);
@@ -295,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)
    {
@@ -308,4 +315,4 @@ sub get_public_ip_address
 }


-1;
+1;
--- 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,6 +32,7 @@ sub main {
    my %log_datas = ();
    my $title     = $c->l('log_FORM_TITLE');
    my $notif     = '';
+    $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);
@@ -231,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/I18N/Modules/Datetime/datetime_en.lex
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Datetime/datetime_en.lex
@@ -1,5 +1,5 @@
-
 'dat_FORM_TITLE' => 'Date and time configuration',
+'dat_The_time_is_currently' => 'The time is currently:',
 'dat_INITIAL_DESC' => 'This is where you configure the date and time of this server. You may use an existing network time server or
 manually set the date and time for your time zone.',
 'dat_SET_DATE_TITLE' => 'Set Date and Time',
@@ -18,7 +18,7 @@ manually set the date and time for your time zone.',
 'dat_DECEMBER' => 'December',
 'dat_NEW_M/D/Y' => 'New month/day/year:',
 'dat_NEW_H/M/S' => 'New hour/min/sec:',
-'dat_AM/PM_AND_TZ' => 'AM/PM and time zone:',
+'dat_TZ' => 'Time zone:',
 'dat_NTP_ENABLE_DESC' => 'The server can periodically synchronize the system clock to a network time protocol (NTP) server. If you select this option, enter the hostname or IP address of the NTP server below.',
 'dat_NTP_CONFIGURE_DESC' => 'The server is periodically synchronizing the system clock to the network time protocol (NTP) server specified below. To synchronize to a different NTP server, enter a different hostname or IP address in the field below.',
 'dat_NTP_DISABLE_DESC' => 'Choose this option to stop syncronizing the system clock to the NTP
@@ -38,9 +38,7 @@ server.When the NTP service is disabled, you can set the system date and time ma
 'dat_INVALID_SECOND' => 'Error: invalid second',
 'dat_MONTH_BETWEEN_1_AND_12' => 'Please choose a month value between 1 and 12.',
 'dat_INVALID_MONTH' => 'Error: invalid month',
-'dat_UPDATING_CLOCK' => 'System clock is being updated. Please wait for a few seconds, 
-then click <A HREF="datetime?page=1&wherenext=Verify" TARGET="main">here</A>
-to verify changes.',
+'dat_UPDATING_CLOCK' => 'System clock is being updated',
 'dat_ERR_SETTING_CLOCK' => 'Error occurred while setting system time and hardware clock.',
 'dat_SERVER_DISABLED' => 'Network time server disabled successfully',
 'dat_SERVER_DISABLED_DESC' => 'You have disabled this service: The server will rely on its internal
@@ -57,3 +55,8 @@ clock, and <b>will not</b> try to synchronize from a time server.',
 'dat_NTP_DISABLE_TITLE' => 'Disable Network Time Server',
 'dat_CURRENT_SETTING' => 'Current setting',
 'Date and time' => 'Date and time',
+'dat_ntp_server' => 'NTP server',
+'dat_manually_set' => 'Set manually',
+'dat_NTP_Server_URL' =>'NTP Server URL:',
+'dat_set_manually' =>'Set Date and Time:',
+'dat_Invalid_date' => 'Invalid date',
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Localnetworks/localnetworks_en.lex
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Localnetworks/localnetworks_en.lex
@@ -12,13 +12,13 @@
 'ln_REMOVE_CONFIRM' => 'Are you sure you wish to remove this network?',
 'ln_DEFAULT' => 'default',
 'ln_NUMBER_OF_HOSTS' => 'Number of hosts',
-'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK' => 'Error: router address {$networkRouter} is not accessible  from local network. Did not add network.',
+'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK' => 'Error: router address [_3] is not accessible  from local network. Did not add network.',
 'ln_LOCALNETWORK_ADD'=>'Add network',
-'ln_NETWORK_ALREADY_LOCAL' => ' Error: network {$network} (derived from network  {$networkAddress} and subnet mask {$networkMask})   is already considered local. Did not add new network. ',
-'ln_NETWORK_ALREADY_ADDED' => 'Error: network {$network} (derived from network  {$networkAddress} and subnet mask {$networkMask})   has already been added. Did not add new network.',
+'ln_NETWORK_ALREADY_LOCAL' => ' Error: network [_1] (derived from network  [_1] and subnet mask [_2])   is already considered local. Did not add new network. ',
+'ln_NETWORK_ALREADY_ADDED' => 'Error: network [_1] (derived from network  [_1] and subnet mask [_2])   has already been added. Did not add new network.',
 'ln_ERROR_CREATING_NETWORK' => 'Error occurred while creating network.',
 'ln_SUCCESS' =>'Successfully added network [_1]/[_2] via router [_3].',
-'ln_SUCCESS_SINGLE_ADDRESS' =>'Successfully added network {$network}/{$networkMask} via router {$networkRouter}.  Your server will grant local access  privileges to the single IP address {$network}. ',
+'ln_SUCCESS_SINGLE_ADDRESS' =>'Successfully added network [_1]/[_2] via router [_3].  Your server will grant local access  privileges to the single IP address [_1]. ',
 'ln_SUCCESS_NETWORK_RANGE' =>'Successfully added network [_1]/[_2] via router [_3]. Your server will grant local access  privileges to [_4] IP addresses in the range  [_5] to [_6]. ',
 'ln_NO_SUCH_NETWORK' =>'Network not found in network db',
 'ln_SUCCESS_REMOVED_NETWORK' =>'Successfully removed network [_1]/[_2] via router [_3].',
@@ -26,5 +26,5 @@
 'ln_NO_ADDITIONAL_NETWORKS' => 'No additional networks',
 'ln_REMOVE_HOSTS_DESC' => 'Local hosts configured on the network you are about to remove have  been detected. By default, they will also be removed. Uncheck this  box if, for some reason, you do not wish this to happen. Note that  they will not be treated as local, and may not even be reachable,  after this network is removed. ',
 'ln_REMOVE_HOSTS_LABEL' => 'Remove hosts on network',
-'ln_extra' => '{$network}/{$networkMask} via router  $networkRouter}.',
-'ln_SUCCESS_NONSTANDARD_RANGE' =>'<p>Successfully added network [_1]/[_2] via router [_3].</p><p>  Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6].</p><p>  Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification  <b>[_7]</b> will be used instead.</p>',
+'ln_extra' => '[_1]/[_2] via router  $networkRouter}.',
+'ln_SUCCESS_NONSTANDARD_RANGE' =>'<p>Successfully added network [_1]/[_2] via router [_3].</p><p>  Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6].</p><p>  Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification  <b>[_7]</b> will be used instead.</p>',
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Portforwarding/portforwarding_en.lex
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Portforwarding/portforwarding_en.lex
@@ -1,16 +1,13 @@
 'pf_FORM_TITLE' => 'Configure Port Forwarding',
-'pf_FIRST_PAGE_DESCRIPTION' => '<p>
-                You can use this panel to modify your firewall rules so
+'pf_FIRST_PAGE_DESCRIPTION' => 'You can use this panel to modify your firewall rules so
                as to open a specific port on this server and forward it
                to another port on another host.  Doing so will permit
                incoming traffic to directly access a private host on
                your LAN.
-            </p><p>
                WARNING: Misuse of this feature can seriously compromise the
                security of your network. Do not use this feature
                lightly, or without fully understanding the implications
-                of your actions.
-            </p>',
+                of your actions.',
 'pf_CREATE_RULE' => 'Create portforwarding rule',
 'pf_SUMMARY_ADD_DESC' => 'The following summarizes the port-forwarding rule
            that you are about to add. If you are satisfied with the rule,
@@ -22,13 +19,13 @@
            port-forwarding rules installed on this server. Click on the
            \'Remove\' link to remove the corresponding rule.',
 'pf_NO_FORWARDS' => 'There are currently no forwarded ports on the system.',
-'pf_CREATE_PAGE_DESCRIPTION' => '<p>Select the protocol, the port you wish to forward, the
+'pf_CREATE_PAGE_DESCRIPTION' => 'Select the protocol, the port you wish to forward, the
                destination host, and the port on the destination host
                that you wish to forward to. If you wish to specify a port
                range, enter the lower and upper boundaries separated by a
                hyphen. The destination port may be left blank, which will
                instruct the firewall to leave the source port 
-                unaltered.</p>',
+                unaltered',
 'pf_LABEL_SOURCE_PORT' => 'Source Port(s)',
 'pf_LABEL_PROTOCOL' => 'Protocol',
 'pf_LABEL_DESTINATION_PORT' => 'Destination Port(s)',
@@ -53,4 +50,4 @@
 'pf_ERR_BADAHOST' => 'This does not appear to be a valid IP address list.
            ie: 192.168.0.1,192.168.1.1/24',
 'pf_IN_SERVERONLY' => 'This server is currently in serveronly mode and portforwarding
-    is possible only to localhost.',
+    is possible only to localhost.',
--- 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
@@ -5,7 +5,7 @@ package SrvMngr_Auth;
 use strict;
 use warnings;
 use Exporter qw(import); # Import the Exporter module
-use esmith::AccountsDB;
+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);
@@ -42,7 +42,7 @@ sub load_user_auth_info {
    
    # If not admin, get allowed panels
    if (!$auth_info{is_admin} && $auth_info{username}) {
-        my $accountsdb = esmith::AccountsDB->open_ro();
+        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
@@ -69,7 +69,8 @@ sub has_panel_access {
    
    # Check if requested panel is in allowed panels
    foreach my $allowed_panel (@{$auth_info->{allowed_panels}}) {
-        return 1 if $panel eq lc($allowed_panel); #Controller files are capitalised, but that is lost in panel id.
+		return 1 if lc($panel) eq lc($allowed_panel) 
+         || lc(substr($panel, 0, length($allowed_panel))) eq lc($allowed_panel);
    }
    
    return 0;
--- 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/datetime.css
+++ b/root/usr/share/smanager/themes/default/public/css/datetime.css
@@ -0,0 +1,51 @@
+.datetime-config-row {
+  display: flex;
+  align-items: stretch;
+  margin-bottom: 1em;
+}
+
+.datetime-label-col {
+  background: #e8f3e2; /* light green */
+  padding: 1em 0em 0em 0em;
+  min-width: 30%;
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-end;
+  font-weight: bold;
+  border-radius: 4px 0 0 4px;
+}
+
+.datetime-label {
+	display:inline-flex;
+}
+
+.datetime-fields-col {
+  background: #fff;
+  padding: 1em;
+  flex: 1;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-radius: 0 4px 4px 0;
+}
+
+.datetime-clock {
+	min-width: 20em;
+	display:inline-flex;
+	border:0px;
+	padding:5px;
+}
+
+.datetime-clock-label {
+	background-color:#e8f3e2;
+	display:inline-flex;
+	width:30%;
+	font-weight:bold;
+	text-align:right;
+	
+	
+}
+
+.ntp-test-result { font-weight: bold; }
+.ntp-test-success { color: green; }
+.ntp-test-error   { color: red; }
+.ntp-test-wait    { color: #333; }
--- a/root/usr/share/smanager/themes/default/public/js/datetime.js
+++ b/root/usr/share/smanager/themes/default/public/js/datetime.js
@@ -0,0 +1,101 @@
+document.addEventListener('DOMContentLoaded', function() {
+  var select = document.getElementById('time_mode_select');
+  var ntpSection = document.getElementById('ntp_section');
+  var manualSection = document.getElementById('manual_section');
+
+  function toggleSections() {
+    if (select.value === 'dat_manually_set') {
+      ntpSection.style.display = 'none';
+      manualSection.style.display = 'block';
+    } else {
+      ntpSection.style.display = 'block';
+      manualSection.style.display = 'none';
+    }
+  }
+
+  select.addEventListener('change', toggleSections);
+  toggleSections(); // Set initial state
+});
+
+document.addEventListener('DOMContentLoaded', function() {
+  // Parse the initial server time from the input value
+  const clockElement = document.getElementById('real-time-clock');
+  if (!clockElement) return;
+
+  // Get the initial server time from the input's value
+  let serverTime = new Date(clockElement.value.replace(' ', 'T'));
+
+  function updateDateTime() {
+    // Format the date/time string as desired
+    const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+    const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+
+    const dayOfWeek = daysOfWeek[serverTime.getDay()];
+    const month = months[serverTime.getMonth()];
+    const day = serverTime.getDate();
+    const year = serverTime.getFullYear();
+
+    let hours = serverTime.getHours();
+    const ampm = hours >= 12 ? 'PM' : 'AM';
+    hours = hours % 12 || 12;
+
+    const minutes = serverTime.getMinutes().toString().padStart(2, '0');
+    const seconds = serverTime.getSeconds().toString().padStart(2, '0');
+
+    const dateTimeString = `${dayOfWeek}, ${month} ${day}, ${year} ${hours}:${minutes}:${seconds} ${ampm}`;
+    clockElement.value = dateTimeString;
+
+    // Advance serverTime by one second
+    serverTime.setSeconds(serverTime.getSeconds() + 1);
+  }
+
+  updateDateTime();
+  setInterval(updateDateTime, 1000);
+});
+
+document.addEventListener('DOMContentLoaded', function() {
+  const btn = document.getElementById('test-ntp-btn');
+  const input = document.getElementById('ntpserver');
+  const result = document.getElementById('ntp-test-result');
+
+  btn.addEventListener('click', function() {
+    const server = input.value.trim();
+    result.className = 'ntp-test-result'; // reset
+
+    if (!server) {
+      result.textContent = "Please enter a server address.";
+      result.classList.add('ntp-test-error');
+      return;
+    }
+    result.textContent = "Testing...";
+    result.classList.add('ntp-test-wait');
+
+    fetch('/smanager/datetimet', {
+      method: 'POST',
+      headers: {'Content-Type': 'application/json'},
+      body: JSON.stringify({ ntpserver: server })
+    })
+    .then(response => {
+      if (!response.ok) {
+        // HTTP error, e.g., 404, 500
+        throw new Error(`HTTP error: ${response.status} ${response.statusText}`);
+      }
+      return response.json();
+    })
+    .then(data => {
+      result.className = 'ntp-test-result'; // reset
+      if (data.success) {
+        result.textContent = `Server time: ${data.time}`;
+        result.classList.add('ntp-test-success');
+      } else {
+        result.textContent = `Error: ${data.error}`;
+        result.classList.add('ntp-test-error');
+      }
+    })
+    .catch(error => {
+      // Network error or thrown HTTP error
+      result.className = 'ntp-test-result ntp-test-error';
+      result.textContent = `Request failed: ${error.message}`;
+    });
+  });
+});
--- 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/datetime.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/datetime.html.ep
@@ -1,125 +1,149 @@
-% layout 'default', title => "Sme server 2 - datetime";
-
+% layout 'default', title => 'Sme server 2 - datetime';
 % content_for 'module' => begin
-<div id='module' class='module datetime-panel'>
+	%= javascript 'js/datetime.js'
+	%= stylesheet 'css/datetime.css'
+	<div id='module' class='module datetime-panel'>
+		% if (config->{debug} == 1) {
+		<p>
+		%= dumper $c->current_route
+		%= dumper $dat_data
+		</p>
+		% }

-    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $dat_datas
-	</p>
-    % }
+		%if ($c->stash('first')) {
+			<br><p>
+			%=$c->render_to_string(inline =>$c->l($c->stash('first')))
+			</p>
+		%} elsif ($c->stash('success')) {
+			<div class='success '>
+				%= $c->l($c->stash('success'));
+			</div>
+		%} elsif ($c->stash('error')) { 
+			<div class='sme-error'>
+				%= $c->l($c->stash('error'));
+			</div>
+		%}

-    % if ( stash 'error' ) {
-   	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+		<h1><%= $title %></h1><br>
+		%= $modul
+		<% my $btn = l('SAVE'); %>
+		<br /><br />
+		<span>
+			%= label_for 'real-time-clock' => $c->l('dat_The_time_is_currently'), class => 'datetime-clock-label'
+		</span><span class=data2>
+<!--
+			<div id="real-time-clock"></div>
+-->
+			%= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'datetime-clock' , value => $dat_data->{currentdatetime}
+		</span>
+		% if ($dat_data->{ntpstatus} eq 'disabled') {
+			<div class='datetime-set-ntp'>
+				%=l 'dat_NTP_ENABLE_DESC'
+				<br>
+			</div>	
+		% } else {
+			% my $current_year = $dat_data->{year};
+			% my $year_options  = [ map { [ $_, $_ ] } ($current_year..($current_year+30)) ];
+			% my $month_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (1..12) ];
+			% my $hour_options  = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..23) ];
+			% my $mode_options = [
+			%   [ $c->l('dat_ntp_server'),   'dat_ntp_server' ],
+			%   [ $c->l('dat_manually_set'), 'dat_manually_set' ]
+			% ];
+			<h2><%= $c->l('Time Configuration') %></h2>
+			%= form_for "datetimeu" => (method => 'post') => begin
+
+				%= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus};
+				%= hidden_field 'trt' => $dat_data->{trt};
+
+				<span class=label>
+					%= label_for time_mode => $c->l('Time Setting Mode:')
+				</span><span class=data2>
+					% param 'time_mode' => $dat_data->{time_mode} unless param 'time_mode';
+					%= select_field time_mode => ($mode_options, id => 'time_mode_select')
+				</span>
+
+				<div id='ntp_section'>
+					<p>
+						%= $c->l('dat_NTP_CONFIGURE_DESC')
+					</p>
+					<div class='datetime-config-row'>
+						<div class='datetime-label-col'>
+							<span class='datetime-label'>
+								%= label_for ntpserver => $c->l('dat_NTP_Server_URL')
+							</span>
+						</div>	
+						<div class=datetime-fields-col>
+							% my $server_check = '^([a-zA-Z0-9][a-zA-Z0-9\.\-]{0,253}[a-zA-Z0-9]|(\d{1,3}\.){3}\d{1,3})$';
+							% param 'ntpserver' => $dat_data->{ntpserver} unless param 'ntpserver';
+							%= text_field ntpserver => placeholder => 'e.g. smeserver.pool.ntp.org', id => 'ntpserver', pattern => $server_check, title => 'Enter a valid hostname or IPv4 address', required => 'required'
+							<button type="button" id="test-ntp-btn" class="btn btn-primary ml-2">Test Server</button>
+							<span id="ntp-test-result" class="ntp-test-result ml-2"></span>
+						</div>
+					</div>
+				</div>
+
+				<div id='manual_section'>
+					<p>
+						%= $c->l('dat_NTP_DISABLE_DESC')
+					</p>
+					<div class='datetime-config-row'>
+						<div class='datetime-label-col'>
+							<span class='datetime-label'>
+								%= label_for 'datetime_manual' => $c->l('dat_set_manually')
+							</span>
+						</div>
+						<div class='datetime-fields-col' id='datetime_manual'>
+							<fieldset>
+								<legend><%= $c->l('Date') %></legend>
+								%= label_for year => $c->l('Year:')
+								% param 'year' => ($dat_data->{year}) unless param 'year';
+								%= select_field year => ($year_options, id => 'year'), required => 'required'
+								&nbsp;
+
+								%= label_for month => $c->l('Month:')
+								% param 'month' => ($dat_data->{month}) unless param 'month';
+								%= select_field month => ($month_options, id => 'month'), required => 'required'
+								&nbsp;
+
+								%= label_for day => $c->l('Day:')
+								% param 'day' => ($dat_data->{day}) unless param 'day';
+								%= text_field day => id => 'day', size => 2, maxlength => 2, placeholder => 'DD', pattern => '^(0[1-9]|[12][0-9]|3[01])$', title => 'Day (01-31)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+							</fieldset>
+								
+							<fieldset>
+								<legend><%= $c->l('Time') %></legend>
+								%= label_for hour => $c->l('Hour:')
+								% param 'hour' => ($dat_data->{hour}) unless param 'hour';
+								%= select_field hour => ($hour_options, id => 'hour'), required => 'required'
+								&nbsp;
+
+								%= label_for minute => $c->l('Minute:')
+								% param 'minute' => ($dat_data->{minute}) unless param 'minute';
+								%= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+								&nbsp;
+
+								%= label_for second => $c->l('Second:')
+								% param 'second' => ($dat_data->{second}) unless param 'second';
+								%= text_field second => id => 'second', size => 2, maxlength => 2, placeholder => 'SS', pattern => '^[0-5][0-9]$', title => 'Second (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+							</fieldset>
+						</div>
+					</div>
+					<div class='datetime-config-row'>
+						<div class='datetime-label-col'>
+							<span class='datetime-label'>
+								%=l 'dat_TZ'
+							</span>
+						</div>
+						<div class='datetime-fields-col' id='datetime_manual'>
+									% param 'Timezone' => $c->getTimezone() unless param 'Timezone';
+									%= select_field 'Timezone' =>  $c->getZone_list(), class => 'input'
+						</div>
+					</div>
+				</div>
+				%= submit_button $btn, class => 'action'
+			% end
+		% }
 	</div>
-    %}
-
-    <h1><%= $title %></h1><br>
-    %= $modul
-    <% my $btn = l('SAVE'); %>
-
-    %= form_for '/datetime' => (method => 'POST') => begin
-	<p>
-	%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus};
-
-	% param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus';
-	%= radio_button Ntpstatus => 'enabled'
-	<span class=label>
-	%=l 'dat_NTP_CONFIGURE_TITLE'
-	</span>
-	<br>
-    % if ($dat_datas->{ntpstatus} eq 'disabled') {
-	<div class='datetime-set-ntp'>
-		%=l 'dat_NTP_ENABLE_DESC'
-		<br>
-	</div>	
-    % } else {
-	<div class='datetime-set-ntp'>
-		%=l 'dat_NTP_CONFIGURE_DESC'
-		<br><br>
-		<p>
-		%=l 'dat_CURRENT_SETTING'
-		<b>
-		%= $dat_datas->{now_string}
-		</b>
-		</p>
-		<p>
-		<br>
-		<span class=label>
-		%=l 'dat_NTP_SERVER'
-		</span><span class=data2>
-		%= text_field 'Ntpserver' =>  $dat_datas->{ntpserver}, class => 'input'
-		</span>
-		</p>
-	</div>
-	% }	
-	%= radio_button Ntpstatus => 'disabled'
-	<span class=label datetime-set-ntp>
-	%=l 'dat_NTP_DISABLE_TITLE'
-	</span>
-
-    % if ($dat_datas->{ntpstatus} eq 'enabled') {
-
-	<br><BR>
-	<div class='datetime-set-ntp'>
-		%=l 'dat_NTP_DISABLE_DESC'
-	</div>	
-	% } else {
-	<div class='datetime-set-ntp'>
-		<br>
-		</p>
-		<p>
-		%=l 'dat_CURRENT_SETTING'
-		<b>
-		%= $dat_datas->{now_string}
-		</b>
-		<br>
-		<span class=label>
-		%=l 'dat_NEW_M/D/Y'
-		</span><span class=data2>
-		% param 'Month' => $dat_datas->{month} unless param 'Month';
-		%= select_field 'Month' => $c->getMonth_list(), class => 'input'
-		</span><span class=data2>
-		% param 'Day' => $dat_datas->{day} unless param 'Day';
-		%= text_field 'Day', size => '2', class => 'input'
-		</span><span class=data2>
-		% param 'Year' => $dat_datas->{year} unless param 'Year';
-		%= text_field 'Year', size => '4', class => 'input'
-		</span>
-		<br>
-		<span class=label>
-		%=l 'dat_NEW_H/M/S'
-		</span><span class=data2>
-		% param 'Hour' => $dat_datas->{hour} unless param 'Hour';
-		%= text_field 'Hour', size => '2', class => 'input'
-		</span><span class=data2>
-		% param 'Minute' => $dat_datas->{minute} unless param 'Minute';
-		%= text_field 'Minute', size => '2', class => 'input'
-		</span><span class=data2>
-		% param 'Second' => $dat_datas->{second} unless param 'Second';
-		%= text_field 'Second', size => '2', class => 'input'
-		</span>
-		<br>
-		<span class=label>
-		%=l 'dat_AM/PM_AND_TZ'
-		</span><span class=data2>
-		% param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
-		%= select_field 'Ampm' =>  ['AM', 'PM'], class => 'input'
-		</span><span class=data2>
-		% param 'Timezone' => $c->getTimezone() unless param 'Timezone';
-		%= select_field 'Timezone' =>  $c->getZone_list(), class => 'input'
-		</span>
-		</p>
-	</div>	
-    % }
-	<p>
-	<br>
-	%= submit_button "$btn", class => 'action'
-	</p>
-
-    % end    
-
-</div>
-%end
+% end
+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
@@ -1,43 +1,40 @@
 <div id='ln_add'>

 	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
-	
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;

-   <br>
-	%if ($ret{'ret'} eq "") {
-   	
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <div class='success'>
-	       <!--<h2> Operation Status Report</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
-		</div>
-	   %} else { 
-	   <div class='sme-error'>
-	       <!--<h2> Operation Status Report - Error</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
-    	</div>
-	%}
+	% if ($c->app->config->{debug}) {
+	<p>
+		%= dumper { ret_data => \%ret }
+	</p>  
+	% }
+
+	% if ($ret{ret} eq "") {
+		%=l "ln_FIRSTPAGE_DESC"
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
+	<br>
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
 	<br />
    % my $btn = l('ADD');
-    % my $network_db = esmith::NetworksDB->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"
--- a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
@@ -3,41 +3,30 @@
    %= form_for '/localnetworksa' => (method => 'POST') => begin

 	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;

-    % if (config->{debug} == 1) {
+	% if ($c->app->config->{debug}) {
 	<p>
-		%= dumper "Ret:".$ret{ret};
-	</p>	
-	%}
+		%= dumper { ret_data => \%ret }
+	</p>  
+	% }

-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
-	% my $var7 = @vars[6];
-
-
-	%if ($ret{ret} eq "") {
+	% if ($ret{ret} eq "") {
 		%=l "ln_FIRSTPAGE_DESC"
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <br>
-	   <div class='success'>
-	       <!--<h2> Operation Status Report</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
-		</div>
-	   %} else { 
-	   <br>
-	   <div class='sme-error'>
-	       <!--<h2> Operation Status Report - Error</h2>-->
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
-    	</div>
-	%}
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
+	<br>
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
+

 	<p>
 	<br>
--- 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
@@ -1,40 +1,37 @@
 <div id='pf_add'>

 	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
-	
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;

+	% if ($c->app->config->{debug}) {
+	<pre>
+		%= dumper { ret_data => \%ret }
+	</pre>  
+	% }
+
+	% if ($ret{ret} eq "") {
+
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
 	<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);
-		</div>
-	   %} else { 
-	   <div class='sme-error'>
-	       <!--<h2> Operation Status Report - Error</h2>-->
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-    	</div>
-	%}
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
 	<br />
    % my $btn = l('ADD');
    
   % if (config->{debug} == 1) {
-	<p>
+	</pre>
 	%= dumper $c->current_route
 	%= dumper $c->stash("ret")
-	</p>
+	</pre>
    % }
     
    %= form_for '/portforwardingb' => (method => 'POST') => begin
--- a/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep
@@ -9,11 +9,11 @@
    % my $allow = $pf_datas->{allow};
    
   % if (config->{debug} == 1) {
-	<p>
+	<pre>
 	%= dumper $c->current_route
 	%= dumper $c->stash("ret")
    %= dumper %$pf_datas
-	</p>
+	</pre>
    % }
     
    %= form_for '/portforwardinge' => (method => 'POST') => begin
@@ -63,4 +63,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
@@ -2,37 +2,35 @@
    % my $btn = l('pf_CREATE_RULE');
    %= form_for '/portforwardinga' => (method => 'POST') => begin

-	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
- 
    % my $numtcpforwards = @$tcpforwards;
 	% my $numudpforwards = @$udpforwards;

-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
+	% my $retref= $c->stash("ret");
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
+
+	% if ($c->app->config->{debug}) {
+	<pre>
+		%= dumper { ret_data => \%ret }
+	</pre>  
+	% }
+
+	% if ($ret{ret} eq "") {
+		%=l "pf_FIRST_PAGE_DESCRIPTION"
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
+	<br>
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
+	<br />

-	%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>-->
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-		</div>
-	   %} else { 
-		<br>
-	   <div class='sme-error'>
-	       <!--<h2> Operation Status Report - Error</h2>-->
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-    	</div>
-	%}

 	<p>
 	<br>
@@ -69,7 +67,7 @@
 			<th class='sme-border'>
 				%=l 'pf_RULE_COMMENT'
 			</th>
-			<th class='sme-border' '>
+			<th class='sme-border'>
 				%=l 'ACTION'
 			</th>
 		</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 80
+%define release 96
 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,32 +131,84 @@ 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
    [ -h %{dir_mngr}/themes/default/public/js/jquery.min.map ] ||
 	ln -s /usr/share/javascript/jquery/latest/jquery.min.map %{dir_mngr}/themes/default/public/js/jquery.min.map
 fi
+find %{dir_mngr}/lib/SrvMngr/I18N/Modules -type f -name '*.pm' -exec rm '{}' \;
 true

 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)

 %changelog
+* Fri Jun 27 2025 Brian Read <brianr@koozali.org> 11.0.0-96.sme
+- fix [SME: ]
+
+* Tue Jun 24 2025 Brian Read <brianr@koozali.org> 11.0.0-95.sme
+- Add clock ticker to datetime panel [SME: 13054]
+- Add Test Server button for ntp server [SME: 13048]
+- Add checking that date is fully valid [SME: 13055]
+
+* Thu Jun 19 2025 Brian Read <brianr@koozali.org> 11.0.0-94.sme
+- re-instate datetime routes in SrvMngr.pm - removed by mistake [SME: 13053]
+
+* Thu Jun 19 2025 Brian Read <brianr@koozali.org> 11.0.0-93.sme
+- Sort out case of first letter of ctlact in routes added in from header on controller file [SME: 13053]
+
+* Sun Jun 15 2025 Brian Read <brianr@koozali.org> 11.0.0-92.sme
+- rework datetime panel [SME: 13020]
+- Fix errors in error messages for local networks panel [SME: 13044]
+- Add in Config Db open in Proxy.pm needed after  UTF8 change [SME: 13046]
+
+* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-91.sme
+- Port Forwarding  - Same error as in local networking [SME: 13043]
+
+* Thu Jun 12 2025 Brian Read <brianr@koozali.org> 11.0.0-90.sme
+- Local Networks  - Error on empty extra chars for success message [SME: 13041]
+ Needed extra open for network-db after add 
+
+* 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 
+- 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 
+ 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
+ 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]
@@ -168,36 +221,36 @@ true
 - 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.
+ 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 
- Adjust some gaps around panels
- Remove HR lines
+ 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 
- clean up some css
+ More places where floating panel needed
+ 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 
- Revert Ibay menu name to Ibays
- Remove legacy SM1 button on header
- Remove "?" access to wiki help on header
+ Re-cast the default theme - use proper koozali logo image, unwind multiple divs
+ Enhance responsiveness
+ Revert Ibay menu name to Ibays
+ Remove legacy SM1 button on header
+ Remove "?" access to wiki help on header

 * Mon Mar 17 2025 Brian Read <brianr@koozali.org> 11.0.0-69.sme
 - Add a total summary report across all existing logs [SME: 12951]

 * 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.
@@ -210,8 +263,8 @@ true

 * Thu Mar 06 2025 Brian Read <brianr@koozali.org> 11.0.0-63.sme
 - Add boot.svg image to Bug Report panel [SME: 12953]
- Move report template to inside smanager tree
- Add one-off systemd task to create boot.svg run from panel
+ Move report template to inside smanager tree
+ Add one-off systemd task to create boot.svg run from panel

 * Tue Mar 04 2025 Brian Read <brianr@koozali.org> 11.0.0-62.sme
 - Update *_en.lex files to conform to standard english punctuation  [SME: 11809]
@@ -248,16 +301,16 @@ true

 * Mon Feb 10 2025 Brian Read <brianr@koozali.org> 11.0.0-51.sme
 - Replace url in call to webmail by browser url rather than system host and domain [SME: 12910]
- Fix up CSS so not inline
+ Fix up CSS so not inline
 - Sort out reveiw panel missing routines from FormMagic [SME: 12907].

 * 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
- Move across toMB() sub from formmagick to quota.pm
+ Fix delete of ibay - typo in link
+ Move across toMB() sub from formmagick to quota.pm
 - Recast DB opening so it is specific to the route rather than global [SME: 12905]

 * Wed Jan 29 2025 Brian Read <brianr@koozali.org> 11.0.0-48.sme
@@ -265,11 +318,11 @@ 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]
- Add indication of development mode in footer
+ Add indication of development mode in footer

 * Sat Jan 25 2025 Brian Read <brianr@koozali.org> 11.0.0-45.sme
 - Add some space in the reboot/reconf/shutdown panel [SME: ]
@@ -283,7 +336,7 @@ true

 * Thu Jan 23 2025 Brian Read <brianr@koozali.org> 11.0.0-43.sme
 - fix access to config file though config plugin for mojo 9.39 [SME: 12885]
- Fix password setting for useraccounts and also adjust DB opens
+ Fix password setting for useraccounts and also adjust DB opens
 - Add mojo version to footer for logged in [SME: 12886]
 - Fix up css for red error message when multiline [SME: 12802]

@@ -323,7 +376,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]
@@ -358,7 +411,7 @@ true

 * Mon Sep 23 2024 Brian Read <brianr@koozali.org> 11.0.0-21.sme
 - Remove both option for webmail [SME: 12744]
- Add in re-open DB for portforwarding and email settings.
+ Add in re-open DB for portforwarding and email settings.

 * Mon Sep 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-20.sme
 - webmail switch panel to use roundcube [SME: 12742]
@@ -375,7 +428,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]
@@ -385,7 +438,7 @@ true

 * Sun Jul 28 2024 Brian Read <brianr@koozali.org> 11.0.0-13.sme
 - Fix sysles.css template - overwrote it by mistake [SME: 12706]
- Also re-organised login and Legacy SM menus and help on top
+ Also re-organised login and Legacy SM menus and help on top

 * Sun Jul 28 2024 Brian Read <brianr@koozali.org> 11.0.0-12.sme
 - correct positio of flag-icon [SME: 12706]
@@ -398,7 +451,7 @@ true

 * Thu May 09 2024 Brian Read <brianr@koozali.org> 11.0.0-9.sme
 - Add mojo logo to footer [SME: 12679]
- Fix default for HeaderWeight to avoid noise in logs if no Nav header in file
+ Fix default for HeaderWeight to avoid noise in logs if no Nav header in file
 - Align buttons consistently [SME: 12680]

 * Tue Apr 30 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
@@ -440,7 +493,7 @@ true

 * Tue Feb 27 2024 Brian Read <brianr@koozali.org> 0.1.4-31.sme
 - Sort options in mail log anaysis [SME: 11821]
- Take out qmail-q options as need to run as root or qmail - see bug:12491
+ Take out qmail-q options as need to run as root or qmail - see bug:12491

 * Sat Feb 24 2024 Brian Read <brianr@koozali.org> 0.1.4-30.sme
 - Bring user menus into line with new menu structure  [SME: 12482]
@@ -467,17 +520,17 @@ true

 * Tue Jan 30 2024 Brian Read <brianr@koozali.org> 0.1.4-23.sme
 - Arrange that jquery etc is local and from rpm smeserver-manager-jsquery [SME: 12459]
- Correct position of % end in partial .html.ep files with tables in.
- Make smeserver-mananger-jsquery a requirement
- Move jquery overrides to jsquery rpm
+ Correct position of % end in partial .html.ep files with tables in.
+ Make smeserver-mananger-jsquery a requirement
+ Move jquery overrides to jsquery rpm

 * Sat Jan 27 2024 Brian Read <brianr@koozali.org> 0.1.4-22.sme
 - Update to use jquery plugin dataTables [SME: 12458]
- Update Copyright footer to 2024
- Edit tables to have TableSort in class
- Fix up tables tbody and thead correctly
- Sort out action column to make compatible with dataTable
- Change action links to icons
+ Update Copyright footer to 2024
+ Edit tables to have TableSort in class
+ Fix up tables tbody and thead correctly
+ Sort out action column to make compatible with dataTable
+ Change action links to icons

 * Sun Dec 03 2023 Brian Read <brianr@koozali.org> 0.1.4-21.sme
 - Update CSS to provide feedback to hover and click on panel submit button  [SME: 12442]
@@ -485,7 +538,7 @@ true
 * Tue Apr 25 2023 Michel Begue <mab974@misouk.com> 0.1.4-20.sme
 - general locales for awstats [SME:12324b]
 - fix reconfigure asked when not needed [SME: 12171b]
- remove unSafe status from session data
+ remove unSafe status from session data

 * Wed Dec 28 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-19.sme
 - Fix requires in systemd smanager.server file  [SME:12294]
@@ -496,8 +549,8 @@ true
 * Mon Jul 18 2022 Michel Begue <mab974@misouk.com> 0.1.4-17.sme
 - add forgotten password link to login panel [SME: 11816]
 - update to httpd 2.4 syntax [SME: 12112]
- enable backup of /usr/share/smanager/data
- fix target in link to 'Previous SM'
+ enable backup of /usr/share/smanager/data
+ fix target in link to 'Previous SM'

 * Sun Jul 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.4-16.sme
 - untainting datetime [SME: 12111]
@@ -506,17 +559,17 @@ 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 link deleted during update
- Remove generated file during remove
+ Fix jquery map link missing
+ Fix jquery link deleted during update
+ Remove generated file during remove

 * Wed Jan 05 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-13.sme
 - Update-format-for-datetime-and-reboot [SME: 11830]

 * Mon Jan 03 2022 Michel Begue <mab974@misouk.com> 0.1.4-12.sme
 - Add show password icon to login panel (requires jquery)
- Extend toggle hide to section menu (requires jquery)
- Set layout according to jquery presence
+ Extend toggle hide to section menu (requires jquery)
+ Set layout according to jquery presence
 - Set CSRF less strict for GET method. Only if csrftoken param exists [SME: 11789]

 * Mon Dec 27 2021 Michel Begue <mab974@misouk.com> 0.1.4-10.sme
@@ -542,22 +595,22 @@ 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 
- Add TOKEN param where the GET method is used in templates
- Remove smanager from local url address
+ Correct the 'review' panel presentation
+ 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

 * Mon Oct 11 2021 Michel Begue <mab974@protonmail.com> 0.1.4-2.sme
- Fix incorrect list order (users, ibays, ...)
- Add external private access (remote management)
- Change CSRF error message
+ Fix incorrect list order (users, ibays, ...)
+ Add external private access (remote management)
+ Change CSRF error message

 * Mon Jun 21 2021 Michel Begue <mab974@gmail.com> 0.1.4-1.sme
 - New version: smeserver-manager-0.1.4-1 (= 0.1.2-13)

 * Sat Jun 19 2021 Michel Begue <mab974@gmail.com> 0.1.2-13.sme
 - Remove non english locale files (move to smeserver-manager-locale)
- Fix error in 'locale2-conf' action
+ Fix error in 'locale2-conf' action

 * Tue Jun 15 2021 Michel Begue <mab974@gmail.com> 0.1.2-12.sme
 - Fix errors in daily script
@@ -778,7 +831,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
@@ -810,7 +863,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]
@@ -862,7 +915,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]
@@ -900,10 +953,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
@@ -944,13 +997,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]
@@ -1243,10 +1296,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>
@@ -1287,7 +1340,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>
@@ -1334,7 +1387,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>
@@ -1379,7 +1432,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>
@@ -1412,7 +1465,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>
@@ -1451,7 +1504,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	803bfd1cec	* Fri Jun 27 2025 Brian Read <brianr@koozali.org> 11.0.0-96.sme - fix [SME: ]	2025-06-27 13:52:21 +01:00
Brian Read	0f2e2b82aa	* Tue Jun 24 2025 Brian Read <brianr@koozali.org> 11.0.0-95.sme - Add clock ticker to datetime panel [SME: 13054] - Add Test Server button for ntp server [SME: 13048] - Add checking that date is fully valid [SME: 13055]	2025-06-25 10:35:16 +01:00
Brian Read	0341d02608	* Thu Jun 19 2025 Brian Read <brianr@koozali.org> 11.0.0-94.sme - re-instate datetime routes in SrvMngr.pm - removed by mistake [SME: 13053]	2025-06-19 10:36:50 +01:00
Brian Read	c208419704	* Thu Jun 19 2025 Brian Read <brianr@koozali.org> 11.0.0-93.sme - Sort out case of first letter of ctlact in routes added in from header on controller file [SME: 13053]	2025-06-19 06:26:38 +01:00
Brian Read	d1f2013375	* Sun Jun 15 2025 Brian Read <brianr@koozali.org> 11.0.0-92.sme - rework datetime panel [SME: 13020] - Fix errors in error messages for local networks panel [SME: 13044] - Add in Config Db open in Proxy.pm needed after UTF8 change [SME: 13046]	2025-06-18 11:17:51 +01:00
Brian Read	0733537064	* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-91.sme - Port Forwarding - Same error as in local networking [SME: 13043]	2025-06-13 17:04:22 +01:00
Brian Read	dcc098b206	* Thu Jun 12 2025 Brian Read <brianr@koozali.org> 11.0.0-90.sme - Error on empty extra chars for success message [SME: 13041] - Needed extra open for network-db after add	2025-06-12 19:15:22 +01:00
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