* 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

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

@@ -17,6 +17,7 @@ use Mojo::Home;
 
 use DBM::Deep;
 use Mojo::JWT;
+use POSIX qw(strftime);
 
 use Mojolicious::Plugin::Config;
 #use Mojolicious::Plugin::I18N;
@@ -27,8 +28,10 @@ use SrvMngr::Model::Main;
 
 use SrvMngr::Plugin::WithoutCache;
 
+use esmith::I18N;
+
 #this is overwrittrn with the "release" by the spec file - release can be "99.el8.sme"
-our $VERSION = ''; 
+our $VERSION = '50.el8.sme'; 
 #Extract the release value
 if ($VERSION =~ /^(\d+)/) {
     $VERSION = $1;  # $1 contains the matched numeric digits
@@ -43,6 +46,7 @@ our @EXPORT_OK = qw(
 	getNavigation ip_number is_normal_password email_simple
 	mac_address_or_blank mac_address ip_number_or_blank
 	lang_space get_routes_list subnet_mask get_reg_mask
+	gen_locale_date_string get_public_ip_address
 	);
 
 has home => sub {
@@ -784,6 +788,30 @@ sub is_normal_password {
     }
 }
 
+sub gen_locale_date_string
+{
+    my $self = shift;
+    my $i18n = esmith::I18N->new();
+    $i18n->setLocale('formmagick', $i18n->preferredLanguage());
+    return strftime "%c", localtime;
+}
+
+sub get_public_ip_address
+{
+    my $self = shift;
+	my $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+    my $sysconfig = $cdb->get('sysconfig');
+    if ($sysconfig)
+    {
+        my $publicIP = $sysconfig->prop('PublicIP');
+        if ($publicIP)
+        {
+            return $publicIP;
+        }
+    }
+    return undef;
+}
+
 
 sub email_simple {
     my ($c, $data) = @_;
@@ -866,4 +894,4 @@ sub get_reg_mask {
 }
 
 
-1;
+1;

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

@@ -14,7 +14,7 @@ use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 use Text::Template;
 use File::Basename;
-use esmith::FormMagick qw( gen_locale_date_string );
+use SrvMngr qw( gen_locale_date_string );
 our $cdb = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n";
 
 # Get some basic info on the current SME install

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

@@ -12,8 +12,8 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-use esmith::FormMagick;
 use esmith::util;
+use SrvMngr qw( gen_locale_date_string );
 our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
 
 sub main {
@@ -41,7 +41,7 @@ sub main {
 
     # get rid of trailing carriage return on last field
     chop($dat_datas{ampm});
-    $dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string();
+    $dat_datas{'now_string'} = gen_locale_date_string;
     $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
     $c->render('datetime');
 } ## end sub main

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

@@ -14,8 +14,6 @@ use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 
-#use esmith::util qw(ldapBase);
-use esmith::FormMagick::Panel::directory;
 our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
 
 sub main {
@@ -75,4 +73,21 @@ sub do_update {
     $c->stash(title => $title, modul => $result);
     $c->render(template => 'module');
 } ## end sub do_update
+
+sub get_ldap_base {
+    return esmith::util::ldapBase(get_value('','DomainName'));
+}
+
+sub get_value {
+    my $fm = shift;
+    my $item = shift;
+
+    my $record = $db->get($item);
+    if ($record) {
+        return $record->value();
+    }
+    else {
+        return '';
+    }
+}
 1;

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

@@ -20,9 +20,9 @@ use esmith::DomainsDB;
 use esmith::AccountsDB;
 
 #use URI::Escape;
-our $ddb = esmith::DomainsDB->open  || die "Couldn't open domains db";
-our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+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 $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
 
 sub main {
@@ -30,6 +30,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";
     $dom_datas{trt} = 'LST';
     my @domains;
 
@@ -54,6 +57,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";
 
     #$trt = 'DEL' if ( $rt eq 'domaindel1' );
     #$trt = 'UPD' if ( $rt eq 'domainupd1' );
@@ -121,6 +127,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";
     my %dom_datas = ();
     my ($res, $result) = '';
 

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

@@ -18,14 +18,17 @@ use SrvMngr qw(theme_list init_session);
 #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";
+#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);
 
 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";
     $grp_datas{trt} = 'LST';
     my @groups;
 
@@ -44,6 +47,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";
     $grp_datas{'trt'} = $trt;
 
     if ($trt eq 'ADD') {
@@ -99,6 +104,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";
     $grp_datas{'trt'}   = $trt;
     $grp_datas{'group'} = $groupName;
     my @members = ();

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

@@ -25,10 +25,11 @@ use HTML::Entities;
 use Net::IPv4Addr qw(ipv4_in_network);
 
 #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";
+#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);
 
 sub main {
     my $c = shift;
@@ -36,6 +37,10 @@ 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";
     $hos_datas{trt} = 'LIST';
     my %dom_hosts = ();
 
@@ -68,6 +73,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";
     my $notif     = '';
     $hos_datas{'trt'} = $trt;
 
@@ -112,6 +120,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";
     my $notif     = '';
     my $result    = '';
     $hos_datas{'name'}       = lc $c->param('Name');

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

@@ -18,16 +18,18 @@ use esmith::AccountsDB;
 use esmith::ConfigDB;
 use esmith::DomainsDB;
 
-#use esmith::FormMagick::Panel::ibays;
-our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+#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 {
     my $c = shift;
     $c->app->log->info($c->log_req);
     my %iba_datas = ();
     my $title     = $c->l('iba_FORM_TITLE');
-    $iba_datas{'trt'} = 'LIST';
+    $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+	$iba_datas{'trt'} = 'LIST';
     my @ibays;
 
     if ($adb) {
@@ -42,6 +44,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";
 
     #$trt = 'DEL' if ( $ibay );
     #$trt = 'ADD' if ( $rt eq 'ibayadd' );
@@ -116,6 +120,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";
 
     if ($trt eq 'ADD') {
         my $name = ($c->param('ibay') || '');

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

@@ -17,8 +17,9 @@ 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");
+#my $network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
 my $ret = "OK";
+my ($network_db);
 
 sub main {
     my $c = shift;
@@ -26,6 +27,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");
     my $modul = '';
     $ln_datas{trt} = 'LIST';
     my @localnetworks;
@@ -47,6 +49,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");
     $trt = 'DEL'  if ($rt eq 'localnetworksdel');
     $trt = 'ADD'  if ($rt eq 'localnetworksadd');
     $trt = 'ADD1' if ($rt eq 'localnetworksadd1');
@@ -81,7 +84,7 @@ sub do_display {
     if ($trt eq 'DEL1') {
 
         #After Remove clicked on Delete network panel
-        my $network_db   = esmith::NetworksDB->open() || die("Failed to open Networkdb-1");
+        $network_db   = esmith::NetworksDB->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");
@@ -135,7 +138,7 @@ sub do_display {
 
 sub remove_network {
     my $network      = shift;
-    my $network_db   = esmith::NetworksDB->open();
+    $network_db   = esmith::NetworksDB->open();
     my $record       = $network_db->get($network);
     my $delete_hosts = shift;
 
@@ -265,3 +268,4 @@ sub add_network {
         );
     } ## end else [ if ($totalHosts == 1) ]
 } ## end sub add_network
+1;

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

@@ -18,12 +18,11 @@ use SrvMngr qw(theme_list init_session);
 #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";
+#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";
+my ($cdb,$tcp_db,$udp_db);
+
 my %ret = ();
 use constant FALSE => 0;
 use constant TRUE  => 1;
@@ -35,6 +34,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";
     $pf_datas{trt} = 'LIST';
     my @tcpforwards = $tcp_db->get_all;
     my @udpforwards = $udp_db->get_all;
@@ -55,6 +57,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";
     $trt = 'DEL'  if ($rt eq 'portforwardingdel');
     $trt = 'ADD'  if ($rt eq 'portforwardingadd');
     $trt = 'ADD1' if ($rt eq 'portforwardingadd1');
@@ -207,8 +212,8 @@ sub add_portforward {
 sub get_destination_host {
     my $q           = shift;
     my $dhost       = $q->param("dhost");
-    my $localip     = $db->get_prop('InternalInterface', 'IPAddress');
-    my $external_ip = $db->get_prop('ExternalInterface', 'IPAddress') || $localip;
+    my $localip     = $cdb->get_prop('InternalInterface', 'IPAddress');
+    my $external_ip = $cdb->get_prop('ExternalInterface', 'IPAddress') || $localip;
 
     if ($dhost =~ /^(127.0.0.1|$localip|$external_ip)$/i) {
 
@@ -354,8 +359,8 @@ sub validate_destination_host {
     my $c     = shift;
     my $dhost = $c->param('dhost');
     $dhost =~ s/^\s+|\s+$//g;
-    my $localip = $db->get_prop('InternalInterface', 'IPAddress');
-    my $external_ip = $db->get_prop('ExternalInterface', 'IPAddress') || $localip;
+    my $localip = $cdb->get_prop('InternalInterface', 'IPAddress');
+    my $external_ip = $cdb->get_prop('ExternalInterface', 'IPAddress') || $localip;
 
     if ($dhost =~ /^(localhost|127.0.0.1|$localip|$external_ip)$/i) {
 
@@ -363,7 +368,7 @@ sub validate_destination_host {
         $c->param(-name => 'dhost', -value => 'localhost');
         return (ret => 'pf_SUCCESS');
     } ## end if ($dhost =~ /^(localhost|127.0.0.1|$localip|$external_ip)$/i)
-    my $systemmode = $db->get_value('SystemMode');
+    my $systemmode = $cdb->get_value('SystemMode');
 
     if ($systemmode eq 'serveronly') {
         return (ret => 'pf_IN_SERVERONLY');

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

@@ -14,14 +14,15 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-use esmith::FormMagick::Panel::printers;
-our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+my $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";
     $prt_datas{'trt'} = 'LIST';
     my @printerDrivers;
 
@@ -37,6 +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";
 
     #$trt = 'DEL' if ( $printer );
     #$trt = 'ADD' if ( $rt eq 'printeradd' );
@@ -77,6 +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";
     $prt_datas{'trt'} = $trt;
     my ($res, $result) = '';
 

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

@@ -20,8 +20,9 @@ use SrvMngr qw(theme_list init_session);
 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";
+#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);
 
 sub main {
     my $c = shift;
@@ -31,6 +32,8 @@ 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";
 
     if ($adb) {
         @pseudonyms = $adb->pseudonyms();
@@ -47,7 +50,9 @@ sub do_display {
     my $pseudonym = $c->param('pseudonym') || '';
     my $title     = $c->l('pse_FORM_TITLE');
     my %pse_datas = ();
-    $pse_datas{'trt'} = $trt;
+ 	#$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
+	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$pse_datas{'trt'} = $trt;
 
     if ($trt eq 'ADD') {
 
@@ -92,6 +97,8 @@ 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";
     my %pse_datas = ();
     $pse_datas{'trt'} = $trt;
     my ($res, $result) = '';

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

@@ -10,7 +10,7 @@ package SrvMngr::Controller::Qmailanalog;
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
-use esmith::FormMagick qw(gen_locale_date_string);
+use SrvMngr qw(gen_locale_date_string);
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);

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

@@ -11,22 +11,21 @@ package SrvMngr::Controller::Quota;
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
-use esmith::FormMagick::Panel::quota;
 
-#use esmith::TestUtils;
 use Scalar::Util qw(looks_like_number);
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 
-#our $db = esmith::ConfigDB->open || die "Couldn't open config db";
-our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+my $adb;
 
 sub main {
     my $c = shift;
     $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";
     $quo_datas{'trt'} = 'LIST';
     my @userAccounts;
 
@@ -45,6 +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";
     $quo_datas{'trt'} = $trt;
 
     if ($trt eq 'UPD') {
@@ -53,9 +53,9 @@ sub do_display {
         if ($rec and $rec->prop('type') eq 'user') {
             $quo_datas{user}    = $user;
             $quo_datas{userRec} = $rec;
-            my $max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocks'));
+            my $max = $c->toBestUnit($rec->prop('MaxBlocks'));
             $quo_datas{hardlim} = $max;
-            $max                = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocksSoftLim'));
+            $max                = $c->toBestUnit($rec->prop('MaxBlocksSoftLim'));
             $quo_datas{softlim} = $max;
         } ## end if ($rec and $rec->prop...)
     } ## end if ($trt eq 'UPD')
@@ -73,6 +73,7 @@ sub do_update {
     $quo_datas{trt} = $trt;
     my $result = '';
     my $res;
+	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
 
     if ($trt eq 'UPD') {
         $quo_datas{user}    = ($c->param('user') || '');
@@ -156,4 +157,54 @@ sub validate_quota {
         or die($c->l('quo_ERR_MODIFYING') . "\n");
     return 'OK';
 } ## end sub validate_quota
+
+sub toMB
+{
+    my ($self,$kb) = @_;
+    return sprintf("%.2f", $kb / 1024);
+}
+
+sub toMBNoDecimalPlaces
+{
+    my ($self,$kb) = @_;
+    return sprintf("%.0f", $kb / 1024);
+}
+
+sub toGBNoDecimalPlaces
+{
+    my ($self,$kb) = @_;
+    return sprintf("%.0f", $kb / 1024 / 1024);
+}
+
+sub toKB 
+{
+    my ($self,$mb) = @_;
+    return sprintf("%.0f", $mb * 1024);
+}
+
+
+sub GBtoKB
+{
+    my ($self,$gb) = @_;
+    return sprintf("%.0f", $gb * 1024 * 1024);
+}
+
+sub MBtoKB
+{
+    my ($self,$mb) = @_;
+    return sprintf("%.0f", $mb * 1024);
+}
+
+sub toBestUnit
+{
+    my ($self,$kb) = @_;
+    return 0 if($kb == 0);
+    return $kb."K" if($kb < 1024);
+    return $kb."K" if($kb > 1024 && $kb < 1048576 && $kb % 1024 != 0);
+    return $self->toMBNoDecimalPlaces($kb)."M" if($kb < 1048576);
+    return $self->toMBNoDecimalPlaces($kb)."M" if($kb > 1048576 
+	&& ($kb % 1048576 != 0));
+    return $self->toGBNoDecimalPlaces($kb)."G";
+}
+
 1

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

@@ -17,10 +17,11 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use SrvMngr qw(gen_locale_date_string);
+
 
 #use SrvMngr::Review_sub qw(print_page);
 #use smeserver::Panel::review;
-use esmith::FormMagick::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";
@@ -33,7 +34,7 @@ sub main {
     my %rvw_datas = ();
     $rvw_datas{'servermode'} = (get_value('', 'SystemMode') || '');
     $rvw_datas{'localip'}          = get_value('$c', 'LocalIP') . '/' . get_value('$c', 'LocalNetmask');
-    $rvw_datas{'publicip'}         = esmith::FormMagick::Panel::review->get_public_ip_address($c);
+    $rvw_datas{'publicip'}         = $c->get_public_ip_address($c);
     $rvw_datas{'gateway'}          = $c->render_to_string(inline => print2_gateway_stanza($c));
     $rvw_datas{'serveronly'}       = $c->render_to_string(inline => print2_serveronly_stanza($c));
     $rvw_datas{'addlocalnetworks'} = get_local_networks($c);

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

@@ -28,13 +28,15 @@ use esmith::util;
 #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";
+#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);
-	my $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
     my $notif     = '';
     my %usr_datas = ();
     my $title     = $c->l('usr_FORM_TITLE');
@@ -53,6 +55,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";
     $usr_datas{'trt'} = $trt;
 
     if ($trt eq 'ADD') {
@@ -139,6 +143,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";
 
     if ($trt eq 'ADD') {
 
@@ -819,4 +825,4 @@ sub system_change_password {
         return $c->l("Error occurred while modifying password for admin.", 'First');
     }
 } ## end sub system_change_password
-1
+1

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

@@ -17,7 +17,7 @@ use esmith::AccountsDB;
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw( theme_list init_session is_normal_password );
-our $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";
+#our $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";
 
 sub main {
     my $c         = shift;
@@ -194,6 +194,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 $rec = $cdb->get('passwordstrength');
     $strength = ($rec ? ($rec->prop('Users') || 'none') : 'none');
     return validate_password($c, $strength, $password);

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

@@ -12,15 +12,13 @@ use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
 
-#use esmith::FormMagick qw(gen_locale_date_string);
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 use esmith::ConfigDB;
-#use Time::TAI64;
 use File::Basename;
 use HTML::Entities;
-use esmith::FormMagick qw(gen_locale_date_string);
+use SrvMngr qw(gen_locale_date_string);
 use File::Temp qw(tempfile);
 use constant TRUE  => 1;
 use constant FALSE => 0;
@@ -295,4 +293,4 @@ sub download_logFile {
     );
     return undef;
 } ## end sub download_logFile
-1;
+1;

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

@@ -13,7 +13,6 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-use esmith::FormMagick::Panel::workgroup;
 our $db = esmith::ConfigDB->open || die "Couldn't open config db";
 
 sub main {

root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep

@@ -64,7 +64,7 @@
                                         %       </a>
 					%};
 					%my $remove_text = l('REMOVE');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
+					%$csrf_token = "TOKEN";  # CSRF token for security
 					%#my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
 					%$actionRemove = qq{
                                         %       <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">

root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep

@@ -90,7 +90,7 @@
 					%my $csrf_token = "TOKEN";  # CSRF token for security
 					%my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
 					%$actionRemove = qq{
-                                        %       <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibays=$ibays_entry_name">
+                                        %       <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
 					%	<button type='button' class='sme-remove-button' title='$remove_text' >
 					%		$remove_text
 					%	</button>

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 48
+%define release 50
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -143,6 +143,15 @@ true
 %defattr(-,root,root)
 
 %changelog
+* 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 
+
+* 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
+- 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
 - Make Country flag display independant of the internet. [SME: 12893]