* Sat Feb 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-53.sme

- helper to set default value of select field using protected value [SME: 12923]
* Wed Feb 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-52.sme
2025-02-15 15:19:04 -05:00 · 2025-02-12 23:14:38 -05:00 · 2025-02-12 16:31:17 +00:00 · 2025-02-09 15:34:41 +00:00 · 2025-02-07 16:21:42 +00:00 · 2025-02-07 11:41:04 +00:00
37 changed files with 388 additions and 1761 deletions
--- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body
+++ b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body
@@ -275,7 +275,19 @@ a.menu-title {
    left: 2px;
 }

+.roundcube div {
+	height:462px;
+	width:85%;
+	margin-bottom:1%;
+}
+
+.roundcube object {
+	margin-top:1%;
+	height:95%;
+	width:100%;
+}
+

 /*end*/
 EOF
-}
+}
--- a/root/usr/share/smanager/lib/SrvMngr.pm
+++ b/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 = '51.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 {
@@ -208,6 +212,21 @@ sub setup_helpers {
 	Mojo::JWT->new(secret => shift->app->secrets->[0] || die)
    });

+    $self->helper( selected_field => sub {
+                    my $self = shift;
+                    my @options = shift;
+                    my $selected = shift;
+                    my $count = 0;
+                    # search for occurence of value $selected in arrays; if found add selected => 'selected'
+                    for  (my $i = 0; $i <= $#{$options[0]} ; $i++){
+                      if (grep /^$selected$/,  @{$options[0][$i]}) {
+                        push( @{$options[0][$i]} ,'selected', 'selected' );
+                        $count++;last;
+                      }
+                    }
+                    push ( @{$options[0]} ,[ ucfirst( $selected), $selected, 'selected', 'selected'] ) if ($count <1);
+                    return @options;
+
 }


@@ -784,6 +803,29 @@ 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 +908,4 @@ sub get_reg_mask {
 }


-1;
+1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm
+++ b/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
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
+++ b/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
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm
+++ b/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;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm
+++ b/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) = '';

--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm
+++ b/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 = ();
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm
+++ b/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');
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm
+++ b/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') || '');
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
@@ -1,566 +0,0 @@
-#
-# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-16 10:30:16
-#
-#
-# 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;
-use esmith::HostsDB;
-use esmith::AccountsDB;
-use esmith::NetworksDB;
-use esmith::DomainsDB;
-use constant FALSE => 0;
-use constant TRUE  => 1;
-
-#The most common ones
-our $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
-our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
-our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
-our $hdb = esmith::HostsDB->open()    || die("Couldn't open Hosts db");
-our $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
-
-# Validation routines - parameters for each panel
-sub validate_LIST {
-    my $c           = shift;
-    my $prefix_data = shift;    #Data hash as parameter
-                                # Validation for each field
-    my $ret         = "";
-
-    if (!TRUE)                  #validate $c->param('InternalIP')
-    {
-        $ret .= 'Validation for InternalIP failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('ExternalIP')
-    {
-        $ret .= 'Validation for ExternalIP failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('InternetIP')
-    {
-        $ret .= 'Validation for InternetIP failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('Issuer')
-    {
-        $ret .= 'Validation for Issuer failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('Expiry')
-    {
-        $ret .= 'Validation for Expiry failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('NotBefore')
-    {
-        $ret .= 'Validation for NotBefore failed';
-    }
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub validate_LIST
-
-sub validate_PARAMS {
-    my $c           = shift;
-    my $prefix_data = shift;    #Data hash as parameter
-                                # Validation for each field
-    my $ret         = "";
-
-    if (!TRUE)                  #validate $c->param('status')
-    {
-        $ret .= 'Validation for status failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('hookScript')
-    {
-        $ret .= 'Validation for hookScript failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('hostOverride')
-    {
-        $ret .= 'Validation for hostOverride failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('ACCEPT_TERMS')
-    {
-        $ret .= 'Validation for ACCEPT_TERMS failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('API')
-    {
-        $ret .= 'Validation for API failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('keysize')
-    {
-        $ret .= 'Validation for keysize failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('configure')
-    {
-        $ret .= 'Validation for configure failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('Email')
-    {
-        $ret .= 'Validation for Email failed';
-    }
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub validate_PARAMS
-
-sub validate_CHECKALLDOMAINS {
-    my $c           = shift;
-    my $prefix_data = shift;    #Data hash as parameter
-                                # Validation for each field
-    my $ret         = "";
-
-    if (!TRUE)                  #validate $c->param('AllDomainsCheck')
-    {
-        $ret .= 'Validation for AllDomainsCheck failed';
-    }
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub validate_CHECKALLDOMAINS
-
-sub validate_CHECKALLENABLEDDOMAINS {
-    my $c           = shift;
-    my $prefix_data = shift;    #Data hash as parameter
-                                # Validation for each field
-    my $ret         = "";
-
-    if (!TRUE)                  #validate $c->param('EnabledDomainsCheck')
-    {
-        $ret .= 'Validation for EnabledDomainsCheck failed';
-    }
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub validate_CHECKALLENABLEDDOMAINS
-
-sub validate_CHECKONEDOMAIN {
-    my $c           = shift;
-    my $prefix_data = shift;    #Data hash as parameter
-                                # Validation for each field
-    my $ret         = "";
-
-    if (!TRUE)                  #validate $c->param('OneDomainToCheck')
-    {
-        $ret .= 'Validation for OneDomainToCheck failed';
-    }
-
-    if (!TRUE)                  #validate $c->param('OneDomainsCheck')
-    {
-        $ret .= 'Validation for OneDomainsCheck failed';
-    }
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub validate_CHECKONEDOMAIN
-
-# Get singleton data for each panel
-sub get_data_for_panel_LIST {
-
-    # Return a hash with the fields required which will be loaded into the shared data
-    my $c = shift;
-
-    #		my ($reply, $err, $server_cert) = Net::SSLeay::sslcat('localhost', 443, '/');
-    #		my $issuer = Net::SSLeay::X509_NAME_oneline(Net::SSLeay::X509_get_issuer_name($server_cert));
-    #		my $before = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notBefore($server_cert));
-    #		my $expiry = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notAfter($server_cert));
-    my %ret = (
-        'Data1'      => 'Data for LIST',                                    #Example
-                                                                            # fields from Inputs in LIST $fields['LIST']
-        'InternalIP' => $cdb->get_prop('InternalInterface', 'IPAddress'),
-        'ExternalIP' => $cdb->get_prop('ExternalInterface', 'IPAddress'),
-        'InternetIP' => $c->get_my_ip(),
-        'Issuer'     => '$issuer',
-        'Expiry'     => '$expiry',
-        'NotBefore'  => '$before',
-    );
-    return %ret;
-} ## end sub get_data_for_panel_LIST
-
-sub get_data_for_panel_PARAMS {
-
-    # Return a hash with the fields required which will be loaded into the shared data
-    my $c   = shift;
-    my %ret = (
-        'Data1'  => 'Data for PARAMS',                                  #Example
-                                                                        # fields from Inputs in PARAMS $fields['PARAMS']
-        'status' => $cdb->get_prop('letsencrypt', 'status', 'disabled'),
-        'hookScript'   => $cdb->get_prop('letsencrypt', 'hookScript', 'disabled'),
-        'hostOverride' => $cdb->get_prop('letsencrypt', 'hostOverride', 'disabled'),
-        'ACCEPT_TERMS' => $cdb->get_prop('letsencrypt', 'ACCEPT_TERMS', ''),
-        'API'          => $cdb->get_prop('letsencrypt', 'API', '2'),
-        'keysize'      => $cdb->get_prop('letsencrypt', 'keysize', '4096'),
-        'configure'    => $cdb->get_prop('letsencrypt', 'configure', 'none'),
-        'email'        => $cdb->get_prop('letsencrypt', 'email')
-    );
-    return %ret;
-} ## end sub get_data_for_panel_PARAMS
-
-sub get_data_for_panel_CHECKALLDOMAINS {
-
-    # Return a hash with the fields required which will be loaded into the shared data
-    my $c   = shift;
-    my %ret = (
-        'Data1' => 'Data for CHECKALLDOMAINS',    #Example
-                                                  # fields from Inputs in CHECKALLDOMAINS $fields['CHECKALLDOMAINS']
-        'AllDomainsCheck' => $c->update_all_domains(),
-    );
-    return %ret;
-} ## end sub get_data_for_panel_CHECKALLDOMAINS
-
-sub get_data_for_panel_CHECKALLENABLEDDOMAINS {
-
-    # Return a hash with the fields required which will be loaded into the shared data
-    my $c   = shift;
-    my %ret = (
-        'Data1' => 'Data for CHECKALLENABLEDDOMAINS',    #Example
-             # fields from Inputs in CHECKALLENABLEDDOMAINS $fields['CHECKALLENABLEDDOMAINS']
-        'EnabledDomainsCheck' => $c->update_enabled_domains(),
-    );
-    return %ret;
-} ## end sub get_data_for_panel_CHECKALLENABLEDDOMAINS
-
-sub get_data_for_panel_CHECKONEDOMAIN {
-
-    # Return a hash with the fields required which will be loaded into the shared data
-    my $c   = shift;
-    my %ret = (
-        'Data1' => 'Data for CHECKONEDOMAIN',    #Example
-                                                 # fields from Inputs in CHECKONEDOMAIN $fields['CHECKONEDOMAIN']
-        'OneDomainToCheck' => $c->param("CHECKONEDOMAIN"),
-        'OneDomainsCheck'  => $c->update_one_domain($c->param("CHECKONEDOMAIN"))
-    );
-    return %ret;
-} ## end sub get_data_for_panel_CHECKONEDOMAIN
-
-# Get control data for table(s)
-# Define a constant hash for field name mapping
-use constant DomainList_FIELD_MAPPING => (
-    'Table1-Domain name / HOSTNAME' => 'Domain',
-    'Table1-Brief description'      => 'Description',
-    'Table1-Content'                => 'Content',
-    'Table1-LABEL_NAMESERVERS'      => 'Nameservers',
-    'Table1-LABEL_POINT'            => 'Source-for-Table1-LABEL_POINT',
-    'Table1-LABEL_LECERT'           => 'letsencryptSSLcert',
-    'Table1-IS_IN_CERT'             => 'isincert',
-    'Table1-CHECK'                  => 'Check'
-
-        #'target_field2' => 'source_field2',
-        # Add more mappings as needed
-);
-use constant TEST_DOMAIN_LIST => (
-    { "domain" => "Domain1", "fred" => "fred1", "description" => "Description1" },
-    { "domain" => "Domain2", "fred" => "fred2", "description" => "Description2" },
-    { "domain" => "Domain3", "fred" => "fred3", "description" => "Description3" },
-
-    # Add more test entries as needed
-);
-
-sub actual_DomainList {
-    my $c = shift;
-
-    # Actual code for extracting DomainList
-    my @list = ();
-
-    #	my @rv = Net::SSLeay::X509_get_subjectAltNames($server_cert);
-    #	foreach my $element (@rv) {
-    #		 next if $element  =~ /^\d+$/; ;
-    #		 #print $element . "\n";
-    #		 push @list, $element;
-    #	}
-    my @data  = ();
-    my $check = $c->l('Check Domain');
-
-    for ($ddb->domains) {
-        my $ns = $_->prop('Nameservers')        || 'internet';
-        my $le = $_->prop('letsencryptSSLcert') || 'disabled';    #letsencrypt configure all
-        my $dname     = $_->key;
-        my $isincert  = "N";
-        my $link      = $c->create_link("letsencryptd", "CHECKONEDOMAIN", "");
-        my $checklink = "<a href='" . $link . "&CHECKONEDOMAIN=" . $_->key . "'>" . $check . "</a>";
-
-        #my $checklink = "<a href=''>check</a>";
-        $isincert = "Y" if ($dname ~~ @list);
-
-        # domain
-        push @data,
-            {
-            Domain => $_->key,
-            $_->props,
-            letsencryptSSLcert => $le,
-            isincert           => $isincert,
-            Check              => $checklink,
-            Nameservers        => $ns,
-            };
-
-        #and hosts
-        for my $h ($hdb->get_hosts_by_domain($dname)) {
-            next if $ddb->get($h->key);
-            next unless ($h->prop('HostType') eq "Self" || $h->prop('HostType') eq "Local");
-            $le       = $h->prop('letsencryptSSLcert') || 'disabled';    #letsencrypt configure all
-            $isincert = "N";
-            $isincert = "Y" if ($h->key ~~ @list);
-            push @data, {
-                Domain => "--> " . $h->key,
-                $h->props,
-                Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "",
-                Content     => $h->prop('HostType'),
-                isincert    => $isincert,
-                Check       => "",                                                       #$checklink
-                Nameservers => $c->l($ns),
-            };
-        } ## end for my $h ($hdb->get_hosts_by_domain...)
-    } ## end for ($ddb->domains)
-    return @data;
-} ## end sub actual_DomainList
-
-sub get_DomainList {
-
-    # Return an array of hashes of the contents for each row and column for DomainList
-    my $c = shift;
-    my @source_records
-        = $c->actual_DomainList();    #TEST_DOMAIN_LIST #Replace by code or call to produce contents of table;
-    my @transformed_records;
-    my %Field_Mapping = DomainList_FIELD_MAPPING;
-
-    # Iterate over each record in the source array
-    for my $source_record (@source_records) {
-        my %transformed_record;
-
-        # Iterate over each key-value pair in the $Field_Mapping constant
-        while (my ($target, $source) = each %Field_Mapping) {
-
-            # Check if the source field exists in the source record
-            if (exists $source_record->{$source}) {
-
-                # Assign the source field value to the target field in the transformed record
-                $transformed_record{$target} = $source_record->{$source};
-            }
-        } ## end while (my ($target, $source...))
-
-        # Add transformed record to the array if it's not empty
-        push @transformed_records, \%transformed_record if %transformed_record;
-    } ## end for my $source_record (...)
-    return \@transformed_records;
-} ## end sub get_DomainList
-
-# Return hash with values from row in which link clicked on table
-sub get_selected_LIST {
-    my $c             = shift;
-    my $selected      = shift;    #Parameter is name of selected row.
-    my $is_new_record = shift;    #Indicates new record required (defaults)
-    my %ret           = {};
-    return %ret;
-} ## end sub get_selected_LIST
-
-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           = {};
-    return %ret;
-} ## end sub get_selected_PARAMS
-
-sub get_selected_CHECKALLDOMAINS {
-    my $c             = shift;
-    my $selected      = shift;    #Parameter is name of selected row.
-    my $is_new_record = shift;    #Indicates new record required (defaults)
-    my %ret           = {};
-    return %ret;
-} ## end sub get_selected_CHECKALLDOMAINS
-
-sub get_selected_CHECKALLENABLEDDOMAINS {
-    my $c             = shift;
-    my $selected      = shift;    #Parameter is name of selected row.
-    my $is_new_record = shift;    #Indicates new record required (defaults)
-    my %ret           = {};
-    return %ret;
-} ## end sub get_selected_CHECKALLENABLEDDOMAINS
-
-sub get_selected_CHECKONEDOMAIN {
-    my $c             = shift;
-    my $selected      = shift;    #Parameter is name of selected row.
-    my $is_new_record = shift;    #Indicates new record required (defaults)
-    my %ret           = {};
-    return %ret;
-} ## end sub get_selected_CHECKONEDOMAIN
-
-#after sucessful modify or create or whatever and submit then perfom (if the params validate)
-sub perform_LIST {
-    my $c           = shift;
-    my $prefix_data = shift;          #Data hash as parameter
-    my $ret         = "";
-    my $db          = $cdb;           #maybe one of the others
-    my $dbkey       = 'ChangeThis';
-
-    if (!TRUE
-        ) #copy or perform with value: InternalIP e.g. $db->set_prop($dbkey,'InternalIP',$c->param('InternalIP'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for InternalIP';
-    } ## end if (!TRUE)
-
-    if (!TRUE
-        ) #copy or perform with value: ExternalIP e.g. $db->set_prop($dbkey,'ExternalIP',$c->param('ExternalIP'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for ExternalIP';
-    } ## end if (!TRUE)
-
-    if (!TRUE
-        ) #copy or perform with value: InternetIP e.g. $db->set_prop($dbkey,'InternetIP',$c->param('InternetIP'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for InternetIP';
-    } ## end if (!TRUE)
-
-    if (!TRUE
-        )   #copy or perform with value: Issuer e.g. $db->set_prop($dbkey,'Issuer',$c->param('Issuer'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for Issuer';
-    } ## end if (!TRUE)
-
-    if (!TRUE
-        )   #copy or perform with value: Expiry e.g. $db->set_prop($dbkey,'Expiry',$c->param('Expiry'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for Expiry';
-    } ## end if (!TRUE)
-
-    if (!TRUE
-        ) #copy or perform with value: NotBefore e.g. $db->set_prop($dbkey,'NotBefore',$c->param('NotBefore'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for NotBefore';
-    } ## end if (!TRUE)
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub perform_LIST
-
-sub perform_PARAMS {
-    my $c           = shift;
-    my $prefix_data = shift;           #Data hash as parameter
-    my $ret         = "";
-    my $db          = $cdb;            #maybe one of the others
-    my $dbkey       = 'letsencrypt';
-
-# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
-    if (!$db->set_prop($dbkey, 'status', $c->param('status'), type => 'service')) {
-        $ret .= 'Perform/save failed for status';
-    }
-
-    if (!$db->set_prop($dbkey, 'hookScript', $c->param('hookScript'), type => 'service')) {
-        $ret .= 'Perform/save failed for hookScript';
-    }
-
-    if (!$db->set_prop($dbkey, 'hostOverride', $c->param('hostOverride'), type => 'service')) {
-        $ret .= 'Perform/save failed for hostOverride';
-    }
-
-    if (!$db->set_prop($dbkey, 'ACCEPT_TERMS', $c->param('ACCEPT_TERMS'), type => 'service')) {
-        $ret .= 'Perform/save failed for ACCEPT_TERMS';
-    }
-    if (!$db->set_prop($dbkey, 'API', $c->param('API'), type => 'service')) { $ret .= 'Perform/save failed for API'; }
-
-    if (!$db->set_prop($dbkey, 'keysize', $c->param('keysize'), type => 'service')) {
-        $ret .= 'Perform/save failed for keysize';
-    }
-
-    if (!$db->set_prop($dbkey, 'configure', $c->param('configure'), type => 'service')) {
-        $ret .= 'Perform/save failed for configure';
-    }
-
-    if (!$db->set_prop($dbkey, 'email', $c->param('email'), type => 'service')) {
-        $ret .= 'Perform/save failed for email';
-    }
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub perform_PARAMS
-
-sub perform_CHECKALLDOMAINS {
-    my $c           = shift;
-    my $prefix_data = shift;          #Data hash as parameter
-    my $ret         = "";
-    my $db          = $cdb;           #maybe one of the others
-    my $dbkey       = 'ChangeThis';
-
-    if (!TRUE
-        ) #copy or perform with value: AllDomainsCheck e.g. $db->set_prop($dbkey,'AllDomainsCheck',$c->param('AllDomainsCheck'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for AllDomainsCheck';
-    } ## end if (!TRUE)
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub perform_CHECKALLDOMAINS
-
-sub perform_CHECKALLENABLEDDOMAINS {
-    my $c           = shift;
-    my $prefix_data = shift;          #Data hash as parameter
-    my $ret         = "";
-    my $db          = $cdb;           #maybe one of the others
-    my $dbkey       = 'ChangeThis';
-
-    if (!TRUE
-        ) #copy or perform with value: EnabledDomainsCheck e.g. $db->set_prop($dbkey,'EnabledDomainsCheck',$c->param('EnabledDomainsCheck'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for EnabledDomainsCheck';
-    } ## end if (!TRUE)
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub perform_CHECKALLENABLEDDOMAINS
-
-sub perform_CHECKONEDOMAIN {
-    my $c           = shift;
-    my $prefix_data = shift;          #Data hash as parameter
-    my $ret         = "";
-    my $db          = $cdb;           #maybe one of the others
-    my $dbkey       = 'ChangeThis';
-
-    if (!TRUE
-        ) #copy or perform with value: OneDomainToCheck e.g. $db->set_prop($dbkey,'OneDomainToCheck',$c->param('OneDomainToCheck'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for OneDomainToCheck';
-    } ## end if (!TRUE)
-
-    if (!TRUE
-        ) #copy or perform with value: OneDomainsCheck e.g. $db->set_prop($dbkey,'OneDomainsCheck',$c->param('OneDomainsCheck'),type=>'service'))
-    {
-        $ret .= 'Perform/save failed for OneDomainsCheck';
-    } ## end if (!TRUE)
-    if ($ret eq "") { $ret = 'ok'; }
-    return $ret;
-} ## end sub perform_CHECKONEDOMAIN
-
-sub create_link {
-
-    # WIP
-    my ($c, $route, $panel, $index) = @_;
-    my $link = "$route?trt=$panel&Selected=$index";
-    return $link;
-} ## end sub create_link
-
-sub get_my_ip {
-    my ($self, $item, $prop, $default) = @_;
-    my $output = `/usr/sbin/e-smith/getmyip`;
-    return $output || "IP";
-} ## end sub get_my_ip
-
-sub update_one_domain {
-    my ($self, $domain) = @_;
-    return "$domain not domain" unless ($ddb->get($domain) || $hdb->get($domain));
-    ($domain) = ($domain =~ /([\w\p{L}.]+)/);
-    my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains " " $domain `;
-    return $output || "-empty-";
-} ## end sub update_one_domain
-
-sub update_all_domains {
-    my $self   = shift;
-    my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains "" "" all `;
-    return $output || "-empty-";
-} ## end sub update_all_domains
-
-sub update_enabled_domains {
-    my $self   = shift;
-    my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains "" "" enabled `;
-    return $output || "-empty-";
-} ## end sub update_enabled_domains
-1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt.pm
@@ -1,448 +0,0 @@
-package SrvMngr::Controller::Letsencrypt;
-#
-# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
-#
-#----------------------------------------------------------------------
-# heading     : Network
-# description : Letsencrypt certificate
-# navigation  : 6000 6600
-#
-# name : letsencrypt,    method : get,   url : /letsencrypt,   ctlact : Letsencrypt#main
-# name : letsencryptu,   method : post,  url : /letsencryptu,  ctlact : Letsencrypt#do_update
-# name : letsencryptd,   method : get,   url : /letsencryptd,  ctlact : Letsencrypt#do_display
-#
-# routes : end
-#
-# Documentation: https://wiki.contribs.org/Letsencrypt
-#----------------------------------------------------------------------
-#
-# 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 esmith::util::network;
-use esmith::ConfigDB;
-use esmith::AccountsDB;
-use esmith::NetworksDB;
-use esmith::HostsDB;
-use esmith::DomainsDB;
-require
-    '/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-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
-    my $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
-    my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
-    my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
-    my $hdb = esmith::HostsDB->open()    || die("Couldn't open Hosts db");
-    my $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
-    my %lets_data = ();
-    my $title     = $c->l('lets_Letsencrypt_certificate');
-    my $modul     = '';
-    $lets_data{'trt'} = 'LIST';
-
-    #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($lets_data{'trt'});
-} ## end sub main
-
-# 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 $modul = '';
-
-    #The most common ones - you might want to comment out any not used.
-    my $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
-    my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
-    my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
-    my $hdb = esmith::HostsDB->open()    || die("Couldn't open Hosts db");
-    my $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
-    my %lets_data = ();
-    my $title     = $c->l('lets_Letsencrypt_certificate');
-
-    # Accessing all POST parameters
-    my %params = $c->req->params->to_hash;
-
-    # Get number of POST parameters
-    my $num_params = keys %params;
-
-    #Params are available in the hash "params" - copy to the prefix_data hash
-    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
-    #    $lets_data{$key} = $value;
-    #}
-    # the value of trt will tell you which panel has returned
-    my $trt = $c->param('trt') || 'LIST';    #hidden control on every form.
-    my $ret = 'ok';
-
-    #Validate the parameters in a custom sub one for each panel (although only one of these will be executed)
-    my $thispanel;
-
-    if ($trt eq 'LIST') {
-
-        #Validate form parameters for panel LIST
-        $ret       = $c->validate_LIST(\%lets_data);
-        $thispanel = 'LIST';
-    } ## end if ($trt eq 'LIST')
-
-    if ($trt eq 'PARAMS') {
-
-        #Validate form parameters for panel PARAMS
-        $ret       = $c->validate_PARAMS(\%lets_data);
-        $thispanel = 'PARAMS';
-    } ## end if ($trt eq 'PARAMS')
-
-    if ($trt eq 'CHECKALLDOMAINS') {
-
-        #Validate form parameters for panel CHECKALLDOMAINS
-        $ret       = $c->validate_CHECKALLDOMAINS(\%lets_data);
-        $thispanel = 'CHECKALLDOMAINS';
-    } ## end if ($trt eq 'CHECKALLDOMAINS')
-
-    if ($trt eq 'CHECKALLENABLEDDOMAINS') {
-
-        #Validate form parameters for panel CHECKALLENABLEDDOMAINS
-        $ret       = $c->validate_CHECKALLENABLEDDOMAINS(\%lets_data);
-        $thispanel = 'CHECKALLENABLEDDOMAINS';
-    } ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
-
-    if ($trt eq 'CHECKONEDOMAIN') {
-
-        #Validate form parameters for panel CHECKONEDOMAIN
-        $ret       = $c->validate_CHECKONEDOMAIN(\%lets_data);
-        $thispanel = 'CHECKONEDOMAIN';
-    } ## end if ($trt eq 'CHECKONEDOMAIN')
-
-    if ($ret ne "ok") {
-        $c->do_display($thispanel);
-    } else {
-
-        #Do whatever is needed, including writing values to the DB
-        if ($trt eq 'LIST') {
-
-            #do whatever is required ...
-            $ret = $c->perform_LIST(\%lets_data);
-
-            if ($ret ne "ok") {
-
-                # return to the panel with error message
-                $c->stash(error => $c->l($ret));
-                $c->stash(
-                    title     => $title,
-                    modul     => $modul,
-                    lets_data => \%lets_data
-                );
-                $c->render(template => "letsencrypt");
-            } else {
-                $c->stash(success => $c->l('lets_LIST_panel_action_was_successful'))
-                    ;    #A bit bland - edit it in the lex file
-            }
-        } ## end if ($trt eq 'LIST')
-
-        if ($trt eq 'PARAMS') {
-
-            #do whatever is required ...
-            $ret = $c->perform_PARAMS(\%lets_data);
-
-            if ($ret ne "ok") {
-
-                # return to the panel with error message
-                $c->stash(error => $c->l($ret));
-                $c->stash(
-                    title     => $title,
-                    modul     => $modul,
-                    lets_data => \%lets_data
-                );
-                $c->render(template => "letsencrypt");
-            } else {
-                $c->stash(success => $c->l('lets_PARAMS_panel_action_was_successful'))
-                    ;    #A bit bland - edit it in the lex file
-            }
-        } ## end if ($trt eq 'PARAMS')
-
-        if ($trt eq 'CHECKALLDOMAINS') {
-
-            #do whatever is required ...
-            $ret = $c->perform_CHECKALLDOMAINS(\%lets_data);
-
-            if ($ret ne "ok") {
-
-                # return to the panel with error message
-                $c->stash(error => $c->l($ret));
-                $c->stash(
-                    title     => $title,
-                    modul     => $modul,
-                    lets_data => \%lets_data
-                );
-                $c->render(template => "letsencrypt");
-            } else {
-                $c->stash(success => $c->l('lets_CHECKALLDOMAINS_panel_action_was_successful'))
-                    ;    #A bit bland - edit it in the lex file
-            }
-        } ## end if ($trt eq 'CHECKALLDOMAINS')
-
-        if ($trt eq 'CHECKALLENABLEDDOMAINS') {
-
-            #do whatever is required ...
-            $ret = $c->perform_CHECKALLENABLEDDOMAINS(\%lets_data);
-
-            if ($ret ne "ok") {
-
-                # return to the panel with error message
-                $c->stash(error => $c->l($ret));
-                $c->stash(
-                    title     => $title,
-                    modul     => $modul,
-                    lets_data => \%lets_data
-                );
-                $c->render(template => "letsencrypt");
-            } else {
-                $c->stash(success => $c->l('lets_CHECKALLENABLEDDOMAINS_panel_action_was_successful'))
-                    ;    #A bit bland - edit it in the lex file
-            }
-        } ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
-
-        if ($trt eq 'CHECKONEDOMAIN') {
-
-            #do whatever is required ...
-            $ret = $c->perform_CHECKONEDOMAIN(\%lets_data);
-
-            if ($ret ne "ok") {
-
-                # return to the panel with error message
-                $c->stash(error => $c->l($ret));
-                $c->stash(
-                    title     => $title,
-                    modul     => $modul,
-                    lets_data => \%lets_data
-                );
-                $c->render(template => "letsencrypt");
-            } else {
-                $c->stash(success => $c->l('lets_CHECKONEDOMAIN_panel_action_was_successful'))
-                    ;    #A bit bland - edit it in the lex file
-            }
-        } ## end if ($trt eq 'CHECKONEDOMAIN')
-
-        # and call any signal-events needed
-        #TBD
-        # Setup shared data and call panel
-        if ('none' eq 'none') {
-            $lets_data{'trt'} = 'LIST';
-        } else {
-            $lets_data{'trt'} = 'none';
-        }
-        $c->do_display($lets_data{'trt'});
-    } ## end else [ if ($ret ne "ok") ]
-} ## end sub do_update
-
-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 comment out any not used.
-    my $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
-    my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
-    my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
-    my $hdb = esmith::HostsDB->open()    || die("Couldn't open Hosts db");
-    my $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
-    my %lets_data = ();
-    my $title     = $c->l('lets_Letsencrypt_certificate');
-    my $modul     = "";
-
-    # Accessing all parameters
-    my $params = $c->req->params->to_hash;
-
-    # Get number of parameters
-    my $num_params = scalar 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}) {
-    #    $lets_data{$key} = $value;
-    #}
-    # the value of trt will tell you which panel has returned
-    if (!$trt) {
-        $trt = $c->param('trt') || 'LIST';    #Indicates where to go now
-    }
-
-    # Now add in the params from the selected row from the table
-    my %selectedrow;
-
-    if ($trt eq 'LIST') {
-
-        #Validate Get selected row (if applicable)  LIST
-        %selectedrow = $c->get_selected_LIST($lets_data{'Selected'}, $is_new_record);
-    } ## end if ($trt eq 'LIST')
-
-    if ($trt eq 'PARAMS') {
-
-        #Validate Get selected row (if applicable)  PARAMS
-        %selectedrow = $c->get_selected_PARAMS($lets_data{'Selected'}, $is_new_record);
-    } ## end if ($trt eq 'PARAMS')
-
-    if ($trt eq 'CHECKALLDOMAINS') {
-
-        #Validate Get selected row (if applicable)  CHECKALLDOMAINS
-        %selectedrow = $c->get_selected_CHECKALLDOMAINS($lets_data{'Selected'}, $is_new_record);
-    } ## end if ($trt eq 'CHECKALLDOMAINS')
-
-    if ($trt eq 'CHECKALLENABLEDDOMAINS') {
-
-        #Validate Get selected row (if applicable)  CHECKALLENABLEDDOMAINS
-        %selectedrow = $c->get_selected_CHECKALLENABLEDDOMAINS($lets_data{'Selected'}, $is_new_record);
-    } ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
-
-    if ($trt eq 'CHECKONEDOMAIN') {
-
-        #Validate Get selected row (if applicable)  CHECKONEDOMAIN
-        %selectedrow = $c->get_selected_CHECKONEDOMAIN($lets_data{'Selected'}, $is_new_record);
-    } ## end if ($trt eq 'CHECKONEDOMAIN')
-
-    #Copy in the selected row params to the prefix_data hash to pass to the panel
-    while (my ($key, $value) = each %selectedrow) {
-        $lets_data{$key} = $value;
-    }
-
-    # Where to go now
-    $lets_data{'trt'} = $trt;
-
-    # Set up other shared data according to the panel to go to
-    if ($trt eq 'LIST') {
-
-        # 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_LIST();
-
-        # Copy each key-value pair from the returned hash to the prefix data hash
-        while (my ($key, $value) = each %returned_hash) {
-            $lets_data{$key} = $value;
-        }
-    } ## end if ($trt eq 'LIST')
-
-    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) {
-            $lets_data{$key} = $value;
-        }
-    } ## end if ($trt eq 'PARAMS')
-
-    if ($trt eq 'CHECKALLDOMAINS') {
-
-        # 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_CHECKALLDOMAINS();
-
-        # Copy each key-value pair from the returned hash to the prefix data hash
-        while (my ($key, $value) = each %returned_hash) {
-            $lets_data{$key} = $value;
-        }
-    } ## end if ($trt eq 'CHECKALLDOMAINS')
-
-    if ($trt eq 'CHECKALLENABLEDDOMAINS') {
-
-        # 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_CHECKALLENABLEDDOMAINS();
-
-        # Copy each key-value pair from the returned hash to the prefix data hash
-        while (my ($key, $value) = each %returned_hash) {
-            $lets_data{$key} = $value;
-        }
-    } ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
-
-    if ($trt eq 'CHECKONEDOMAIN') {
-
-        # 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_CHECKONEDOMAIN();
-
-        # Copy each key-value pair from the returned hash to the prefix data hash
-        while (my ($key, $value) = each %returned_hash) {
-            $lets_data{$key} = $value;
-        }
-    } ## end if ($trt eq 'CHECKONEDOMAIN')
-
-    # and table control fields
-    $c->stash(DomainList => $c->get_DomainList());
-
-    # Data for panel
-    $c->stash(
-        title     => $title,
-        modul     => $modul,
-        lets_data => \%lets_data
-    );
-    $c->render(template => "letsencrypt");
-} ## end sub do_display
-1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
+++ b/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;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
+++ b/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');
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm
+++ b/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) = '';

--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm
+++ b/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) = '';
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm
+++ b/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);
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
+++ b/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
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
+++ b/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);
@@ -151,6 +152,55 @@ sub get2_local_networks {
    } ## end else [ if ($numNetworks == 0)]
 } ## end sub get2_local_networks

+sub get_net_prop {
+  my $fm = shift;
+  my $item = shift;
+  my $prop = shift;
+
+  my $record = $networks->get($item);
+  if ($record) {
+    return $record->prop($prop);
+  }
+  else {
+    return '';
+  }
+
+}
+
+
+sub get_local_networks {
+    my $fm = shift;
+
+    my @nets = $networks->get_all_by_prop('type' => 'network');
+
+    my $numNetworks = @nets;
+    if ($numNetworks == 0) {
+        return  $fm->localise('NO_NETWORKS');
+    }
+    else {
+        my $out = "";
+        foreach my $network (sort @nets) {
+            if ($out ne "") {
+                $out .= "<BR>";
+            }
+
+            $out .= $network->key."/" . get_net_prop($fm, $network->key, 'Mask');
+
+            if ( defined get_net_prop($fm, $network->key, 'Router') ) {
+                $out .= " via " . get_net_prop ($fm, $network->key, 'Router'); 
+            }
+        }
+        return $out;
+    }
+
+}
+
+sub get_local_domain
+{
+    return (get_value('','DomainName'));
+}
+
+
 =head2 print2_gateway_stanza

 If this system is a server gateway, show the external ip and gateway ip (mojo ver)
@@ -216,4 +266,51 @@ sub print2_dhcp_stanza {
    } ## end if (get_prop($c, 'dhcpd'...))
    return $out;
 } ## end sub print2_dhcp_stanza
+
+sub get_value {
+  my $fm = shift;
+  my $item = shift;
+  my $record = $db->get($item);
+  if ($record) {
+    return $record->value();
+  }
+  else {
+    return '';
+  }
+  
+}
+
+sub get_prop {
+  my $fm = shift if (ref($_[0]) ); # If we're being called in a formmagick context
+				 # The first argument will always be a fm.
+				 #otherwise, we don't want to grab it
+  my $item = shift;
+  my $prop = shift;
+
+  my $record = $db->get($item);
+  if ($record) {
+    return $record->prop($prop);
+  }
+  else {
+    return '';
+  }
+
+}
+
+sub get_public_ip_address
+{
+    my $self = shift;
+    my $sysconfig = $db->get('sysconfig');
+    if ($sysconfig)
+    {
+        my $publicIP = $sysconfig->prop('PublicIP');
+        if ($publicIP)
+        {
+            return $publicIP;
+        }
+    }
+    return undef;
+}
+
+
 1;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
@@ -2,7 +2,7 @@ package SrvMngr::Controller::Roundcubepanel;

 #----------------------------------------------------------------------
 # heading     : System
-# description : Roundcube webmail
+# description : Webmail
 # navigation  : 99999 9999
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
@@ -21,10 +21,9 @@ use SrvMngr qw(theme_list init_session);
 sub main {
    my $c = shift;
    $c->app->log->info($c->log_req);
-    my $title            = $c->l('Roundcube Webmail');
+    my $title            = $c->l('Webmail');
    my $roundcube_url    = $c->param('url');
-    my $roundcube_height = $c->param('height') | 600;
-    $c->stash(title => $title, modul => $roundcube_url, height => $roundcube_height);
+    $c->stash(title => $title, modul => $roundcube_url);
    $c->render(template => 'roundcube');
 } ## end sub main

--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
+++ b/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
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
+++ b/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);
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
+++ b/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;
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
+++ b/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 {
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Letsencrypt/en.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Letsencrypt/en.pm
@@ -1,72 +0,0 @@
-package SrvMngr::I18N::Modules::Letsencrypt::en;
-use strict;
-use warnings;
-use utf8;
-use Mojo::Base 'SrvMngr::I18N';
-
-use SrvMngr::I18N::Modules::General::en;
-
-my %lexicon = (
-#
-# Generated by SM2Gen version: SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
-#
-'lets_Manage_letsencrypt-config_settings:' => 'Manage letsencrypt-config settings',
-'lets_HOOKSCRIPT_STATUS' => 'Hookscript Status',
-'lets_SERVICE_STATUS' => 'Service Status',
-'lets_EMAIL' => 'Email',
-'lets_Back' => 'Back',
-'lets_Internal_IP' => 'Internal IP',
-'lets_Save' => 'Save',
-'lets_Issuer' => 'Issuer',
-'lets_IS_IN_CERT' => 'Is In cart',
-'lets_For_this_Server' => 'For this Server',
-'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain',
-'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain which is enabled',
-'lets_Check_just_one_domain' => 'Check just one domain',
-'lets_PARAMS_panel_action_was_successful' => 'PARAMS panel action was successful',
-'lets_Check_all_domains' => 'Check all domains',
-'lets_LIST_panel_action_was_successful' => 'LIST panel action was successful',
-'lets_Status_Report' => 'Status Report',
-'lets_LABEL_NAMESERVERS' => 'Label timeservers',
-'lets_Loop_through_and_check_the' => 'Loop through and check the letsencrypt status for a specific domain',
-'lets_Letsencrypt_certificate' => 'Letsencrypt certificate',
-'lets_Error_Status_Report' => 'Error Status Report',
-'lets_Not_Before' => 'Not Before',
-'lets_Content' => 'Content',
-'lets_CONFIG_LETSENCRYPT' => 'confirm Letsencrypt',
-'lets_API_STATUS' => 'ape Status',
-'lets_ACCEPT_TERMS_STATUS' => 'Accept Terms Status',
-'lets_Check_all_enabled_domains' => 'Check all enabled domains',
-'lets_All_domains_check_result' => 'All domains check result',
-'lets_CHECKALLDOMAINS_panel_action_was_successful' => 'CHECKALLDOMAINS panel action was successful',
-'lets_Domains_name' => 'Domains name',
-'lets_HOSTOVERRIDE_STATUS' => 'Hostoverride Status',
-'lets_List_of_Domains_and_Hosts' => 'List of Domains and Hosts',
-'lets_Brief_description' => 'Brief description',
-'lets_KEYSIZE_STATUS' => 'Keysize Status',
-'lets_Domain_name_/_HOSTNAME' => 'Domain name / HOSTNAME',
-'lets_Enabled_domains_check_result' => 'Enabled domains check result',
-'lets_CHECKALLENABLEDDOMAINS_panel_action_was_successful' => 'CHECKALLENABLEDDOMAINS panel action was successful',
-'lets_Internet_IP' => 'Internet IP',
-'lets_Expiry' => 'Expiry',
-'lets_CHECK_ALL_DOMAINS' => 'Check All Domains',
-'lets_LABEL_POINT' => 'Label Point',
-'lets_CHECK' => 'Check',
-'lets_CONFIG' => 'Config',
-'lets_Current_certificate_details' => 'Current certificate details',
-'lets_LABEL_LECERT' => 'Label secret',
-'lets_One_domain_check_result' => 'One domain check result',
-'lets_CHECKONEDOMAIN_panel_action_was_successful' => 'CHECKONEDOMAIN panel action was successful',
-'lets_CONFIGUREMODE_STATUS' => 'Configuremode Status',
-'lets_CHECK_ALL_ENABLED_DOMAINS' => 'Check All Enabled Domains',
-'lets_External_Interface_IP' => 'External Interface IP',
-'lets_APPLY' => 'Apply',
-);
-
-our %Lexicon = (
-	%{ SrvMngr::I18N::Modules::General::en::Lexicon },
-	%lexicon
-);
-
-
-1;
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Letsencrypt/letsencrypt_en.lex
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Letsencrypt/letsencrypt_en.lex
@@ -1,55 +0,0 @@
-#
-# Generated by SM2Gen version: SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
-# edited by bjr 09Jan2025
-#
-'lets_Manage_letsencrypt-config_settings:' => 'Manage letsencrypt-config settings',
-'lets_HOOKSCRIPT_STATUS' => 'Hookscript Status',
-'lets_SERVICE_STATUS' => 'Service Status',
-'lets_EMAIL' => 'Email',
-'lets_Back' => 'Back',
-'lets_Internal_IP' => 'Internal IP',
-'lets_Save' => 'Save',
-'lets_Issuer' => 'Issuer',
-'lets_IS_IN_CERT' => 'Is in certificate',
-'lets_For_this_Server' => 'For this Server',
-'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain',
-'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain which is enabled',
-'lets_Check_just_one_domain' => 'Check just one domain',
-'lets_PARAMS_panel_action_was_successful' => 'Parameter panel action was successful',
-'lets_Check_all_domains' => 'Check all domains',
-'lets_LIST_panel_action_was_successful' => 'List panel action was successful',
-'lets_Status_Report' => 'Status Report',
-'lets_LABEL_NAMESERVERS' => 'Label timeservers',
-'lets_Loop_through_and_check_the' => 'Loop through and check the letsencrypt status for a specific domain',
-'lets_Letsencrypt_certificate' => 'Letsencrypt certificate',
-'lets_Error_Status_Report' => 'Error Status Report',
-'lets_Not_Before' => 'Not Before',
-'lets_Content' => 'Content',
-'lets_CONFIG_LETSENCRYPT' => 'Configure Letsencrypt',
-'lets_API_STATUS' => 'API Status',
-'lets_ACCEPT_TERMS_STATUS' => 'Accept Terms Status',
-'lets_Check_all_enabled_domains' => 'Check all enabled domains',
-'lets_All_domains_check_result' => 'All domains check result',
-'lets_CHECKALLDOMAINS_panel_action_was_successful' => 'Check all domains panel action was successful',
-'lets_Domains_name' => 'Domains name',
-'lets_HOSTOVERRIDE_STATUS' => 'Hostoverride Status',
-'lets_List_of_Domains_and_Hosts' => 'List of Domains and Hosts',
-'lets_Brief_description' => 'Brief description',
-'lets_KEYSIZE_STATUS' => 'Keysize Status',
-'lets_Domain_name_/_HOSTNAME' => 'Domain name / HOSTNAME',
-'lets_Enabled_domains_check_result' => 'Enabled domains check result',
-'lets_CHECKALLENABLEDDOMAINS_panel_action_was_successful' => 'Check all enabled domains panel action was successful',
-'lets_Internet_IP' => 'Internet IP',
-'lets_Expiry' => 'Expiry',
-'lets_CHECK_ALL_DOMAINS' => 'Check All Domains',
-'lets_LABEL_POINT' => 'Label Point',
-'lets_CHECK' => 'Check',
-'lets_CONFIG' => 'Config',
-'lets_Current_certificate_details' => 'Current certificate details',
-'lets_LABEL_LECERT' => 'Label secret',
-'lets_One_domain_check_result' => 'One domain check result',
-'lets_CHECKONEDOMAIN_panel_action_was_successful' => 'Check one domain panel action was successful',
-'lets_CONFIGUREMODE_STATUS' => 'Configure mode Status',
-'lets_CHECK_ALL_ENABLED_DOMAINS' => 'Check All Enabled Domains',
-'lets_External_Interface_IP' => 'External Interface IP',
-'lets_APPLY' => 'Apply',
--- a/root/usr/share/smanager/themes/default/public/css/letsencrypt.css
+++ b/root/usr/share/smanager/themes/default/public/css/letsencrypt.css
@@ -1,90 +0,0 @@
-/*
-Generated by SM2Gen version: SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
-*/
-.Letsencrypt-panel {}
-.name {}
-.rout {}
-.grou {}
-.link2 {}
-.link3 {}
-.link4 {}
-.endg {}
-.subh2 {}
-.read4 {}
-.read5 {}
-.read6 {}
-.subh3 {}
-.read1 {}
-.read2 {}
-.read3 {}
-.subh4 {}
-.tabl1 {}
-thead .tabl1 {}
-tbody .tabl1 {}
-.name {}
-.rout {}
-.subh {}
-.para1 {}
-.sele1 {}
-.sele2 {}
-.sele3 {}
-.sele4 {}
-.sele5 {}
-.sele6 {}
-.sele7 {}
-.emai8 {}
-.subm9 {}
-.name {}
-.rout {}
-.head {}
-.subh {}
-.text1 {}
-.back2 {}
-.name {}
-.rout {}
-.head {}
-.subh {}
-.text1 {}
-.back2 {}
-.name {}
-.rout {}
-.head {}
-.subh {}
-.read1 {}
-.text2 {}
-.back3 {}
- .inline-buttons {
-    display: flex; /* Use flexbox to arrange items horizontally */
-    gap: 10px;     /* Optional: Add space between buttons */
-  }
-
-  .inline-buttons .link {
-    /* Additional styling can be added here if needed */
-  }
-  
-  
-  .inline-buttons .link {
-    display: inline-block; /* Keep links as inline-block for button shape */
-    padding: 7px 14px;     /* Adjusted padding to approximate 70% of the original */
-    margin: 0;             /* Remove margin */
-    background-color: #efefef; /* Light gray background color */
-    color: black;          /* Text color */
-    text-decoration: none; /* Remove underline */
-    border: 2px solid #bbb; /* Thin, light gray border */
-    border-radius: 3px;    /* Slightly rounded corners */
-    font-size: 11.2px;     /* Adjusted font size to approximate 70% of the original */
-    text-align: center;    /* Center the text */
-    cursor: pointer;       /* Pointer cursor on hover */  }
-
-  /* Hover and active effects for better interaction */
-  .inline-buttons .link:hover {
-    background-color: #d9d9d9; /* Darker shade on hover */
-  }
-
-  .inline-buttons .link:active {
-    background-color: #c0c0c0; /* Even darker shade on click */
-  }
-  
-  span .label {
-	padding-top:13em;
-  }
--- a/root/usr/share/smanager/themes/default/templates/letsencrypt.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/letsencrypt.html.ep
@@ -1,69 +0,0 @@
-%#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
-%#
-% layout 'default', title => "Sme server 2 - Letsencrypt certificate", share_dir => './';
-%# css specific to this panel:
-% content_for 'module' => begin
-%= stylesheet '/css/letsencrypt.css'
-<div id="module" class="module Letsencrypt-panel">
-
-    % if (config->{debug} == 1) {
-	<pre>
-		%= dumper $c->current_route
-		%= dumper $lets_data->{trt}
-	</pre>
-    % }
-    
-    <h1><%=$title%></h1>
-
-    % if ( stash('modul')) {
-	%= $c->render_to_string(inline => stash('modul') );
-    % }
-
-   	%if ($c->stash('first')) {
-	    <br><p>
-		%=$c->render_to_string(inline =>$c->l($c->stash('first')))
-		</p>
-
-	%} elsif ($c->stash('success')) {
-		<div class='success '>
-	       <h2><%=$c->l('lets_Status_Report') %></h2><p>
-			%= $c->l($c->stash('success'));
-			</p>
-		</div>
-
-	%} elsif ($c->stash('error')) { 
-	   <div class='sme-error'>
-	       <h2><%=$c->l('lets_Error_Status_Report') %></h2><p>
-			%= $c->l($c->stash('error'));
-			</p>
-    	</div>
-	%}
-
-	%#Routing to partials according to trt parameter.
-	%#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
-	
-	% if ($lets_data->{trt} eq "LIST") {
-		%= include 'partials/_lets_LIST'
-	%}
-	
-	% if ($lets_data->{trt} eq "PARAMS") {
-		%= include 'partials/_lets_PARAMS'
-	%}
-	
-	% if ($lets_data->{trt} eq "CHECKALLDOMAINS") {
-		%= include 'partials/_lets_CHECKALLDOMAINS'
-	%}
-	
-	% if ($lets_data->{trt} eq "CHECKALLENABLEDDOMAINS") {
-		%= include 'partials/_lets_CHECKALLENABLEDDOMAINS'
-	%}
-	
-	% if ($lets_data->{trt} eq "CHECKONEDOMAIN") {
-		%= include 'partials/_lets_CHECKONEDOMAIN'
-	%}
-	
-
-
-</div>
-%end
--- a/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep
+++ b/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">
--- a/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep
+++ b/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>
--- a/root/usr/share/smanager/themes/default/templates/partials/_lets_CHECKALLDOMAINS.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_lets_CHECKALLDOMAINS.html.ep
@@ -1,45 +0,0 @@
-%#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
-%#
-<div id="Letsencrypt-CHECKALLDOMAINS" class="partial Letsencrypt-CHECKALLDOMAINS">
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
-
-		<h1 class='head'><%=l('lets_Check_all_domains')%></h1>
-	
-		<h2 class='subh'><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
-	
-		<span class=label>
-			%=l('lets_All_domains_check_result')
-		</span><span class=data>
-			% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
-			%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span><br>
-	
-		<span class='data'>
-                        %my $back_text = l('lets_Back');  # Localized text
-                        %my $actionBack = qq{
-                        %       <a href="letsencryptd">
-                        %       <input class='action back' type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-		</span>
-		
-	
-		%# Probably finally by a submit.
-	%end    
-</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_lets_CHECKALLENABLEDDOMAINS.html.ep
@@ -1,45 +0,0 @@
-%#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
-%#
-<div id="Letsencrypt-CHECKALLENABLEDDOMAINS" class="partial Letsencrypt-CHECKALLENABLEDDOMAINS">
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
-
-		<h1 class='head'><%=l('lets_Check_all_enabled_domains')%></h1>
-	
-		<h2 class='subh'><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
-	
-		<span class=label>
-			%=l('lets_Enabled_domains_check_result')
-		</span><span class=data>
-			% param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
-			%= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span><br>
-	
-		<span class='data'>
-                        %my $back_text = l('lets_Back');  # Localized text
-                        %my $actionBack = qq{
-                        %       <a href="letsencryptd">
-                        %       <input class='action back' type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-		</span>
-		
-	
-		%# Probably finally by a submit.
-	%end    
-</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_lets_CHECKONEDOMAIN.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_lets_CHECKONEDOMAIN.html.ep
@@ -1,52 +0,0 @@
-%#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
-%#
-<div id="Letsencrypt-CHECKONEDOMAIN" class="partial Letsencrypt-CHECKONEDOMAIN">
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
-
-		<h1 class='head'><%=l('lets_Check_just_one_domain')%></h1>
-	
-		<h2 class='subh'><%=l('lets_Loop_through_and_check_the')%></h2>
-	
-		<p><span class=label>
-			%=l('lets_Domains_name')
-		</span><span class=data>
-			% param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
-			%= text_field 'OneDomainToCheck', size => '50', class => 'textinput OneDomainToCheck' , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
-		<br></span></p>
-	
-		<span class=label>
-			%=l('lets_One_domain_check_result')
-		</span><span class=data>
-			% param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
-			%= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
-		</span><br>
-	
-		<span class='data'>
-                        %my $back_text = l('lets_Back');  # Localized text
-                        %my $actionBack = qq{
-                        %       <a href="letsencryptd">
-                        %       <input class='action back' type='submit'  value='$back_text'>
-                        %       </a>
-                        %};
-                      <%= $c->render_to_string(inline => $actionBack) %>
-		</span>
-		
-	
-		%# Probably finally by a submit.
-	%end    
-</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_lets_LIST.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_lets_LIST.html.ep
@@ -1,126 +0,0 @@
-%#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
-%#
-<div id="Letsencrypt-LIST" class="partial Letsencrypt-LIST">
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
-
-		<div class=inline-buttons>
-		
-	
-		<a href='letsencryptd?trt=PARAMS' class='link link2'>
-			%= l('lets_CONFIG')
-		</a>
-		%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=>'link link2'
-	
-	
-		<a href='letsencryptd?trt=CHECKALLDOMAINS' class='link link3'>
-			%= l('lets_CHECK_ALL_DOMAINS')
-		</a>
-		%#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=>'link link3'
-	
-	
-		<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class='link link4'>
-			%= l('lets_CHECK_ALL_ENABLED_DOMAINS')
-		</a>
-		%#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=>'link link4'
-	
-	
-		</div>
-		
-	
-		<h2 class='subh2'><%=l('lets_For_this_Server')%></h2>
-	
-		<p><span class=label>
-			%=l('lets_Internal_IP')
-		</span><span class=data>
-			% param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
-			%= text_field 'InternalIP', size => '50', class => 'textinput InternalIP' , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
-		<br></span></p>
-	
-		<p><span class=label>
-			%=l('lets_External_Interface_IP')
-		</span><span class=data>
-			% param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
-			%= text_field 'ExternalIP', size => '50', class => 'textinput ExternalIP' , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
-		<br></span></p>
-	
-		<p><span class=label>
-			%=l('lets_Internet_IP')
-		</span><span class=data>
-			% param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
-			%= text_field 'InternetIP', size => '50', class => 'textinput InternetIP' , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
-		<br></span></p>
-	
-		<h2 class='subh3'><%=l('lets_Current_certificate_details')%></h2>
-	
-		<p><span class=label>
-			%=l('lets_Issuer')
-		</span><span class=data>
-			% param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
-			%= text_field 'Issuer', size => '50', class => 'textinput Issuer' , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
-		<br></span></p>
-	
-		<p><span class=label>
-			%=l('lets_Expiry')
-		</span><span class=data>
-			% param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
-			%= text_field 'Expiry', size => '50', class => 'textinput Expiry' , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
-		<br></span></p>
-	
-		<p><span class=label>
-			%=l('lets_Not_Before')
-		</span><span class=data>
-			% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
-			%= text_field 'NotBefore', size => '50', class => 'textinput NotBefore' , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
-		<br></span></p>
-	
-		<h2 class='subh4'><%=l('lets_List_of_Domains_and_Hosts')%></h2>
-	
-		<br /><table class="sme-border TableSort sme-table tabl1 ">
-			<thead class='tabl1'>
-				<tr table-head-row>
-					<th class='sme-border table-head-col table-head-col-Domain name / HOSTNAME '><%=l('lets_Domain_name_/_HOSTNAME')%></th>
-					<th class='sme-border table-head-col table-head-col-Brief description '><%=l('lets_Brief_description')%></th>
-					<th class='sme-border table-head-col table-head-col-Content '><%=l('lets_Content')%></th>
-					<th class='sme-border table-head-col table-head-col-LABEL_NAMESERVERS '><%=l('lets_LABEL_NAMESERVERS')%></th>
-					<th class='sme-border table-head-col table-head-col-LABEL_POINT '><%=l('lets_LABEL_POINT')%></th>
-					<th class='sme-border table-head-col table-head-col-LABEL_LECERT '><%=l('lets_LABEL_LECERT')%></th>
-					<th class='sme-border table-head-col table-head-col-IS_IN_CERT '><%=l('lets_IS_IN_CERT')%></th>
-					<th class='sme-border table-head-col table-head-col-CHECK '><%=l('lets_CHECK')%></th>
-				</tr>
-			</thead>
-			<tbody class='tabl1'>
-				% my $control_data = $c->stash('DomainList');
-				% foreach my $row (@$control_data) {
-				<tr class='table-row'>
-					<td class='sme-border table-col table-col-Table1-Domain name / HOSTNAME'><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
-					<td class='sme-border table-col table-col-Table1-Brief description'><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
-					<td class='sme-border table-col table-col-Table1-Content'><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%></td>
-					<td class='sme-border table-col table-col-Table1-LABEL_NAMESERVERS'><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%></td>
-					<td class='sme-border table-col table-col-Table1-LABEL_POINT'><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%></td>
-					<td class='sme-border table-col table-col-Table1-LABEL_LECERT'><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%></td>
-					<td class='sme-border table-col table-col-Table1-IS_IN_CERT'><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
-					<td class='sme-border table-col table-col-Table1-CHECK'><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>		
-				</tr>
-				%}
-			</tbody>
-		</table>
-		
-	
-		%# Probably finally by a submit.
-	%end    
-</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_lets_PARAMS.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_lets_PARAMS.html.ep
@@ -1,97 +0,0 @@
-%#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 
-%#
-<div id="Letsencrypt-PARAMS" class="partial Letsencrypt-PARAMS">
-	<script>
-		window.onload = function() {
-		SelectInput();
-	};
-	</script>
-	% if (config->{debug} == 1) {
-		<pre>
-			%= dumper $lets_data
-		</pre>
-	% }
-	% my $btn = l('lets_APPLY');
-	%= form_for "letsencryptu" => (method => 'POST') => begin
-		% param 'trt' => $lets_data->{trt} unless param 'trt';
-		%= hidden_field 'trt' => $lets_data->{trt}
-		%# Inputs etc in here.
-
-		<h2 class='subh'><%=l('lets_Manage_letsencrypt-config_settings:')%></h2>
-	
-		<p class='paragraph para1'>
-			%=l('lets_CONFIG_LETSENCRYPT')
-		</p>
-	
-		<p><span class=label>
-			%=l('lets_SERVICE_STATUS')
-		</span><span class=data>
-			% my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
-			% param 'status' => $lets_data->{status} unless param 'status';
-			%= select_field 'status' => @status_options, class => 'input'
-		<br></span>	</p>
-	
-		<p><span class=label>
-			%=l('lets_HOOKSCRIPT_STATUS')
-		</span><span class=data>
-			% my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
-			% param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
-			%= select_field 'hookScript' => @hookScript_options, class => 'input'
-		<br></span>	</p>
-	
-		<p><span class=label>
-			%=l('lets_HOSTOVERRIDE_STATUS')
-		</span><span class=data>
-			% my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-			% param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
-			%= select_field 'hostOverride' => @hostOverride_options, class => 'input'
-		<br></span>	</p>
-	
-		<p><span class=label>
-			%=l('lets_ACCEPT_TERMS_STATUS')
-		</span><span class=data>
-			% my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
-			% param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
-			%= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => 'input'
-		<br></span>	</p>
-	
-		<p><span class=label>
-			%=l('lets_API_STATUS')
-		</span><span class=data>
-			% my @API_options = [['2' => '2']];
-			% param 'API' => $lets_data->{API} unless param 'API';
-			%= select_field 'API' => @API_options, class => 'input'
-		<br></span>	</p>
-	
-		<p><span class=label>
-			%=l('lets_KEYSIZE_STATUS')
-		</span><span class=data>
-			% my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
-			% param 'keysize' => $lets_data->{keysize} unless param 'keysize';
-			%= select_field 'keysize' => @keysize_options, class => 'input'
-		<br></span>	</p>
-	
-		<p><span class=label>
-			%=l('lets_CONFIGUREMODE_STATUS')
-		</span><span class=data>
-			% my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
-			% param 'configure' => $lets_data->{configure} unless param 'configure';
-			%= select_field 'configure' => @configure_options, class => 'input'
-		<br></span>	</p>
-	
-		<p><span class=label>
-			%=l('lets_EMAIL')
-		</span><span class=data>
-			% param 'email' => $lets_data->{email} unless param 'email';
-			%=email_field 'email', class => 'emai8'
-		</span></p>
-		
-	
-		<span class='data'>
-			%= submit_button l('lets_Save'), class => 'action subm9'
-		</span>
-	
-		%# Probably finally by a submit.
-	%end    
-</div>
--- a/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep
@@ -59,11 +59,11 @@
            %= t td => (class => 'sme-border') => "$first  $last"
            %= t td => (class => 'sme-border') => $vpnaccess
            %= t td => (class => 'sme-border') => $fwd
-			%my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
-			%my $modify_text = l('MODIFY');  # Localized text
-			%my $csrf_token = "TOKEN";  # CSRF token for security
-			%my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
-			%my $password_text = l("PASSWORD_RESET");
+			% my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
+			% my $modify_text = l('MODIFY');  # Localized text
+			% my $csrf_token = "TOKEN";  # CSRF token for security
+			% my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+			% my $password_text = l("PASSWORD_RESET");
 			%if ($useraccounts_user_name eq 'admin')  { 
 				%$actionModify = qq{
 					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
@@ -98,9 +98,9 @@
 					%</a>
 				%};
 			%} elsif ($useraccounts_user_name ne 'admin') {
-				%my $lock_text = l('ACCOUNT LOCKED');  # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
-				%my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+				% my $lock_text = l('ACCOUNT LOCKED');  # Localized text
+				% my $csrf_token = "TOKEN";  # CSRF token for security
+				% my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
 				%$actionLock = qq{
 					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
 						%	<button type='button' class='sme-lock-button' title='$lock_text' >
@@ -117,8 +117,8 @@
 					%};
 			%}
 			%if ( $removable eq 'yes' )  { 
-				%my $remove_text = l('REMOVE');  # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
+				% my $remove_text = l('REMOVE');  # Localized text
+				% my $csrf_token = "TOKEN";  # CSRF token for security
 				%$actionRemove = qq{
 					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
 					%	<button type='button' class='sme-remove-button' title='$remove_text' >
@@ -128,13 +128,12 @@
 				%};
 			%}
 			
-			%my $thisdomain = session 'SystemName';
-			%$thisdomain .= ".".session 'DomainName';
-			%my $roundcube_text = l('Webmail');  # Localized text
-			%my $csrf_token = "TOKEN";  # CSRF token for security
-			%my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
-			%$actionroundcube = qq{
-				%<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name">
+		    % my $thisdomain = $c->req->url->to_abs->host;
+			% my $roundcube_text = l('Webmail');  # Localized text
+			% $csrf_token = "TOKEN";  # CSRF token for security
+			% $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+			% $actionroundcube = qq{
+				%<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
 				%	<button type='button' class='sme-email-button' title='$roundcube_text' >
 				%		$roundcube_text
 				%	</button>
@@ -156,4 +155,4 @@

        %= hidden_field 'trt' => $usr_datas->{trt}

-</div>
+</div>
--- a/root/usr/share/smanager/themes/default/templates/roundcube.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/roundcube.html.ep
@@ -14,25 +14,26 @@
 			%= $c->render_to_string(inline => stash 'error') 
 		</div>
    %}
-    <h1> roundcube - <%=$title %></h1><br>
-    <p>If the roundcube panel does not appear after logging in, then please check your password.</p><br />
+    <h1><%=$title %></h1><br>
+    <p>If the Webmail panel does not appear after logging in, then please check your password.</p><br />

-    % my $thisdomain = session 'SystemName';
-    % $thisdomain .= ".".session 'DomainName';
+    % my $thisdomain = $c->req->url->to_abs->host;
    % my $url = $c->stash('modul');
+    % if (!$url) {
+	%	$url = $thisdomain."/roundcube";
+	%}
    % my $username = 'admin';
    % if ($url =~ /[?&]_user=([^&]+)/) {
 	%	$username = $1;
 	%}
-	
-	<a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="sme-fullwindow1-button" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
-
-    % my $height = $c->stash('height') | '600px';
-    % if ($height !~ /px$/) { $height = $height.'px';}
-    % if ($url eq "") {
-	%	$url = "https://".$thisdomain."/roundcube";
+	% if (!($url =~ /https:/)) {
+    % $url = 'https://' . $url;
 	%}
-	<object id="roundcube" class="roundcube" data="<%=$url %>" style="width:99%;height:<%= $height %>;" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
+
+    <div class='roundcube'>
+		<a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="sme-fullwindow1-button" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
+		<object id="roundcube" data="<%=$url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
+	</div>
 </div>


--- 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 48
+%define release 53
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -143,6 +143,26 @@ true
 %defattr(-,root,root)

 %changelog
+* Sat Feb 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-53.sme
+- helper to set default value of select field using protected value [SME: 12923]
+
+* Wed Feb 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-52.sme
+- move letsencrypt panel to smeserver-certificates [SME: 12916]
+
+* 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
+- 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 
+
+* 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]
Author	SHA1	Message	Date
Jean-Philippe Pialasse	c0b4d1f90e	* Sat Feb 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-53.sme - helper to set default value of select field using protected value [SME: 12923]	2025-02-15 15:19:04 -05:00
Jean-Philippe Pialasse	a979d472e8	* Wed Feb 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-52.sme - move letsencrypt panel to smeserver-certificates [SME: 12916]	2025-02-12 23:14:38 -05:00
Brian Read	d776f20736	* 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 - Sort out reveiw panel missing routines from FormMagic [SME: 12907].	2025-02-12 16:31:17 +00:00
Brian Read	a4668da720	* 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	2025-02-09 15:34:41 +00:00
Brian Read	7ad224998c	* 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]	2025-02-07 16:21:42 +00:00
Brian Read	3070e0656c	Fix typo in ibay delete link	2025-02-07 11:41:04 +00:00