* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-104.sme

- Fix DB not open in Workgrouyp panel sometimes. [SME: 13070]

createlinks

@@ -8,12 +8,12 @@ use esmith::Build::CreateLinks  qw(:all);
 my $mngrdir = '/usr/share/smanager';
 
 # templates to expand
-for (  qw( sme_core.css sme_main.css sme_menu.css styles.css ) )
-{
-    templates2events("$mngrdir/themes/default/public/css/$_", qw(
-        bootstrap-console-save smeserver-manager-update
-        ));
-}
+#for (  qw( sme_core.css sme_main.css sme_menu.css styles.css ) )
+#{
+#    templates2events("$mngrdir/themes/default/public/css/$_", qw(
+#        bootstrap-console-save smeserver-manager-update
+#        ));
+#}
 
 templates2events("$mngrdir/conf/srvmngr.conf", 
         qw( smeserver-manager-update smanager-theme-change smanager-modify bootstrap-console-save ));

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body

@@ -1,250 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/*	from e-smith-manager to smanager (smeserver_manager2)  */
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-
-/* This is the stylesheet used as the basis for older broswers.
-
-Note that you CANNOT simly add styles here and hope they work.  ONLY CSS
-level 1 styles should be in this file.  Everyting else goes into the other 3
-files.
-
-These basic styles ensire that browsers that don't understand the @import
-method will still be usable.  All modern browsers will use the styles in
-sme_main.css, sme_menu.css or sme_header.css depending on the frame in which
-the page is found.   
-*/
-
-/* Default HTML styles */
-body {
-    background: #ffffff;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    border-width: 0;
-}
-
-table, tr, td, div, p, form {
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-}
-
-p {
-    margin-top: 8px;
-    margin-bottom: 2px;
-}
-
-form {
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-span {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-}
-
-.notsmall {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-}
-
-h1, .h1 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    color: #333333;
-    font-size: 18px;
-    margin-bottom: 4px;
-    margin-top: 12px;
-}
-
-h2, .h2 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    color: #333333;
-    font-size: 14px;
-    margin-bottom: 3px;
-    margin-top: 12px;
-}
-
-h3, .h3 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    color: #333333;
-    font-size: 12px;
-    margin-bottom: 2px;
-    margin-top: 12px;
-}
-
-h4, .h4 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-style: italic;
-    color: #333333;
-    font-size: 12px;
-    margin-bottom: 2px;
-    margin-top: 10px;
-}
-
-ol, ul, li {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px;
-    font-weight: normal;
-    color: black;
-}
-
-ul {
-    list-style-type: circle;
-}
-
-/* Core styles for use with sme_header.css*/
-body.header { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #cccccc; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-}
-
-.hilightbar {
-    background-color: #ffc50a;
-    font-size: 4px;
-}
-
-.infobar {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background-color: #cccccc;
-}
-
-.darkergrey {
-    color: #666666;
-}
-
-td.darkgrey {
-    background-color: #888888;
-}
-
-a.update {
-    color: red;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #cccccc; 
-}
-
-/* Core styles for use with sme_menu.css */
-
-body.menu { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    background-color: #e8f3e1;
-}
-
-td.section {
-    padding-bottom: 2px; 
-    padding-top: 8px; 
-}
-
-.section {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    font-weight: bold;
-    background-color: #e8f3e1;
-}
-
-a.item { 
-    color: #00008b;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #e8f3e1; 
-}
-
-a.sl { 
-    color: green;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #e8f3e1; 
-}
-
-a.alert { 
-    color: red;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background: #e8f3e1; 
-}
-
-/* Core styles for use with sme_main.css */
-body.main { 
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px; 
-    background-color: #ffffff;
-    color: #000000;
-}
-
-td.sme-noborders-label {
-    font-weight: bold;
-    width: 33%;
-    text-align: right;
-}
-
-hr.sectionbar {
-    color: #666666;
-    background-color: #666666;
-    height: 1px;
-    width: 80%;
-    border: 0;
-}
-
-hr.sme-copyrightbar {
-    color: #dddddd;
-    background-color: #dddddd;
-    height: 1px;
-    width: 100%;
-    border: 0;
-}
-
-.sme-copyright {
-    color: #777777;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-}
-
-/*These style definitions were found int he old css file (manager.css)
-but don't seem to ever be referenced in the code.  They're here
-for reference.
-
-.centerit {
-    text-align: center;
-}
-.highlight {
-    background: #ffc61e;
-}
-.subheading {
-    background: #ffffff;
-    color: #1e385b;
-}
-*/
-
-EOF
-}

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs

@@ -1,96 +0,0 @@
-{
-    $OUT =<<'HERE';
-
-/*	from e-smith-manager to smanager (smeserver_manager2)  */
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-
-/*contribs.org styling 
-*/
-body.header {
-background: #bee6a2;
-    }
-.hilightbar {
-background-color: #ffffff;
-    }
-.infobar {
-background-color: #98d36e;
-    }
-a.update {
-font-size: 11px;
-background: #98d36e;
-    }
-
-/* Core styles for use with sme_menu.css */
-body.menu {
-background-color: #e8f3e1;
-    }
-td.section {
-background-color: #e8f3e1;
-    }
-a.item {
-background: #e8f3e1;
-    }
-a.sl {
-background: #e8f3e1;
-    }
-a.alert {
-background: #e8f3e1;
-    }
-    
-/* Core Styles for use with sme_main.css */
-hr.sectionbar {
-color: #8ebe43;
-background-color: #8ebe43;
-    }
-hr.sme-copyrightbar {
-color: #8ebe43;
-background-color: #8ebe43;
-    }
-      
-/* flag container*/
-#flag-container span {
-	font-size: 24px;
-    display: flex;                     /* Allows for easy centering */
-    justify-content: center;           /* Center horizontally */
-    align-items: center;               /* Center vertically */
-    width: 100%;                       /* Full width of parent */
-    height: 24px;                      /* Set a fixed height */
-    border: 1px solid #ccc;            /* Light gray border */
-    border-radius: 5px;                /* Rounded corners */
-    cursor: default;                   /* Prevent text cursor */
-
-}
-
-.fallback-box {
-  display: inline-block; /* Make it inline-block to fit around the content */
-  border: 2px solid gray; /* Change the border color as desired */
-  padding: 10px; /* Add some padding */
-  border-radius: 10px; /* Round the corners of the box */
-  font-size: 60px; /* Adjust size if needed */
-  margin-top: 10px; /* Add some margin */
-  text-align: center; /* Center text inside the box */
-}
-
-HERE
-}

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/template-begin

@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body

@@ -1,440 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/*	from e-smith-manager to smanager (smeserver_manager2)  */
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-
-/*	This is the stylesheet used in the main panels only.  
-
-   This file inherits the styles use in sme_core in the "header" section, and
-   as noted in the code below. Note that some of the styles here are empty.  
-	This is because the style definition has moved safely to sme_core.css
-	and the placeholder is left here for reference or future use.
-
-   There are a lot of styles in here, so read carefully.  Each one is documented.
-
-	Styles that were in the old stylesheets, but are not used in the UI are at the
-	bottom, commented out.  These can be removed at the end of the 6.0 cycle */
-
-/* general page properties */
-body, body.main { 
-    margin-top: 5px; 
-    margin-right: 20px; 
-    margin-bottom: 5px; 
-    margin-left: 5px; 
-}
-
-
-/* Table properties ****************************************/
-/* There are THREE  types of tables
-   1. *.sme-layout*     is used for layout purposes.  It is the "master
-	                      container" on a page.  It controls the top-level table
-                         inside of which everything else is put.
-	2. *.sme-noborders*  is used for layout, and defines a borderless table and 
-	                      cells used within it.
-	2. *.sme-border*     is used for tabular data, and defines a header row and borders
-	                      for tables that need borders
-
-	*/
-
-/*First, some defaults */
-td {
-    text-align: left;
-}
-
-
-/* 
-sme-layout* : Used for top-level layout
-*/
-
-table.sme-layout {
-    border-collapse: collapse;
-	 margin-bottom: 2px;
-	 margin-top: 2px;
-}
-
-tr.sme-layout {
-    border: 1px solid #dddddd; 
-}
-
-td.sme-layout {
-    border: 1px solid #dddddd; 
-}
-
-/*This special style is actually used only for the button row along the bottom of each page*/
-th.sme-layout {
-    border: 1px solid #dddddd; 
-    background-color: #e8f3e1;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 9pt;
-    font-weight: bold;
-    color: #000000;
-    text-align: right; 
-    padding: 4px;
-}
-
-/* 
-sme-noborders* : Used for mid-level layout
-*/
-table.sme-noborders {
-    padding: 0px;
-    margin-top: 0px;
-    margin-bottom: 20px;
-    margin-left: 0px;
-    margin-right: 0px;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-td.sme-noborders-label {
-    font-weight: bold;
-    /*width: 250px;*/
-    text-align: right;
-    /*vertical-align: top;*/
-    background-color: #e8f3e1;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-td.sme-noborders-content {
-    text-align: left;
-    vertical-align: top;	
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-td.sme-noborders-info, div.sme-noborders-info {
-    text-align: left;
-    vertical-align: top;	
-}
-/* Used for a left-most column of radio buttons (see date/time panel) */
-td.sme-radiobutton {
-    width: 30px;
-}
-/* 
-sme-border* : Used for tabular data
-*/
-table.sme-border {
-    border-collapse: collapse;
-    border: 2px solid #cccccc;
-    empty-cells: show;
-    margin: 5px 5px 5px 2px;	 
-}
-td.sme-border,
-td.sme-border-warning,
-td.sme-border-right,
-td.sme-border-center {
-    border: 1px solid #cccccc;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px;
-    font-weight: normal;
-    color: #000000;
-    text-align: left;
-    padding-left: 2px;
-    padding-right: 2px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-}
-td.sme-border-warning {
-    color: red;
-	 }
-td.sme-border-right {text-align: right;}
-td.sme-border-center {text-align: center;}
-th.sme-border {
-    border: 1px solid #cccccc; 
-    background-color: #bee6a2;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px;
-    font-weight: bold;
-    color: #000000;
-    text-align: center;
-	 vertical-align: bottom;
-    padding-left: 2px;
-    padding-right: 2px;
-    padding-left: 3px;
-    padding-right: 3px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-	 /*border-width: 1px;
-	 border-style: solid;
-    border-color: #F2F0EE #75736E #75736E #F2F0EE ;*/ 
-}
-td.sme-border a, td.sme-border-right a, td.sme-border-center a {
-    font-size: 10px;
-}
-
-/* misc layout stuff*/
-/* these two are for any error messages that pop up*/
-div.error, div.sme-error, span.error, span.sme-error {
-    color: red;
-    background-color: #ffffff;
-    border-width: 1px;
-    border-style: solid;
-    border-color: red ; 
-    padding: 2px;
-    margin-left: 20px;
-    margin-right: 20px;
-    margin-top:0px;
-    margin-bottom:0px;
-	 
-}
-
-div.error-noborders, div.sme-error-noborders,
-span.error-noborders, span.sme-error-noborders
-{
-    color: red;
-    background-color: #ffffff;
-    border-width: 0px;
-}
-
-div.error h2, span.error h2,
-div.error p, span.error p
-{
-    color: red;
-}
-/* These are for the special case of a link being inside an error message */
-div.sme-error a, div.error a, span.error a, span.sme-error a,
-div.error-noborders a, div.sme-error-noborders a,
-span.error-noborders a, span.sme-error-noborders a
-{
-    color: #ff0000;
-    font-weight: bold;
-    text-decoration: underline;
-}
-
-/* For when a link is the error message */
-a.error:link, a.error:visited, a.error:hover, a.error:active {
-    color: #ff0000;
-    font-weight: normal;
-    text-decoration: underline;
-}
-
-/* these two are for any success messages that pop up*/
-div.success, span.success {
-    color: #006400;
-    background-color: #ffffff;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #006400 ; 
-    padding: 2px;
-    margin-left: 20px;
-    margin-right: 20px;
-    margin-top:0px;
-    margin-bottom:0px;
-	 
-}
-
-/* These two are for the special case of a link being inside a success message */
-div.success a, span.success a 
-{
-    color: #006400;
-    font-weight: bold;
-    text-decoration: underline;
-}
-
-div.success h2, span.success h2,
-div.success p, span.success p
-{
-    color: green;
-}
-
-/*These two define the copyright footer styles, one for the line and one for the text*/
-hr.sme-copyrightbar {
-}
-.sme-copyright {
-}
-
-/* These ones define styles for the links that are made to look like
-   standard form submit buttons */
-a.button-like:link, 
-a.button-like:visited,
-a.button-like:hover,
-a.button-like:active,
-a.button-like-small:link, 
-a.button-like-small:visited,
-a.button-like-small:hover,
-a.button-like-small:active { 
-    font-family: sans-serif;
-    font-size: 13px; 
-    color: black; 
-    background: #D4D0C8; 
-    text-decoration: none;
-    text-align: left; 
-    border-color: #F2F0EE #75736E #75736E #F2F0EE ; 
-    margin-top: 10px; 
-    margin-right: 2px; 
-    margin-bottom: 10px; 
-    margin-left: 2px; 
-    border-style: solid; 
-    border-top-width: 2px; 
-    border-right-width: 2px; 
-    border-bottom-width: 2px; 
-    border-left-width: 2px;
-    padding-top: 2px; 
-    padding-bottom: 2px; 
-    padding-left: 6px; 
-    padding-right: 6px; 
- }
-a.button-like-small:link, 
-a.button-like-small:visited,
-a.button-like-small:hover,
-a.button-like-small:active { 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    font-size: 10px; 
-    padding-top: 0px; 
-    padding-bottom: 0px; 
-    padding-left: 1px; 
-    padding-right: 1px; 
-}
-a.button-like:active,
-a.button-like-small:active { 
-    border-color: #75736E #F2F0EE #F2F0EE #75736E  ; 
-}
-
-/* EXPERIMENTAL SECTION */
-/* These are styles used to experiment with. */
-
-/* class for links, similar to the class in sme_menu.css, but for a red button */
-a.button-like-red:link, 
-a.button-like-red:visited,
-a.button-like-red:hover,
-a.button-like-red:active { 
-    border-left: #F1726C 2px solid;
-    border-right: #B42025 2px solid;
-    border-top: #F1726C 2px solid;
-    border-bottom: #B42025 2px solid;
- }
-a.button-like-red:active { 
-    border-color: #75736E #F2F0EE #F2F0EE #75736E  ; 
-}
-
-/*These are style definitions found in the UI but not defined in any file I 
-  could locate.  They're listed here for historical purposes, but have been
-  removed from the UI
-
-pagedescription (used in the first paragraph of text on a page) [HTML.pm]
-label (used in forms) [HTML.pm]
-field (used in forms) [HTML.pm]
-fielddescription (used ???)[HTML.pm]
-buttons (used in forms) [HTML.pm]
-*/  
-/*td.sme-submitbutton {
-	text-align: right;
-}
-*/
-
-/*These style definitions were found int he old css file (manager.css)
-  but don't seem to ever be referenced in the code.  They're here
-  for reference.
-
-.banner {
-    background: #000000;
-    color: #ffffff;
-}
-.banner-right {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    background: #e17200;
-    color: #ffffff;
-}
-.border {
-    background: #000000;
-    color: #000000;
-    border-color: #000000;
-}
-.sidebar {
-    width: 200px;
-    background: #ffffff;
-    font-size: smaller;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: normal;
-}
-.sidebar-title {
-    background: #1e385b;
-    color: #ffffff;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-}
-.newsitem {
-    background: #ffffff;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    margin-left: 5px;
-    margin-right: 5px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-.newsitem-title {
-    background: #cccccc;
-    color: #ffffff;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-}
-.newsitem-footer {
-    background: #cccccc;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: smaller;
-    text-align: right;
-}
-.newsitem-detail {
-    font-size: smaller;
-    font-weight: normal;
-} 
-.formlabel {
-    background: #c0c0c0;
-    color: #000000;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: small;
-    font-weight: bold;
-    text-align: right;
-}
-.welcome-link {
-    background: #ffffff;
-    color: #1e385b;
-}
-.littlelink {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-#textlayer {
-    position: absolute;
-    visibility: inherit;
-    top: 160px;
-    left: 50px;
-    z-index: 2;
-}
-#para {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-    color: #000000;
-}  
-#title {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-    padding: 7px 7px 7px 7px;
-    color: #ffffff;
-} 
-*/
-
-EOF
-}

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs

@@ -1,50 +0,0 @@
-{
-    $OUT =<<'HERE';
-
-/*	from e-smith-manager to smanager (smeserver_manager2)  */
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-/*contribs.org styling */
-
-/* This special style is actually used only for the button row along the bottom of each page */
-th.sme-layout {
-border: 1px solid #8ebe43;
-background-color: #bee6a2;
-    }
-table.sme-border {
-border: 2px solid #dddddd;
-    }
-td.sme-border-warning,
-td.sme-border-right,
-td.sme-border-center {
-border: 1px solid #dddddd;
-    }
-td.sme-border-right {text-align: right;}
-td.sme-border-center {text-align: center;}
-th.sme-border {
-border: 1px solid #dddddd;
-background-color: #e8f3e1;
-    }
-HERE
-}
-    

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/template-begin

@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body

@@ -1,229 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/*	from e-smith-manager to smanager (smeserver_manager2)  */
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-
-/* This is the stylesheet used in the navigation panel only
-
-   This file inherits the styles use in sme_core in the "navigation" section,
-   and as noted in the code below. Note that some of the styles here are empty.
-   This is because the style definition has moved safely to sme_core.css and
-   the placeholder is left here for reference or future use.
-
-   There are a lot of styles in here, so read carefully.  Each one is
-   documented.
-
-   Styles that were in the old stylesheets, but are not used in the UI are at
-   the bottom, commented out.  These can be removed at the end of the 6.0
-   cycle */
-
-/* Sets the general page properties */
-body, body.menu { 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 2px; 
-}
-
-/* This is the section heading style */
-.section {
-}
-
-td.menu-cell {
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-
-}
-
-/*
-All the a links use pseudoclasses to control the two visual link styles.
-For example:
-  a.item:link             the general link item
-  a.item-current:link:    the active link item
-
-The switch from item to item-current is done with a javascript script in the head of the
-navigation page, using the onClick event.
-
-We are making heavy use of the cascade with these.
-*/    
-
-/* a:link controls the look of a link when the mouse is nowhere near it */
-a.item:link, a.item-current:link, 
-a.warn:link, a.warn-current:link { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    background: #e8f3e1; 
-    text-decoration: none;
-    text-align: left; 
-    border-color: #e8f3e1; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-top: 0px; 
-    padding-bottom: 2px; 
- }
-
-/* a:visited controls the look of a visited link (one that has been clicked) */
-a.item:visited, a.item-current:visited, 
-a.warn:visited, a.warn-current:visited { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    background: #e8f3e1; 
-    text-decoration: none; 
-    border-color: #e8f3e1; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* a:hover controls the look of a link under the curser*/
-a.item:hover, a.item-current:hover,
-a.warn:hover, a.warn-current:hover { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    text-decoration: none; 
-    background: #cccccc; 
-    border-color: #888888; 
-    margin-top: 0px; 
-    margin-right: 0px;
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px; 
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* a:active controls the look of a link as it is selected*/
-a.item:active, a.item-current:active, 
-a.warn:active, a.warn-current:active { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: white; 
-    background: black; 
-    text-decoration: none ; 
-    border-color: #000000; 
-    margin-top: 0px; 
-    margin-right: 0px; 
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px;
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* 
-These styles are to ensure that a selected link appears selected, even if the link
-opens in another frame.  This uses a javascript chunk in the head of the navigation 
-frame to change the style using the onClick event.
-*/
-a.item-current:link,    a.warn-current:link,
-a.item-current:visited, a.warn-current:visited, 
-a.item-current:active,  a.warn-current:active,
-a.item-current:hover,   a.warn-current:hover { 
-    display: block;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 10px; 
-    color: black; 
-    text-decoration: none; 
-    background: #ffffff; 
-    border-color: #888888; 
-    margin-top: 0px; 
-    margin-right: 0px;
-    margin-bottom: 0px; 
-    margin-left: 0px; 
-    border-style: solid; 
-    border-top-width: 1px; 
-    border-right-width: 1px; 
-    border-bottom-width: 1px; 
-    border-left-width: 1px; 
-    padding-right: 10px; 
-    padding-left: 10px; 
-    padding-bottom: 2px; 
-    text-align: left; 
-}
-
-/* these two add a border on the styles defined directly above when
-the mouse is hovering over them */
-a.item-current:hover,   a.warn-current:hover { 
-    border-color: #888888; 
-}
-
-/* These redefine a few elements to make room for the icon to the left of the warn class*/
-a.warn:link,    a.warn-current:link, 
-a.warn:visited, a.warn-current:visited, 
-a.warn:active,  a.warn-current:active,
-a.warn:hover,   a.warn-current:hover { 
-    background-image: url(/server-common/warn.gif);
-    background-repeat: no-repeat;
-    background-position: 10px; 
-    padding-left: 25px; 
-}
-/*end*/
-
-EOF
-}

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/template-begin

@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body

@@ -1,293 +0,0 @@
-{
-    $OUT = <<'EOF';
-
-/*	smeserver_manager2  */
-
-/*----------------------------------------------------------------------
- * copyright (C) 1999-2003 Mitel Networks Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Technical support for this program is available from Mitel Networks
- * Please visit our web site www.mitel.com for details.
- *----------------------------------------------------------------------
- */
-
-/* This is the basic stylesheet originally used in the mojo version.
-   */
-
-body{
-    background-color: #FFF;
-}
-
-#container{
-    max-width: 100%;
-    position: relative;
-    margin: auto;
-}
-
-#navigation{
-    width: 190px;
-    position: absolute;
-    margin-left: 0px;
-    padding: 5px;
-    background-color: #E8F3E1;
-/*    height: 600px; */
-    overflow: auto;
-}
-
-#main{
-    margin-left: 195px;
-    padding: 10px;
-}
-
-#central{
-    margin-left: 0px;
-    padding: 5px;
-}
-
-#footer{
-    margin-left: 0px;
-    padding: 5px;
-}
-
-#header {
-    background: #bee6a2;
-}
-
-#header h1, a:link, a:visited {
-    color: black;
-    text-decoration: none;
-/* contribs.org styling */
-}
-
-a:link { color: #006921; text-decoration: none; }
-a:visited { color: #063; text-decoration: none; }
-a:hover { color: #F00; text-decoration: none; }
-a:active { color: #606060; text-decoration: none; }
-
-.sme-error {
-    color: red;
-    display:block;
-    background-color: #ffffff;
-    border-width: 1px;
-    border-style: solid;
-    border-color: red ; 
-    padding: 2px;
-    margin-left: 10px;
-    margin-right: 10px;
-    margin-top:0px;
-    margin-bottom:0px;
-}
-
-.sme-warning {
-    color: orange;
-    display:block;  
-    background-color: #ffffff;
-    border-width: 1px;
-    border-style: solid;
-    border-color: orange ; 
-    padding: 4px;
-    margin-left: 20px;
-    margin-right: 20px;
-    margin-top:2px;
-    margin-bottom:2px;
-}
-
-#footer img {
-    float: right;
-    position: fixed;
-    margin-left: 40%;
-}
-
-label.field-with-error {
-	color: #dd7e5e
-}
-
-input.field-with-error { 
-	background-color: #fd9e7e 
-}
-
-span.label {
-    display: inline-block;
-    font-weight: bold;
-    background-color: #e8f3e1; /*lightgreen;*/
-    width: 30%;
-    text-align: right;
-}
-
-td.label {
-    font-weight: bold;
-    background-color: #e8f3e1; /*lightgreen;*/
-    width: 30%;
-    text-align: right;
-}
-
-span.label2 {
-    display: inline-block;
-    font-weight: bold;
-    background-color: #e8f3e1; /*lightgreen;*/
-    text-align: right;
-}
-
-span.data {
-    padding: 2px;
-    font-weight: bold;
-    margin-left: 0%;
-/*    background-color: lightblue;*/
-}
-
-span.data2 {
-    padding: 2px;
-/*    background-color: lightblue; */
-}
-
-input.action {
-    margin-left: 0px;
-    background-color: #bee6a2; /*lightgreen;*/
-    color: darkgreen;
-    border-radius: 8px;
-    border: 2px solid #4CAF50; /* Green */
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-input.action:hover {background-color: #3e8e41; color:white;}
-
-input.action:active {
-  background-color: #3e8e41;
-  transform: translate(-2px,2px);
-}
-
-.center {
-    display: flex;
-    justify-content: center;
-}
-
-input.action2 {
-    margin-left: 0px;
-    color: black;
-    background-color: #d4d0c8;
-    display: flex;
-    justify-content: center;
-}
-
-
-#modul.desc {
-    padding: 3px;
-    background-color: grey;
-}
-
-[type = 'text'] {
-    margin-left: 0px;
-    /*background-color: lightblue;*/
-}
-
-.a, .return {
-    color: #661866;
-    font-weight: bold;
-}
-
-a.section {
-}
-.a, .item {
-    line-height: 12px;
-}
-
-a.section-title {
-    display: inline-block;
-    color: #6CA345;	/*#888;*/
-    padding-left: 5px;
-    padding-right: 5px;
-    line-height: 18px;
-    font-weight: bold;
-}
-
-a.menu-title {
-    display: inline-block;
-    color: #1A6D1A;	/*#666;*/
-    padding-left: 1px;
-    padding-right: 1px;
-    font-weight: bold;
-}
-
-
-#module {
-/*    height: 600px; */
-    overflow: auto;
-}
-
-
-#h2l1 {
-    height: 40px;
-    width: 100%;
-}
-#h2e11 {
-    width: 50%;
-    float: left;
-}
-#h2e12 {
-    background-color: #C0E7A6;
-    float: left;
-    text-align: right;
-}
-
-#h2l2 {
-/*    background-color: #A8F9E7;*/
-    border-top: solid white 3px;
-    border-bottom: solid white 2px;
-    height: 14px;
-    width: 100%;
-    padding: 1px;
-}
-
-#h2e21 {
-    float: left;
-    width: 70%;
-}
-
-#h2e22,#h2e23,#h2e12 {
-    float: left;
-    width: 14em;
-    text-align: center;
-}
-
-.toggle-password {
-    margin-left: -30px;
-}
-
-.tg-icon {
-    position: relative;
-    top: 5px;
-    left: 2px;
-}
-
-.roundcube div {
-	height:462px;
-	width:85%;
-	margin-bottom:1%;
-}
-
-.roundcube object {
-	margin-top:1%;
-	height:95%;
-	width:100%;
-}
-
-
-/*end*/
-EOF
-}

root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/template-begin

@@ -1 +0,0 @@
-/* DO NOT MODIFY THIS FILE! It is updated automatically */

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

@@ -4,6 +4,7 @@ package SrvMngr;
 use strict;
 use warnings;
 use utf8;
+binmode(STDOUT);
 
 use Mojo::Base 'Mojolicious';
 
@@ -29,9 +30,14 @@ use SrvMngr::Model::Main;
 use SrvMngr::Plugin::WithoutCache;
 
 use esmith::I18N;
+use esmith::ConfigDB::UTF8;
+use esmith::NavigationDB; # no UTF8 raw is ok for ASCII only flat file
+
+# Import the function(s) you need
+use SrvMngr_Auth qw(check_admin_access);
 
 #this is overwrittrn with the "release" by the spec file - release can be "99.el8.sme"
-our $VERSION = '51.el8.sme'; 
+our $VERSION = '94.el8.sme'; 
 #Extract the release value
 if ($VERSION =~ /^(\d+)/) {
     $VERSION = $1;  # $1 contains the matched numeric digits
@@ -46,7 +52,7 @@ our @EXPORT_OK = qw(
 	getNavigation ip_number validate_password is_normal_password email_simple
 	mac_address_or_blank mac_address ip_number_or_blank
 	lang_space get_routes_list subnet_mask get_reg_mask
-	gen_locale_date_string get_public_ip_address
+	gen_locale_date_string get_public_ip_address simpleNavMerge
 	);
 
 has home => sub {
@@ -301,10 +307,11 @@ sub setup_routing {
     $if_logged_in->get('/userpassword')->to('userpassword#main')->name('passwd');
     $if_logged_in->post('/userpassword')->to('userpassword#change_password')->name('passwd2');
 
-    my $if_admin = $r->under( sub {
-	my $c =shift;
-	return $c->is_admin || $c->auth_fail($c->l("acs_ADMIN"));
-    });
+	my $if_admin = $r->under( sub {
+	    my $c = shift;
+	    # Call the imported function directly
+	    return check_admin_access($c) || $c->auth_fail($c->l("acs_ADMIN"));
+	});
 
     $if_admin->get('/backup')->to('backup#main')->name('backup');
     $if_admin->post('/backup')->to('backup#do_display')->name('backupd');
@@ -319,7 +326,10 @@ sub setup_routing {
     $if_admin->post('/clamav')->to('clamav#do_update')->name('clamav2');
 
     $if_admin->get('/datetime')->to('datetime#main')->name('datetime');
-    $if_admin->post('/datetime')->to('datetime#do_update')->name('datetime2');
+    $if_admin->post('/datetimeu')->to('datetime#do_update')->name('datetimeu');
+    $if_admin->get('/datetimed')->to('datetime#do_display')->name('datetimed');
+    $if_admin->post('/datetimet')->to('datetime#do_testntp')->name('datetimet');
+
 
     $if_admin->get('/directory')->to('directory#main')->name('directory');
     $if_admin->post('/directory')->to('directory#do_update')->name('directory2');
@@ -414,28 +424,59 @@ sub setup_routing {
     # additional routes (for contribs) got from 'routes' db
     #my @routes = @{SrvMngr::get_routes_list()};
 
-    foreach (@{SrvMngr::get_routes_list()}) {
-
-	if ( defined $_->{method} and defined $_->{url} and defined $_->{ctlact} and defined $_->{name} ) {
-	    my $menu = defined $_->{menu} ? $_->{menu} : 'A';
-	    if ( $menu eq 'N' ) {
-	    	$r->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
-			if ( $_->{method} eq 'get');
-		$r->post($_->{url})->to($_->{ctlact})->name($_->{name})
-			if ( $_->{method} eq 'post');
-	    } elsif ( $menu eq 'U' ) {
-	    	$if_logged_in->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
-			if ( $_->{method} eq 'get');
-		$if_logged_in->post($_->{url})->to($_->{ctlact})->name($_->{name})
-			if ( $_->{method} eq 'post');
-	    } else {
-	    	$if_admin->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
-			if ( $_->{method} eq 'get');
-		$if_admin->post($_->{url})->to($_->{ctlact})->name($_->{name})
-			if ( $_->{method} eq 'post');
-	    }
+    #foreach (@{SrvMngr::get_routes_list()}) {
+		#if ( defined $_->{method} and defined $_->{url} and defined $_->{ctlact} and defined $_->{name} ) {
+			#my $menu = defined $_->{menu} ? $_->{menu} : 'A';
+			#if ( $menu eq 'N' ) {
+				#$r->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
+				#if ( $_->{method} eq 'get');
+			#$r->post($_->{url})->to($_->{ctlact})->name($_->{name})
+				#if ( $_->{method} eq 'post');
+			#} elsif ( $menu eq 'U' ) {
+				#$if_logged_in->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
+				#if ( $_->{method} eq 'get');
+			#$if_logged_in->post($_->{url})->to($_->{ctlact})->name($_->{name})
+				#if ( $_->{method} eq 'post');
+			#} else {
+				#$if_admin->get($_->{url})->to($_->{ctlact})->name($_->{name}) 
+				#if ( $_->{method} eq 'get');
+			#$if_admin->post($_->{url})->to($_->{ctlact})->name($_->{name})
+				#if ( $_->{method} eq 'post');
+			#}
+		#}
+    #}
+    
+    foreach my $route (@{SrvMngr::get_routes_list()}) {
+		if (defined $route->{method} && defined $route->{url} && defined $route->{ctlact} && defined $route->{name}) {
+			my $menu = defined $route->{menu} ? $route->{menu} : 'A';
+			
+			# Fix controller case: convert "ControllerName" to "controllername" in "ControllerName#action"
+			# this is so that AdminLTE breadcrumb works  - it appears that perl Packages names are NOT case sensitive 
+			# and that the breadcrumb package assumes that the package name is the same as the main route.
+			my ($controller, $action) = split /#/, $route->{ctlact}, 2;
+			my $fixed_ctlact = lc($controller) . '#' . $action;
+			
+			if ($menu eq 'N') {
+				$r->get($route->{url})->to($fixed_ctlact)->name($route->{name}) 
+					if $route->{method} eq 'get';
+				$r->post($route->{url})->to($fixed_ctlact)->name($route->{name})
+					if $route->{method} eq 'post';
+			}
+			elsif ($menu eq 'U') {
+				$if_logged_in->get($route->{url})->to($fixed_ctlact)->name($route->{name}) 
+					if $route->{method} eq 'get';
+				$if_logged_in->post($route->{url})->to($fixed_ctlact)->name($route->{name})
+					if $route->{method} eq 'post';
+			}
+			else {  # Default: menu 'A'
+				$if_admin->get($route->{url})->to($fixed_ctlact)->name($route->{name}) 
+					if $route->{method} eq 'get';
+				$if_admin->post($route->{url})->to($fixed_ctlact)->name($route->{name})
+					if $route->{method} eq 'post';
+			}
+		}
 	}
-    }
+
 
     $if_admin->get('/config/:key' => {key => qr/[a-z0-9]{2,32}/})->to('request#getconfig')->name('getconfig');
     $if_admin->get('/account/:key' => {key => qr/[a-z0-9]{2,32}/})->to('request#getaccount')->name('getaccount');
@@ -546,12 +587,10 @@ sub theme_list {
 #------------------------------------------------------------
 
 sub getNavigation {
-
-    use esmith::NavigationDB;
-
-    my $c  = shift;
+    my $class  = shift; #not the controller as it is called as an external, not part of the controller.
     my $lang = shift || 'en-us';
     my $menu = shift || 'N';
+    my $username = shift || ''; #Username when logged in as a user not admin
 
 #    my $lang = $c->session->{lang} || 'en-us';
 
@@ -560,13 +599,33 @@ sub getNavigation {
 
     my @files = ();
     my %files_hash = ();
+    
+    # Added: Store allowed admin panels for non-admin users
+    my @allowed_admin_panels = ();
+    my $is_admin = 1;  # Default to admin (full access)
+    
+    # Added: Check if user is non-admin and get their allowed panels
+    if ($username ne '') {
+        # Get the AccountsDB to check user permissions
+        my $accountsdb = esmith::AccountsDB::UTF8->open_ro() or
+            die "Couldn't open AccountsDB\n";
+            
+        # Check if user has AdminPanels property
+        my $user_rec = $accountsdb->get($username);
+        if (defined $user_rec && $user_rec->prop('AdminPanels')) {
+            $is_admin = 0;  # User is non-admin with specific panel access
+            # Get comma-separated list of allowed admin panels
+            my $admin_panels = $user_rec->prop('AdminPanels');
+            @allowed_admin_panels = split(/,/, $admin_panels);
+        }
+    }
 
     #-----------------------------------------------------
     # Determine the directory where the functions are kept
     #----------------------------------------------------- 
 	my $navigation_ctlr_ignore = 
-	"(\.\.?|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)";
-#	"(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)";
+	"(\.\.?|.*\-Custom\.pm|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)";
+#	"(\.\.?|Initial\.pm|.*Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)";
 	my $navigation_cgi_ignore = 
 	"(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)";
 
@@ -621,8 +680,7 @@ sub getNavigation {
 
     my $navinfo = NAVIGATIONDIR . "/navigation.$lang";
 
-    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or
-	die "Couldn't open $navinfo\n";
+    my $navdb = esmith::NavigationDB->open_ro( $navinfo ) or die "Couldn't open $navinfo\n"; # no UTF8
 
     # Check the navdb for anything with a UrlPath, which means that it doesn't
     # have a cgi file to be picked up by the above code. Ideally, only pages
@@ -638,70 +696,110 @@ sub getNavigation {
     }
 
     foreach my $file (keys %files_hash)
-    {
-	#my $heading = 'Unknown';
-	my $heading = 'Legacy';
-	
-	my $description = $file;
-	my $headingWeight = 99999;
-	my $descriptionWeight = 99999;
-	my $urlpath = '';
-	my $menucat = 'A';	# admin menu (default)
+		{
+		#my $heading = 'Unknown';
+		my $heading = 'Legacy';
+		
+		my $description = $file;
+		my $headingWeight = 99999;
+		my $descriptionWeight = 99999;
+		my $urlpath = '';
+		my $menucat = 'A';	# admin menu (default)
 
-	my $rec = $navdb->get($file);
+		my $rec = $navdb->get($file);
 
-	if (defined $rec)
-	{
-	    $heading = $rec->prop('Heading');
-	    $description = $rec->prop('Description');
-	    $headingWeight = $rec->prop('HeadingWeight') || 99999; #Stop noise in logs if file in dir does not have nav header.
-	    $descriptionWeight = $rec->prop('DescriptionWeight');
-	    $urlpath = $rec->prop('UrlPath') || '';
-	    $menucat = $rec->prop('MenuCat') || 'A';	# admin menu (default)
-	}
-	next if $menu ne $menucat;
+		if (defined $rec)
+		{
+			$heading = $rec->prop('Heading');
+			$description = $rec->prop('Description');
+			$headingWeight = $rec->prop('HeadingWeight') || 99999; #Stop noise in logs if file in dir does not have nav header.
+			$descriptionWeight = $rec->prop('DescriptionWeight');
+			$urlpath = $rec->prop('UrlPath') || '';
+			$menucat = $rec->prop('MenuCat') || 'A';	# admin menu (default)
+		}
+		
+		# Added: Check if this is an admin menu item and if user has access
+		if ($menucat eq 'A' && !$is_admin) {
+			# Skip this admin panel if user doesn't have access to it
+			my $has_access = 0;
+			my $file_no_ext = $file;
+			$file_no_ext =~ s/\.pm$//;  # Remove .pm extension if present
+			foreach my $allowed_panel (@allowed_admin_panels) {
+				if ($file_no_ext eq lc($allowed_panel)) {
+					#die("Here!!$file $file_no_ext $allowed_panel ");
+					$has_access = 1;
+					last;
+				}
+			}
+			next if !$has_access;
+		}
 
-	#-------------------------------------------------- 
-	# add heading, description and weight information to data structure
-	#-------------------------------------------------- 
+		next if $menu ne $menucat;
 
-	unless (exists $nav {$heading})
-	{
-	    $nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
-	}
+		#-------------------------------------------------- 
+		# add heading, description and weight information to data structure
+		#-------------------------------------------------- 
 
-	$nav {$heading} {'COUNT'} ++;
-	$nav {$heading} {'WEIGHT'} += $headingWeight;
+		unless (exists $nav {$heading})
+		{
+			$nav {$heading} = { COUNT => 0, WEIGHT => 0, DESCRIPTIONS => [] };
+		}
 
-	# Check for manager panel, and assign the appropriate
-	#  cgi-bin prefix for the links.
-	# Grab the last 2 directories by splitting for '/'s and
-	#  then concatenating the last 2
-	# probably a better way, but I don't know it.
+		$nav {$heading} {'COUNT'} ++;
+		$nav {$heading} {'WEIGHT'} += $headingWeight;
 
-	my $path;
-	if ( $files_hash{$file} eq 'ctrl') {
-	    $path = "2";
-	} elsif ( $files_hash{$file} eq 'cgim') {
-		$path = "/cgi-bin";
-	} else {
-		my @filename = split /\//, $files_hash{$file};
-		$path = "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
-	};
+		# Check for manager panel, and assign the appropriate
+		#  cgi-bin prefix for the links.
+		# Grab the last 2 directories by splitting for '/'s and
+		#  then concatenating the last 2
+		# probably a better way, but I don't know it.
 
-	push @{ $nav {$heading} {'DESCRIPTIONS'} },
-		{ DESCRIPTION => $description,
-		  WEIGHT => $descriptionWeight, 
-		  FILENAME => $urlpath ? $urlpath : "$path/$file",
-		  CGIPATH => $path,
-		  MENUCAT => $menucat
+		my $path;
+		if ( $files_hash{$file} eq 'ctrl') {
+			$path = "2";
+		} elsif ( $files_hash{$file} eq 'cgim') {
+			$path = "/cgi-bin";
+		} else {
+			my @filename = split /\//, $files_hash{$file};
+			$path = "/$filename[scalar @filename - 2]/$filename[scalar @filename - 1]";
 		};
+
+		push @{ $nav {$heading} {'DESCRIPTIONS'} },
+			{ DESCRIPTION => $description,
+			  WEIGHT => $descriptionWeight, 
+			  FILENAME => $urlpath ? $urlpath : "$path/$file",
+			  CGIPATH => $path,
+			  MENUCAT => $menucat
+			};
     }
 
 	return \%nav;
 
 }
 
+sub simpleNavMerge {
+	#Used to merge two nav structures - used for the user and selected admin menu.
+    my ($class,$nav1, $nav2) = @_;
+    my %result = %$nav1;  # Start with a copy of first nav
+    
+    # Merge in second nav
+    foreach my $heading (keys %$nav2) {
+        if (exists $result{$heading}) {
+            # Add counts and weights
+            $result{$heading}{COUNT} += $nav2->{$heading}{COUNT};
+            $result{$heading}{WEIGHT} += $nav2->{$heading}{WEIGHT};
+            # Append descriptions
+            push @{$result{$heading}{DESCRIPTIONS}}, @{$nav2->{$heading}{DESCRIPTIONS}};
+        } else {
+            # Just copy the heading
+            $result{$heading} = $nav2->{$heading};
+        }
+    }
+    
+    return \%result;
+}
+
+
 
 sub _lang_space {
 
@@ -749,7 +847,7 @@ sub get_routes_list {
 
     my $c  = shift;
 
-    my $rtdb = esmith::ConfigDB->open_ro('routes') || die 'Cannot open Routes db';
+    my $rtdb = esmith::ConfigDB::UTF8->open_ro('routes') || die 'Cannot open Routes db';
     my @routes = $rtdb->get_all();
     my @rt;
 
@@ -831,7 +929,7 @@ sub gen_locale_date_string
 sub get_public_ip_address
 {
     my $self = shift;
-	my $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+	my $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
     my $sysconfig = $cdb->get('sysconfig');
     if ($sysconfig)
     {
@@ -925,4 +1023,4 @@ sub get_reg_mask {
 }
 
 
-1;
+1;

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Backup;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Backup or restore
-# navigation  : 4000 200
+# navigation  : 4000 100
 # Copyright (C) 2002 Mitel Networks Corporation
 #----------------------------------------------------------------------
 # routes : end
@@ -20,21 +20,22 @@ use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session ip_number_or_blank);
 use Quota;
-use esmith::ConfigDB;
-use esmith::AccountsDB;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use esmith::util;
 use File::Basename;
 use File::Find;
 use File::Path qw(make_path remove_tree);
 use esmith::Backup;
-use esmith::BackupHistoryDB;
+use esmith::BackupHistoryDB; #no UTF8 and not in use 
 use esmith::util;
 use esmith::lockfile;
 use esmith::BlockDevices;
 use constant DEBUG => $ENV{MOJO_SMANAGER_DEBUG} || 0;
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open config db"; #remove as cached gives problems
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-#our $rdb = esmith::ConfigDB->open('/etc/e-smith/restore') || die "Couldn't open restore db";
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
 my ($cdb,$adb,$rdb);
 my $es_backup = new esmith::Backup or die "Couldn't create Backup object\n";
 my @directories = $es_backup->restore_list;
@@ -52,9 +53,9 @@ sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
     my %bac_datas = ();
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$rdb = esmith::ConfigDB->open('/etc/e-smith/restore');
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $rdb = esmith::ConfigDB::UTF8->open('/etc/e-smith/restore');
     my $title     = $c->l('bac_BACKUP_TITLE');
     my $notif;
     $bac_datas{'function'} = 'desktop_backup';
@@ -111,9 +112,9 @@ sub do_display {
     my $rt = $c->current_route;
     my ($res, $result) = '';
     my $function = $c->param('Function');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$rdb = esmith::ConfigDB->open('/etc/e-smith/restore');
+   $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open config db";
+   $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+   $rdb = esmith::ConfigDB::UTF8->open('/etc/e-smith/restore');
 
     if ($function =~ /^(\S+)$/) {
         $function = $1;
@@ -138,7 +139,7 @@ sub do_display {
         $c->render(template=>"backdown");
         #sleep(30);
         # Redirect to the front page
-		#$c->redirect_to('/backup');
+        #$c->redirect_to('/backup');
         return ""
     } ## end if ($function eq 'desktop_backup')
 
@@ -275,9 +276,9 @@ sub do_update {
     my $c = shift;
     $c->app->log->info($c->log_req);
     my $rt       = $c->current_route;
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$rdb = esmith::ConfigDB->open('/etc/e-smith/restore');
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $rdb = esmith::ConfigDB::UTF8->open('/etc/e-smith/restore');
     my $function = $c->param('Function');
     DEBUG && warn("do_update $function");
     my %bac_datas = ();
@@ -526,13 +527,13 @@ sub do_update {
 
     # common part for all functions
     if ($res ne 'OK') {
-
         if ($res eq 'NEXT') {
             $dest = 'back_' . $bac_datas{"function"};
         } else {
             $c->stash(error => $result);
             $dest = "back_$function";
         }
+        $bac_datas{vfstype}        = $c->param('VFSType');
         $c->stash(title => $title, bac_datas => \%bac_datas);
         return $c->render($dest);
     } ## end if ($res ne 'OK')
@@ -932,7 +933,7 @@ sub workstnVerify {
 
 sub workstnRestore {
     my ($c) = @_;
-    my $out;
+    my $out = '';
     my $restoreref = $c->param('Backupset');
     my $set        = $restoreref;
     $set =~ s/\/[^\/]*$//;
@@ -1015,6 +1016,7 @@ sub workstnRestore {
         return "$c->l('bac_OPERATION_STATUS_REPORT') $c->l('bac_ERR_PRE_RESTORE')";
     }
     $| = 1;
+    my $RD;
 
     if (open(RD, "-|")) {
 
@@ -1047,8 +1049,8 @@ sub workstnRestore {
                     or warn($c->l('bac_ERR_RESTORING_INITIAL_GRP') . "\n");
                 esmith::util::backgroundCommand(0, "/sbin/e-smith/signal-event", "post-upgrade");
 
-                #	system("/sbin/e-smith/signal-event", "post-upgrade") == 0
-                #	    or die ($c->l('bac_ERROR_UPDATING_CONFIGURATION')."\n");
+                	#system("/sbin/e-smith/signal-event", "post-upgrade") == 0 
+                	#    or die ($c->l('bac_ERROR_UPDATING_CONFIGURATION')."\n");
             } else {
                 $message = $c->l('bac_RESTORE_FAILED');
             }
@@ -1076,9 +1078,111 @@ sub workstnRestore {
         die($error_message) if $error_message;
         exit(0);
     } ## end else [ if (open(RD, "-|")) ]
-    $rdb->reload;
-    $error_message .= $c->bunmount($mntdir, $VFSType);
-    return '#OK#' . $out;
+    
+	#my $RD;
+
+	## Fork-safe open with explicit error handling
+	#unless (open($RD, "-|")) {
+		## Child process
+		#local $SIG{__DIE__} = sub { exit 255 };
+		#$| = 1;  # Autoflush
+
+		#eval {
+			#foreach my $file (@restorefiles) {
+				## Security: strict filename validation
+				#unless ($file =~ m{^[\w\/.-]+$}) {
+					#die "Invalid filename: $file";
+				#}
+				
+				## Check file existence
+				#unless (-e $file) {
+					#die "Backup file $file does not exist";
+				#}
+
+				## Execute dar with error checking
+				#system("/usr/bin/dar", "-Q", "-x", $file, "-v", "-N", "-R", "/", "-wa");
+				#if ($? == -1) {
+					#die "Failed to execute dar: $!";
+				#} elsif ($? & 127) {
+					#die sprintf("dar died with signal %d, %s coredump",
+						#($? & 127), ($? & 128) ? 'with' : 'without');
+				#} elsif ($? >> 8 != 0) {
+					#die "dar exited with error code " . ($? >> 8);
+				#}
+			#}
+
+			## Unmount with error checking
+			#if (my $unmount_err = $c->bunmount($mntdir, $VFSType)) {
+				#die "Unmount failed: $unmount_err";
+			#}
+		#};
+
+		#if (my $child_err = $@) {
+			#print STDERR "CHILD ERROR: $child_err";
+			#exit 254;
+		#}
+		#exit 0;
+	#} 
+	#else {
+		## Parent process
+		#eval {
+			## Verify fork succeeded
+			#unless (defined $RD) {
+				#die "Fork failed: $!";
+			#}
+
+			#$out .= $c->l('bac_FILES_HAVE_BEEN_RESTORED') . "\n<UL>";
+			#my $complete = 0;
+
+			## Read from child process
+			#while (<$RD>) {
+				#$complete++ if /etc\/samba\/smbpasswd$/;
+				#$out .= "<li>$_</li>\n";
+			#}
+			#$out .= "</UL>";
+
+			## Close pipe and check status
+			#unless (close $RD) {
+				#die "Pipe close failed: $!";
+			#}
+
+			#my $child_status = $?;
+			#if ($child_status != 0) {
+				#die "Child process failed with status " . ($child_status >> 8);
+			#}
+
+			## Post-restore actions
+			#if ($complete) {
+				#system("/usr/sbin/groupmod", "-g", $www_gid, "www");
+				#if ($? != 0) {
+					#die $c->l('bac_ERR_RESTORING_GID') . ": $! (status $?)";
+				#}
+
+				#system("/usr/sbin/usermod", "-g", $www_gid, "www");
+				#if ($? != 0) {
+					#die $c->l('bac_ERR_RESTORING_INITIAL_GRP') . ": $! (status $?)";
+				#}
+
+				#my $bg_result = esmith::util::backgroundCommand(0, "/sbin/e-smith/signal-event", "post-upgrade");
+				#unless ($bg_result) {
+					#die "Failed to schedule post-upgrade event";
+				#}
+			#} else {
+				#die $c->l('bac_RESTORE_FAILED');
+			#}
+		#};
+
+		## Error handling
+		#if (my $err = $@) {
+			#$rec->set_prop('state', 'failed');
+			#$rec->set_prop('error', "$err");
+			#esmith::lockfile::UnlockFile($file_handle);
+			#return $c->l('bac_RESTORE_FAILED_MSG') . ": $err";
+		#}
+	#}       
+	$rdb->reload;
+	$error_message .= $c->bunmount($mntdir, $VFSType);
+	return '#OK#' . $out;
 } ## end sub workstnRestore
 
 sub workstnSelRestore() {
@@ -1455,6 +1559,7 @@ sub performReboot {
 
     #print "$c->l('bac_SERVER_REBOOT')";
     #print "$c->l('bac_SERVER_WILL_REBOOT')";
+    warn "reboot coming";
     esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "reboot");
     return "#OK#" . $c->l('bac_SERVER_WILL_REBOOT');
 } ## end sub performReboot
@@ -1985,7 +2090,7 @@ sub bunmount {
         system('/bin/umount', '-f', $mount) == 0
             or return ($c->l('bac_ERR_WHILE_UNMOUNTING'));
     }
-    return;
+    return "";
 } ## end sub bunmount
 
 sub findmnt {
@@ -2024,4 +2129,4 @@ sub vmount {
         return (qx(/bin/mount -t nfs -o nolock,timeo=30,retrans=1,retry=0 "$host:/$share" $mountdir 2>&1));
     }
 } ## end sub vmount
-1;
+1;

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Bugreport;
 #----------------------------------------------------------------------
 # heading     : Investigation
 # description : Report a bug
-# navigation  : 7000 500
+# navigation  : 7000 300
 # routes : end
 #------------------------------
 use strict;
@@ -15,7 +15,8 @@ use SrvMngr qw(theme_list init_session);
 use Text::Template;
 use File::Basename;
 use SrvMngr qw( gen_locale_date_string );
-our $cdb = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n";
+use esmith::ConfigDB::UTF8;
+our $cdb = esmith::ConfigDB::UTF8->open or die "Couldn't open ConfigDB\n";
 
 use constant FALSE => 0;
 use constant TRUE  => 1;
@@ -173,4 +174,4 @@ sub download_config_report {
         'cleanup'             => 1,
     );
 } ## end sub download_config_report
-1;
+1;

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

@@ -13,9 +13,9 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::ConfigDB::UTF8;
 
-#package esmith::FormMagick::Panel::clamav;
-our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
+our $db;
 
 sub main {
     my $c = shift;
@@ -23,6 +23,7 @@ sub main {
     my %clm_datas = ();
     my $title     = $c->l('clm_FORM_TITLE');
     my $modul     = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD'));
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
     $clm_datas{'FilesystemScan'} = ($db->get_prop('clamav', 'FilesystemScan')) || 'disabled';
     $clm_datas{'Quarantine'}     = ($db->get_prop('clamav', 'Quarantine'))     || 'disabled';
     $clm_datas{'clam_versions'}  = get_clam_versions();
@@ -53,6 +54,7 @@ sub do_update {
 
 sub change_settings {
     my $c                  = shift;
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
     my $status             = $c->param('status');
     my $FilesystemScan     = ($c->param('FilesystemScan') || 'disabled');
     my $Quarantine         = ($c->param('Quarantine') || 'disabled');

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

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

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

@@ -1,356 +1,333 @@
 package SrvMngr::Controller::Datetime;
-
+#
+# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-15 12:45:47 
+# Remember that each route must be unique (else they just overwrite each other).
+# you cannot have get and post on the same name and url.
+#
 #----------------------------------------------------------------------
 # heading     : System
 # description : Date and time
-# navigation  : 4000 400
+# navigation  : 4000 300
+#
+# ######name   : datetimet,    method : post,   url : /datetimet,     ctlact : datetime#testntp
+#
 # routes : end
-#------------------------------
+#
+# Documentation: https://wiki.contribs.org/Datetime
+#----------------------------------------------------------------------
+
+#
+# Scheme of things:
+#
+# TBA!!
+
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+
+use Data::Dumper;
+
 use esmith::util;
-use SrvMngr qw( gen_locale_date_string );
-our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+use esmith::util::network;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB;
+use esmith::NetworksDB;
+use esmith::HostsDB::UTF8;
+use esmith::DomainsDB::UTF8;
+
+my $cdb;
+my $adb;
+my $ndb; 
+my $hdb; 
+my $ddb; 
+
+my %dat_data;
+
+require '/usr/share/smanager/lib/SrvMngr/Controller/Datetime-Custom.pm';  #The code that is to be added by the developer
 
 sub main {
+#
+# Initial entry - route is "/<whatever>"
+#
+#set initial panel
+#for initial panel:
+	#Specifiy panel to enter
+	#load up _data hash with DB fields
+	#load up stash with pointer(s) to control fields hash(= get-))
+		#and a pointer to the prefix_data hash
+#render initial panel
+
+    my $c = shift;
+    $c->app->log->info( $c->log_req );
+
+	#The most common ones - you might want to delete some of these if they are not used.
+	 $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+	 $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	 $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	 $hdb = esmith::HostsDB::UTF8->open() 	  || die("Couldn't open Hosts db");
+	 $ddb = esmith::DomainsDB::UTF8->open()  || die("Couldn't open Domains db");
+
+     %dat_data = ();
+    my $title     = $c->l('dat_FORM_TITLE');
+    my $modul     = $c->l('dat_INITIAL_DESC');
+
+    $dat_data{'trt'} = 'PARAMS';
+    
+    #Load any DB entries into the <prefix>_data area so as they are preset in the form
+    # which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
+    my $db = $cdb; #pickup local or global db or Default to config
+    
+	
+	$c->do_display($dat_data{'trt'});
+	
+}
+
+# Post request with params - submit from the form 
+sub do_update {
+#
+# Return after submit pushed on panel (this is a post) - route is "/<whatever>u"
+# parameters in the params hash.
+#
+#load up all params into prefix_data hash:
+#By panel (series of if statements - only one executed):
+		#call validate-PANEL() - return ret = ok or error message
+			
+#if validation not ok:
+	#render back to current panel with error message in stash
+#otherwise:
+	#By panel (series of if statements - only one executed):
+		#do whatever is required: call perform-PANEL() - return 'ok' or Error Message
+			#call signal-event for any global actions specified (check it exists - error and continue?)
+			#if action smeserver-<whatever>-update exists
+				#signal_event smeserver-<whatever>-update
+			#call signal-event for any specific actions for thids panel (check it exists first - error and continue)
+		#set success in stash
+		#if no "nextpanel" entry:
+			#set firstpanel
+		#else 
+			#set nextpanel
+		#call render
+	
     my $c = shift;
     $c->app->log->info($c->log_req);
-    my %dat_datas = ();
+    
+    #$c->app->log->info($c->param('month'));
+    
+
+	#The most common ones - you might want to delete some of these if they are not used.
+	 $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+	 $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	 $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	 $hdb = esmith::HostsDB::UTF8->open() 	  || die("Couldn't open Hosts db");
+	 $ddb = esmith::DomainsDB::UTF8->open()  || die("Couldn't open Domains db");
+
     my $title     = $c->l('dat_FORM_TITLE');
     my $modul     = $c->l('dat_INITIAL_DESC');
-    $dat_datas{ntpstatus} = 'disabled';
-    my $rec = $cdb->get('ntpd');
 
-    if ($rec) {
-        $dat_datas{'ntpserver'} = $rec->prop('NTPServer') || '';
+	# Accessing all POST/GET parameters
+    #my $params = $c->req->params->to_hash;
 
-        if ($rec->prop('status') eq 'enabled') {
-            $dat_datas{ntpstatus} = 'enabled'
-                unless ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' and $dat_datas{ntpserver} =~ m#^\s*$#;
-        }
-    } ## end if ($rec)
-    (   $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month},  $dat_datas{day}, $dat_datas{year},
-        $dat_datas{hour},    $dat_datas{minute},    $dat_datas{second}, $dat_datas{ampm}
-        )
-        = split /\|/,
-        `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
+    # Get number of POST parameters
+    #my $num_params = keys scaler %$params;
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $dat_data{$key} = $value;
+    #}
 
-    # get rid of trailing carriage return on last field
-    chop($dat_datas{ampm});
-    $dat_datas{'now_string'} = gen_locale_date_string;
-    $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
-    $c->render('datetime');
-} ## end sub main
+    # the value of trt will tell you which panel has returned    
+    my $trt = $c->param('trt') || 'PARAMS'; #hidden control on every form.
+    my $ret = 'ok';
 
-sub do_update {
-    my $c         = shift;
-    my %dat_datas = ();
+    #Validate the parameters in a custom sub one for each panel (although only one of these will be executed)
+    my $thispanel;
+    
+		if ($trt eq 'PARAMS'){
+			#Validate form parameters for panel PARAMS
+			$ret = $c->validate_PARAMS(\%dat_data);
+			$thispanel = 'PARAMS';
+		}
+	
+	if ($ret ne 'ok'){
+		$c->stash(error => $c->l($ret));
+		$c->do_display($thispanel);
+	} else {
+		#Do whatever is needed, including writing values to the DB
+		
+		
+			if ($trt eq 'PARAMS'){
+				#do whatever is required ...
+				$ret = $c->perform_PARAMS(\%dat_data);
+				if ($ret ne 'ok') {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->stash( 
+						title => $title, 
+						modul => $modul,
+						dat_data  => \%dat_data
+					);
+					$c->render(template => "datetime");	
+					return
+				} else {
+					if ($c->param('time_mode') eq 'dat_manually_set') {
+						$c->stash( success => $c->l('dat_UPDATING_CLOCK')); 
+					} else {
+						$c->stash( success => $c->l('dat_SETTINGS_CHANGED')); 
+					}
+				}
+			}
+
+	
+		# and call any signal-events needed
+		#TBD
+		# Setup shared data and call panel
+		if ('none' eq 'none') {
+			$dat_data{'trt'} = 'PARAMS';
+		} else {
+			$dat_data{'trt'} = 'none';
+		}	
+		$c->do_display($dat_data{'trt'});
+	} 
+}
+
+sub do_display {
+#
+# Return after link clicked in table (this is a get) - route is "/<whatever>d"
+# Expects ?trt=PANEL&selected="TableRowName" plus any other required
+#
+# OR it maybe a post from the main panel to add a new record 
+#
+#load up all supplied params into prefix_data hash
+#call get-selected-PANEL() - returns hash of all relevent parameters
+#load up returned hash into prefix_data
+#render - to called panel
+
+    my ($c,$trt) = @_;
+    $c->app->log->info($c->log_req);
+
+	#The most common ones - you might want to delete some of these if they are not used.
+	 $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+	 $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	 $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	 $hdb = esmith::HostsDB::UTF8->open() 	  || die("Couldn't open Hosts db");
+	 $ddb = esmith::DomainsDB::UTF8->open()  || die("Couldn't open Domains db");
+    
     my $title     = $c->l('dat_FORM_TITLE');
     my $modul     = $c->l('dat_INITIAL_DESC');
-    my $result;
-    my $success;
-    my $old_ntpstatus = $c->param('Old_ntpstatus');
-    $dat_datas{ntpstatus} = $c->param('Ntpstatus');
 
-    if ($dat_datas{ntpstatus} ne $old_ntpstatus) {
-        if ($dat_datas{ntpstatus} eq 'disabled') {
-            (   $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month},
-                $dat_datas{day},     $dat_datas{year},      $dat_datas{hour},
-                $dat_datas{minute},  $dat_datas{second},    $dat_datas{ampm}
-                )
-                = split /\|/,
-                `/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
+	# Accessing all parameters
+    #my $params = $c->req->params->to_hash;
 
-            # get rid of trailing carriage return on last field
-            chop($dat_datas{ampm});
-        } else {
-            $dat_datas{ntpserver} = ($cdb->get_prop('ntpd', 'NTPServer')) || '';
-        }
-        $dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
-        $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
-        return $c->render('datetime');
-    } ## end if ($dat_datas{ntpstatus...})
+    # Get number of parameters
+    #my $num_params = keys %$params;
+    
+    #Tag as Post or Get (ie. create new entry or edit existing one
+    my $is_new_record = ($c->req->method() eq 'POST');
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $dat_data{$key} = $value;
+    #}
 
-    if ($dat_datas{ntpstatus} eq 'enabled') {
+    # the value of trt will tell you which panel has returned   
+    if (! $trt){ 
+		$trt = $c->param('trt') || 'PARAMS'; #Indicates where to go now
+	}
+ 
+    # Now add in the params from the selected row from the table
+		
+    my %selectedrow;
+    
+		if ($trt eq 'PARAMS'){
+			#Validate Get selected row (if applicable)  PARAMS
+				%selectedrow = $c->get_selected_PARAMS($dat_data{'Selected'},$is_new_record);
+		}
+	
+ 
+	#Copy in the selected row params to the prefix_data hash to pass to the panel
+	while (my ($key, $value) = each %selectedrow){
+        $dat_data{$key} = $value;
+    }
+	# Where to go now
+	$dat_data{'trt'} = $trt;
+	
+	# Set up other shared data according to the panel to go to
+    
+		if ($trt eq 'PARAMS'){
+			# pickup any other contents needed and load them into hash shared with panel
+			my %returned_hash;
+			# subroutine returns a hash directly
+			%returned_hash = $c->get_data_for_panel_PARAMS();
+			# Copy each key-value pair from the returned hash to the prefix data hash
+			while (my ($key, $value) = each %returned_hash) {
+				$dat_data{$key} = $value;
+			}
+		}
+	
+	
+	# and table control fields
+     
+	
+	# Data for panel
+	$c->stash( 
+		title 			=> $title, 
+		modul => $modul,
+		dat_data  => \%dat_data
+	);
+	$c->render(template => "datetime");
+}  
 
-        # update ntpserver
-        $dat_datas{ntpserver} = $c->param('Ntpserver') || '';
-
-        if ($dat_datas{ntpserver} eq "pool.ntp.org") {
-            $result .= $c->l('dat_INVALID_NTP_ADDR');
-        } elsif ($dat_datas{ntpserver} =~ /^([a-zA-Z0-9\.\-]+)$/) {
-            $dat_datas{ntpserver} = $1;
-
-            #        } elsif ( $dat_datas{ntpserver} =~ /^\s*$/ ) {
-            #            $dat_datas{ntpserver} = "";
-        } else {
-            $result .= $c->l('dat_INVALID_NTP_ADDR');
-        }
-
-        if (!$result) {
-            $success = update_ntpserver($c, $dat_datas{ntpserver});
-        }
-    } else {
-
-        # set Locale time & clean ntpserver
-        #my $servername = ($c->param('ServerName') || 'WS');
-        if (!$result) {
-            $result = validate_change_datetime($c);
-
-            if ($result eq 'OK') {
-                $success = $c->l('dat_UPDATING_CLOCK');
-                $result  = '';
-                disable_ntp();
-                $success .= '<br>' . $c->l('dat_SERVER_DISABLED_DESC');
-            } ## end if ($result eq 'OK')
-        } ## end if (!$result)
-    } ## end else [ if ($dat_datas{ntpstatus...})]
-
-    if ($result) {
-        $c->stash(error => $result);
-        $c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
-        return $c->render('datetime');
-    } ## end if ($result)
-
-    #$result = $c->l('dat_SUCCESS');
-    my $message = "'Datetime' update DONE";
-    $c->app->log->info($message);
-    $c->flash(success => $success);
-    $c->redirect_to('/datetime');
-} ## end sub do_update
-
-sub validate_change_datetime {
+sub do_testntp {
     my $c = shift;
+    my $server = $c->req->json->{ntpserver} // '';
 
-    #--------------------------------------------------
-    # Untaint parameters and check for validity
-    #--------------------------------------------------
-    my $timezone = $c->param('Timezone');
-
-    if ($timezone =~ /^([\w\-]+\/?[\w\-+]*)$/) {
-        $timezone = $1;
-    } else {
-        $timezone = "US/Eastern";
-    }
-    my $month = $c->param('Month');
-
-    if ($month =~ /^(\d{1,2})$/) {
-        $month = $1;
-    } else {
-        $month = "1";
+    # Strict validation: hostname or IPv4
+    unless ($server =~ /^(?=.{1,253}$)([a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*|\d{1,3}(?:\.\d{1,3}){3})$/) {
+        return $c->render(json => { success => 0, error => 'Invalid server name or IP' });
     }
 
-    if (($month < 1) || ($month > 12)) {
-        return $c->l('dat_INVALID_MONTH') . " $month. " . $c->l('dat_MONTH_BETWEEN_1_AND_12');
-    }
-    my $day = $c->param('Day');
+    my $timeout = 5;
+    my @cmd = ('timeout', $timeout, 'ntpdate', '-q', $server);
 
-    if ($day =~ /^(\d{1,2})$/) {
-        $day = $1;
-    } else {
-        $day = "1";
+    # Run ntpdate and capture output
+    my $output = qx{@cmd 2>&1};
+    $c->app->log->info($output);
+    my $exit_code = $? >> 8;
+
+    # Parse for known errors
+    if ($exit_code == 124) {
+        return $c->render(json => { success => 0, error => "Timeout: NTP server did not respond within $timeout seconds" });
+    }
+    if ($output =~ /no server suitable for synchronization found/i) {
+        return $c->render(json => { success => 0, error => "No suitable NTP server found or server unreachable" });
+    }
+    if ($output =~ /Name or service not known|Temporary failure in name resolution/i) {
+        return $c->render(json => { success => 0, error => "DNS resolution failed for $server" });
+    }
+    if ($output =~ /ntpdig: no eligible servers/i) {
+        return $c->render(json => { success => 0, error => "Not a an NTP server" });
+    }
+    if ($output =~ /permission denied/i) {
+        return $c->render(json => { success => 0, error => "Permission denied running ntpdate" });
+    }
+    if ($exit_code != 0) {
+        return $c->render(json => { success => 0, error => "ntpdate failed (exit code $exit_code): $output" });
     }
 
-    if (($day < 1) || ($day > 31)) {
-        return $c->l('dat_INVALID_DAY') . " $day. " . $c->l('dat_BETWEEN_1_AND_31');
-    }
-    my $year = $c->param('Year');
+    # Extract date and time down to seconds from adjust line
+	my ($datetime) = $output =~ /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/m;
 
-    if ($year =~ /^(\d{4})$/) {
-        $year = $1;
-    } else {
-        $year = "2000";
-    }
+	if ($datetime) {
+		return $c->render(json => { success => 1, time => $datetime });
+	} else {
+		return $c->render(json => { success => 0, error => "Could not parse date/time from NTP server response." });}
+}
 
-    if (($year < 1900) || ($year > 2200)) {
-        return $c->l('dat_INVALID_YEAR') . " $year. " . $c->l('dat_FOUR_DIGIT_YEAR');
-    }
-    my $hour = $c->param('Hour');
-
-    if ($hour =~ /^(\d{1,2})$/) {
-        $hour = $1;
-    } else {
-        $hour = "12";
-    }
-
-    if (($hour < 1) || ($hour > 12)) {
-        return $c->l('dat_INVALID_HOUR') . " $hour. " . $c->l('dat_BETWEEN_1_AND_12');
-    }
-    my $minute = $c->param('Minute');
-
-    if ($minute =~ /^(\d{1,2})$/) {
-        $minute = $1;
-    } else {
-        $minute = "0";
-    }
-
-    if (($minute < 0) || ($minute > 59)) {
-        return $c->l('datINVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
-    }
-    my $second = $c->param('Second');
-
-    if ($second =~ /^(\d{1,2})$/) {
-        $second = $1;
-    } else {
-        $second = "0";
-    }
-
-    if (($second < 0) || ($second > 59)) {
-        return $c->l('dat_INVALID_SECOND') . " $second. " . $c->l('dat_BETWEEN_0_AND_59');
-    }
-    my $ampm = $c->param('Ampm');
-
-    if ($ampm =~ /^(AM|PM)$/) {
-        $ampm = $1;
-    } else {
-        $ampm = "AM";
-    }
-
-    # convert to 24 hour time
-    $hour = $hour % 12;
-
-    if ($ampm eq "PM") {
-        $hour = $hour + 12;
-    }
-
-    #--------------------------------------------------
-    # Store time zone in configuration database
-    #--------------------------------------------------
-    my $conf = esmith::ConfigDB->open();
-    my $old  = $conf->get('UnsavedChanges')->value;
-    my $rec  = $conf->get('TimeZone');
-
-    unless ($rec) {
-        $rec = $conf->new_record('TimeZone', undef);
-    }
-    $rec->set_value($timezone);
-    $conf->get('UnsavedChanges')->set_value($old);
-
-    #--------------------------------------------------
-    # Signal event to change time zone, system time
-    # and hardware clock
-    #--------------------------------------------------
-    my $newdate = sprintf "%02d%02d%02d%02d%04d.%02d", $month, $day, $hour, $minute, $year, $second;
-    esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timezone-update", $newdate);
-    return 'OK';
-} ## end sub validate_change_datetime
-
-sub update_ntpserver {
-    my $c         = shift;
-    my $ntpserver = shift;
-    my $msg;
-
-    #------------------------------------------------------------
-    # Looks good; go ahead and change the parameters.
-    #------------------------------------------------------------
-    my $old = $cdb->get('UnsavedChanges')->value;
-    my $rec = $cdb->get('ntpd');
-
-    if ($rec) {
-        $rec->set_prop('status',    'enabled');
-        $rec->set_prop('NTPServer', $ntpserver);
-    } else {
-        $rec = $cdb->new_record('ntpd',
-            { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => $ntpserver });
-    }
-    $cdb->get('UnsavedChanges')->set_value($old);
-    $msg = $c->l('dat_SETTINGS_CHANGED');
-
-    if ($ntpserver =~ /^\s*$/) {
-        $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
-        $rec->set_prop('NTPServer', '');
-        $msg = $c->l('dat_INVALID_NTP_SERVER') if ($rec->prop('SyncToHWClockSupported') || 'yes') ne 'yes';
-    } ## end if ($ntpserver =~ /^\s*$/)
-    esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timeserver-update");
-    return $msg;
-} ## end sub update_ntpserver
-
-sub disable_ntp {
-
-    # make sure that the parameters are set for disabled
-    my $old = $cdb->get('UnsavedChanges')->value;
-    my $rec = $cdb->get('ntpd');
-
-    if ($rec) {
-        $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
-        $rec->set_prop('NTPServer', '');
-    } else {
-        $rec = $cdb->new_record('ntpd',
-            { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => '' });
-    }
-    $cdb->get('UnsavedChanges')->set_value($old);
-} ## end sub disable_ntp
-
-sub getTimezone {
-
-    #--------------------------------------------------
-    # Figure out time zone by looking first looking at
-    # the configuration database value of TimeZone.
-    # If that is not defined, try and get it from /etc/localtime.
-    # If that doesn't work, default to US/Eastern.
-    #--------------------------------------------------
-    my $localtime;
-    my $timezonedefault = "US/Eastern";
-
-    if (defined $cdb->get('TimeZone')) {
-        $timezonedefault = $cdb->get('TimeZone')->value;
-    } else {
-
-        if (defined($localtime = readlink '/etc/localtime')) {
-            my $pos = index $localtime, 'zoneinfo/';
-
-            if ($pos > -1) {
-                $timezonedefault = substr $localtime, ($pos + 9);
-            }
-        } ## end if (defined($localtime...))
-    } ## end else [ if (defined $cdb->get(...))]
-    return $timezonedefault;
-} ## end sub getTimezone
-
-sub getZone_list {
-    my $c = shift;
-
-    #--------------------------------------------------
-    # Get a sorted list of time zones
-    #--------------------------------------------------
-    $ENV{BASH_ENV} = '';
-
-    if (!open(ZONES, "cd /usr/share/zoneinfo; /usr/bin/find . -type f -or -type l | /bin/grep '^./[A-Z]' |")) {
-        warn($c->l('COULD_NOT_OPEN_TZ_FILE') . $! . '.');
-        return undef;
-    }
-    my $zone;
-    my @zones = ();
-
-    while (defined($zone = <ZONES>)) {
-        chop($zone);
-        $zone =~ s/^.\///;
-        push @zones, $zone;
-    } ## end while (defined($zone = <ZONES>...))
-    close ZONES;
-    my @zt = sort @zones;
-    return \@zt;
-} ## end sub getZone_list
-
-sub getMonth_list {
-    my $c = shift;
-    return [
-        [ $c->l('dat_JANUARY')   => '1' ],
-        [ $c->l('dat_FEBRUARY')  => '2' ],
-        [ $c->l('dat_MARCH')     => '3' ],
-        [ $c->l('dat_APRIL')     => '4' ],
-        [ $c->l('dat_MAY')       => '5' ],
-        [ $c->l('dat_JUNE')      => '6' ],
-        [ $c->l('dat_JULY')      => '7' ],
-        [ $c->l('dat_AUGUST')    => '8' ],
-        [ $c->l('dat_SEPTEMBER') => '9' ],
-        [ $c->l('dat_OCTOBER')   => '10' ],
-        [ $c->l('dat_NOVEMBER')  => '11' ],
-        [ $c->l('dat_DECEMBER')  => '12' ]
-    ];
-} ## end sub getMonth_list
-1;
+1;

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Directory;
 #----------------------------------------------------------------------
 # heading     : User management
 # description : Directory
-# navigation  : 2000 300
+# navigation  : 2000 400
 #
 # routes : end
 #----------------------------------------------------------------------
@@ -12,13 +12,16 @@ use warnings;
 use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use SrvMngr qw(theme_list init_session);
 
-our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
+our $db; 
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
     my %dir_datas = ();
     my $title     = $c->l('dir_FORM_TITLE');
     my $modul     = $c->render_to_string(inline => $c->l('dir_DESCRIPTION'));
@@ -36,6 +39,7 @@ sub main {
 sub do_update {
     my $c = shift;
     $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
     my $access      = $c->param('access');
     my $department  = $c->param('department');
     my $company     = $c->param('company');
@@ -52,7 +56,7 @@ sub do_update {
     $db->get('ldap')->set_prop('defaultPhoneNumber', $phonenumber);
 
     if ($existing eq 'update') {
-        my $ac = esmith::AccountsDB->open() || die "Couldn't open accounts db";
+        my $ac = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
         my @users = $ac->users();
 
         foreach my $user (@users) {
@@ -81,7 +85,7 @@ sub get_ldap_base {
 sub get_value {
     my $fm = shift;
     my $item = shift;
-
+    $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
     my $record = $db->get($item);
     if ($record) {
         return $record->value();
@@ -90,4 +94,4 @@ sub get_value {
         return '';
     }
 }
-1;
+1;

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

@@ -13,16 +13,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::DomainsDB::UTF8;
+use esmith::AccountsDB::UTF8;
 
-#use Data::Dumper;
-#use esmith::FormMagick::Panel::domains;
-use esmith::DomainsDB;
-use esmith::AccountsDB;
-
-#use URI::Escape;
-my ($ddb,$cdb,$adb);
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+our ($ddb,$cdb,$adb);
 our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
 
 sub main {
@@ -30,9 +24,9 @@ sub main {
     $c->app->log->info($c->log_req);
     my %dom_datas = ();
     my $title     = $c->l('dom_FORM_TITLE');
-	$ddb = esmith::DomainsDB->open  || die "Couldn't open domains db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $dom_datas{trt} = 'LST';
     my @domains;
 
@@ -57,9 +51,9 @@ sub do_display {
     my $rt     = $c->current_route;
     my $trt    = $c->param('trt');
     my $domain = $c->param('Domain') || '';
-	$ddb = esmith::DomainsDB->open  || die "Couldn't open domains db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 
     #$trt = 'DEL' if ( $rt eq 'domaindel1' );
     #$trt = 'UPD' if ( $rt eq 'domainupd1' );
@@ -127,9 +121,9 @@ sub do_update {
     $c->app->log->info($c->log_req);
     my $rt        = $c->current_route;
     my $trt       = $c->param('trt');
-	$ddb = esmith::DomainsDB->open  || die "Couldn't open domains db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     my %dom_datas = ();
     my ($res, $result) = '';
 
@@ -246,6 +240,7 @@ sub create_modify_domain {
                 . ' Ctl'
         );
     } ## end unless ($domain)
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
     my $rec = $ddb->get($domain);
 
     if ($rec and $action eq 'create') {
@@ -375,6 +370,7 @@ sub nameserver_options_list {
 
 sub get_nameserver_value {
     my $c = shift;
+    $ddb = esmith::DomainsDB::UTF8->open  || die "Couldn't open domains db";
     my $domain = $c->param('Domain') || undef;
     return ($ddb->get_prop($domain, 'Nameservers') || 'internet');
 } ## end sub get_nameserver_value

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

@@ -14,21 +14,18 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::AccountsDB::UTF8;
+use esmith::ConfigDB::UTF8;
 
-#use Data::Dumper;
-#use esmith::FormMagick::Panel::groups;
-use esmith::AccountsDB;
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-my ($cdb,$adb);
+our ($cdb,$adb);
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
     my %grp_datas = ();
     my $title     = $c->l('grp_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $grp_datas{trt} = 'LST';
     my @groups;
 
@@ -47,8 +44,8 @@ sub do_display {
     my $group     = $c->param('group');
     my %grp_datas = ();
     my $title     = $c->l('grp_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $grp_datas{'trt'} = $trt;
 
     if ($trt eq 'ADD') {
@@ -104,8 +101,8 @@ sub do_update {
     my $title     = $c->l('grp_FORM_TITLE');
     my ($res, $result) = '';
     my %grp_datas = ();
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $grp_datas{'trt'}   = $trt;
     $grp_datas{'group'} = $groupName;
     my @members = ();

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

@@ -14,22 +14,14 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-
-#use Data::Dumper;
-#use esmith::FormMagick::Panel::hostentries;
-use esmith::DomainsDB;
-use esmith::AccountsDB;
-use esmith::HostsDB;
-use esmith::NetworksDB;
 use HTML::Entities;
 use Net::IPv4Addr qw(ipv4_in_network);
+use esmith::DomainsDB::UTF8;
+use esmith::ConfigDB::UTF8;
+use esmith::HostsDB::UTF8;
+use esmith::NetworksDB::UTF8;
 
-#use URI::Escape;
-#our $ddb = esmith::DomainsDB->open  || die "Couldn't open hostentries db";
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-#our $ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
-my ($ddb,$cdb,$hdb,$ndb);
+our ($ddb,$cdb,$hdb,$ndb);
 
 sub main {
     my $c = shift;
@@ -37,10 +29,9 @@ sub main {
     my %hos_datas = ();
     my $title     = $c->l('hos_FORM_TITLE');
     my $notif     = '';
-	#my $ddb = esmith::DomainsDB->open  || die "Couldn't open hostentries db";
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-	$ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $hdb = esmith::HostsDB::UTF8->open    || die "Couldn't open hosts db";
+    $ndb = esmith::NetworksDB::UTF8->open || die "Couldn't open networks db";
     $hos_datas{trt} = 'LIST';
     my %dom_hosts = ();
 
@@ -73,9 +64,9 @@ sub do_display {
     $trt = 'LST' if ($trt ne 'DEL' && $trt ne 'UPD' && $trt ne 'ADD');
     my %hos_datas = ();
     my $title     = $c->l('hos_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-	$ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $hdb = esmith::HostsDB::UTF8->open    || die "Couldn't open hosts db";
+    $ndb = esmith::NetworksDB::UTF8->open || die "Couldn't open networks db";
     my $notif     = '';
     $hos_datas{'trt'} = $trt;
 
@@ -120,9 +111,9 @@ sub do_update {
     my $trt       = ($c->param('trt') || 'LIST');
     my %hos_datas = ();
     my $title     = $c->l('hos_FORM_TITLE');
-	$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$hdb = esmith::HostsDB->open    || die "Couldn't open hosts db";
-	$ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
+    $cdb = esmith::ConfigDB::UTF8->open   || die "Couldn't open configuration db";
+    $hdb = esmith::HostsDB::UTF8->open    || die "Couldn't open hosts db";
+    $ndb = esmith::NetworksDB::UTF8->open || die "Couldn't open networks db";
     my $notif     = '';
     my $result    = '';
     $hos_datas{'name'}       = lc $c->param('Name');
@@ -379,10 +370,10 @@ sub delete_hostentry {
 } ## end sub delete_hostentry
 
 sub domains_list {
-    my $d = esmith::DomainsDB->open_ro() or die "Couldn't open DomainsDB";
+    $ddb = esmith::DomainsDB::UTF8->open_ro() or die "Couldn't open DomainsDB";
     my @domains;
 
-    for ($d->domains) {
+    for ($ddb->domains) {
         my $ns = $_->prop("Nameservers") || 'localhost';
         push @domains, $_->key if ($ns eq 'localhost');
     }
@@ -516,7 +507,7 @@ sub must_be_local {
     my $localip = shift;
 
     # Make sure that the IP is indeed local.
-    #my $ndb = esmith::NetworksDB->open_ro;
+    #$ndb = esmith::NetworksDB::UTF8->open_ro;
     my @local_list = $ndb->local_access_spec;
 
     foreach my $spec (@local_list) {

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

@@ -2,7 +2,7 @@ package SrvMngr::Controller::Ibays;
 
 #----------------------------------------------------------------------
 # heading     : Network
-# description : Shared areas (was ibays)
+# description : Ibays
 # navigation  : 6000 100
 #
 #
@@ -14,12 +14,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw( theme_list init_session validate_password );
-use esmith::AccountsDB;
-use esmith::ConfigDB;
-use esmith::DomainsDB;
+use esmith::AccountsDB::UTF8;
+use esmith::ConfigDB::UTF8;
+use esmith::DomainsDB::UTF8;
 
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-#our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
 my ($adb,$cdb);
 
 sub main {
@@ -27,9 +25,9 @@ sub main {
     $c->app->log->info($c->log_req);
     my %iba_datas = ();
     my $title     = $c->l('iba_FORM_TITLE');
-    $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$iba_datas{'trt'} = 'LIST';
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+    $iba_datas{'trt'} = 'LIST';
     my @ibays;
 
     if ($adb) {
@@ -44,8 +42,8 @@ sub do_display {
     my $rt   = $c->current_route;
     my $trt  = ($c->param('trt') || 'LIST');
     my $ibay = $c->param('ibay') || '';
-    $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
 
     #$trt = 'DEL' if ( $ibay );
     #$trt = 'ADD' if ( $rt eq 'ibayadd' );
@@ -99,7 +97,7 @@ sub do_display {
 
     if ($trt eq 'LIST') {
         my @ibays;
-        $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+        $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 
         if ($adb) {
             @ibays = $adb->ibays();
@@ -120,8 +118,8 @@ sub do_update {
     $iba_datas{'trt'} = $trt;
     my $result = '';
     my $res;
-    $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
 
     if ($trt eq 'ADD') {
         my $name = ($c->param('ibay') || '');
@@ -306,7 +304,7 @@ sub print_vhost_message {
     my $c              = shift;
     my $name           = $c->param('ibay');
     my $result         = '';
-    my $domaindb       = esmith::DomainsDB->open();
+    my $domaindb       = esmith::DomainsDB::UTF8->open();
     my @domains        = $domaindb->get_all_by_prop(Content => $name);
     my $vhostListItems = join "\n", (map ($_->key . " " . $_->prop('Description'), @domains));
 
@@ -328,7 +326,7 @@ sub remove_ibay {
     if (my $acct = $adb->get($name)) {
         if ($acct->prop('type') eq 'ibay') {
             $acct->set_prop('type', 'ibay-deleted');
-            my $domains_db = esmith::DomainsDB->open();
+            my $domains_db = esmith::DomainsDB::UTF8->open();
             my @domains = $domains_db->get_all_by_prop(Content => $name);
 
             foreach my $d (@domains) {

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

@@ -5,6 +5,12 @@ package SrvMngr::Controller::Localnetworks;
 # description : Local networks
 # navigation  : 6000 500
 #
+#$if_admin->get('/localnetworks')->to('localnetworks#main')->name('localnetworks');
+#$if_admin->post('/localnetworks')->to('localnetworks#do_display')->name('localnetworks');
+#$if_admin->post('/localnetworksa')->to('localnetworks#do_display')->name('localnetworksadd');
+#$if_admin->post('/localnetworksb')->to('localnetworks#do_display')->name('localnetworksadd1');
+#$if_admin->get('/localnetworksd')->to('localnetworks#do_display')->name('localnetworksdel');
+#$if_admin->post('/localnetworkse')->to('localnetworks#do_display')->name('localnetworksdel1');
 # routes : end
 #----------------------------------------------------------------------
 use strict;
@@ -13,13 +19,12 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session subnet_mask get_reg_mask ip_number);
-
-#use Data::Dumper;
 use esmith::util;
-use esmith::HostsDB;
-#my $network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
+use esmith::HostsDB::UTF8;
+use esmith::NetworksDB::UTF8;
+use esmith::ConfigDB::UTF8;
 my $ret = "OK";
-my ($network_db);
+our ($network_db,$config_db);
 
 sub main {
     my $c = shift;
@@ -27,7 +32,7 @@ sub main {
     my %ln_datas = ();
     $ln_datas{return} = "";
     my $title = $c->l('ln_LOCAL NETWORKS');
-	$network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
+    $network_db = esmith::NetworksDB::UTF8->open() || die("Couldn't open networks db");
     my $modul = '';
     $ln_datas{trt} = 'LIST';
     my @localnetworks;
@@ -49,11 +54,12 @@ sub do_display {
     $c->app->log->info($c->log_req);
     my $rt = $c->current_route;
     my $trt = ($c->param('trt') || 'LIST');
-	$network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
+    $network_db = esmith::NetworksDB::UTF8->open() || die("Couldn't open networks db");
     $trt = 'DEL'  if ($rt eq 'localnetworksdel');
     $trt = 'ADD'  if ($rt eq 'localnetworksadd');
     $trt = 'ADD1' if ($rt eq 'localnetworksadd1');
     $trt = 'DEL1' if ($rt eq 'localnetworksdel1');
+    $c->app->log->info("Localnetworks:trt:$trt");
     my %ln_datas = ();
     my $title    = $c->l('ln_LOCAL NETWORKS');
     my $modul    = '';
@@ -68,32 +74,37 @@ sub do_display {
 
         #Add a network - called after new network details filled in
         my %ret = add_network($c);
+        $network_db   = esmith::NetworksDB::UTF8->open();
 
         #Return to list page if success
         if ((index($ret{ret}, "SUCCESS") != -1)) {
             $trt = "LIST";
         } else {
-
             #Error - return to Add page
             $trt = "ADD";
         }
-        $network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-3");    #Refresh the network DB
+	#$network_db = esmith::NetworksDB::UTF8->open() || die("Failed to open Networkdb-3");    #Refresh the network DB
         $c->stash(ret => \%ret);    #stash it away for the template
     } ## end if ($trt eq 'ADD1')
 
     if ($trt eq 'DEL1') {
 
         #After Remove clicked on Delete network panel
-        $network_db   = esmith::NetworksDB->open() || die("Failed to open Networkdb-1");
+		#$network_db   = esmith::NetworksDB::UTF8->open() || die("Failed to open Networkdb-1");
         my $localnetwork = $c->param("localnetwork");
-        my $delete_hosts = $c->param("deletehost") || "1";                                    #default to deleting them.
-        my $rec = $network_db->get($localnetwork) || die("Failed to find network on db:$localnetwork");
-
-        if ($rec and $rec->prop('type') eq 'localnetwork') {
-            $ln_datas{localnetwork} = $localnetwork;
-        }
-        my %ret = remove_network($localnetwork, $delete_hosts);
-        $network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-2");        #Refresh the network DB
+        my $delete_hosts = $c->param("deletehost") || "1"; #default to deleting them.
+        $c->app->log->info("Localnetworks:deleting $localnetwork");
+        my ($rec,%ret);
+        if ($rec = $network_db->get($localnetwork)){  #|| die("Failed to find network on db:$localnetwork");
+			if ($rec and $rec->prop('type') eq 'localnetwork') {
+				$ln_datas{localnetwork} = $localnetwork;
+			}
+			%ret = $c->remove_network($localnetwork, $delete_hosts);
+		} else {
+			$c->app->log->info("Local network: delete failed to find network in db: $localnetwork");
+			%ret = (ret => "");
+		}
+		#$network_db = esmith::NetworksDB::UTF8->open() || die("Failed to open Networkdb-2");        #Refresh the network DB
         my @localnetworks;
 
         if ($network_db) {
@@ -101,8 +112,10 @@ sub do_display {
         }
 
         # Load up ln_datas with values need by template
-        $ln_datas{subnet} = $rec->prop('Mask');
-        $ln_datas{router} = $rec->prop('Router');
+        if ($rec){
+			$ln_datas{subnet} = $rec->prop('Mask');
+			$ln_datas{router} = $rec->prop('Router');
+		}
         $c->stash(ln_datas => \%ln_datas, localnetworks => \@localnetworks, ret => \%ret);
     } ## end if ($trt eq 'DEL1')
 
@@ -110,14 +123,20 @@ sub do_display {
 
         #Initial delete panel requiring confirmation
         my $localnetwork = $c->param("localnetwork") || '';
+        my ($rec,%ret);
         $c->stash(localnetwork => $localnetwork);
-        my $rec = $network_db->get($localnetwork) || die("Failed to get local network in db::$localnetwork");
-        my $subnet = $rec->prop('Mask');
-        $ln_datas{subnet} = $subnet;
-        $ln_datas{router} = $rec->prop('Router');
-        my $numhosts = hosts_on_network($localnetwork, $subnet);
-        $ln_datas{localnetwork} = $localnetwork;
-        $ln_datas{deletehosts} = $numhosts > 0 ? 1 : 0;
+        if ($rec = $network_db->get($localnetwork)){
+			my $subnet = $rec->prop('Mask');
+			$ln_datas{subnet} = $subnet;
+			$ln_datas{router} = $rec->prop('Router');
+			my $numhosts =$c->hosts_on_network($localnetwork, $subnet);
+			$ln_datas{localnetwork} = $localnetwork;
+			$ln_datas{deletehosts} = $numhosts > 0 ? 1 : 0;
+		} else {
+			$c->app->log->info("Local network:Initial Failed to find network in Db: $localnetwork");
+			$c->flash('error',$c->l('ln_Failed to find network in Db'));		
+			$trt = 'LIST';
+		}
     } ## end if ($trt eq 'DEL')
 
     if ($trt eq 'LIST') {
@@ -137,8 +156,9 @@ sub do_display {
 } ## end sub do_display
 
 sub remove_network {
+	my $c = shift;
     my $network      = shift;
-    $network_db   = esmith::NetworksDB->open();
+    $network_db   = esmith::NetworksDB::UTF8->open();
     my $record       = $network_db->get($network);
     my $delete_hosts = shift;
 
@@ -153,7 +173,7 @@ sub remove_network {
 
         if (system("/sbin/e-smith/signal-event", "network-delete", $network) == 0) {
             if ($delete_hosts) {
-                my @hosts_to_delete = hosts_on_network($network, $subnet);
+                my @hosts_to_delete = $c->hosts_on_network($network, $subnet);
 
                 foreach my $host (@hosts_to_delete) {
                     $host->delete;
@@ -170,11 +190,12 @@ sub remove_network {
 } ## end sub remove_network
 
 sub hosts_on_network {
+	my $c = shift;
     my $network = shift;
     my $netmask = shift;
     die if not $network and $netmask;
     my $cidr             = "$network/$netmask";
-    my $hosts            = esmith::HostsDB->open() || die("Couldn't open hosts db");
+    my $hosts            = esmith::HostsDB::UTF8->open() || die("Couldn't open hosts db");
     my @localhosts       = grep { $_->prop('HostType') eq 'Local' } $hosts->hosts;
     my @hosts_on_network = ();
 
@@ -192,24 +213,27 @@ sub hosts_on_network {
 } ## end sub hosts_on_network
 
 sub add_network {
-    my ($fm)           = @_;
-    my $networkAddress = $fm->param('networkAddress');
-    my $networkMask    = $fm->param('networkMask');
-    my $networkRouter  = $fm->param('networkRouter');
+    my ($c)           = @_;
+    my $networkAddress = $c->param('networkAddress');
+    my $networkMask    = $c->param('networkMask');
+    my $networkRouter  = $c->param('networkRouter');
+    
+    #Start by checking that the network does not already exist
+    
 
     #Validate Ips and subnet mask
-    my $res = ip_number($fm, $networkAddress);
+    my $res = ip_number($c, $networkAddress);
     return (ret => 'ln_INVALID_IP_ADDRESS', vars => "Network Address $res") unless $res eq 'OK';
     $res = subnet_mask($networkMask);
     return (ret => 'ln_INVALID_SUBNET_MASK', vars => "$networkMask") unless $res eq 'OK';
-    $res = ip_number($fm, $networkRouter);
+    $res = ip_number($c, $networkRouter);
     return (ret => 'ln_INVALID_IP_ADDRESS', vars => "Routeur Address $res") unless $res eq 'OK';
 
     # we transform bit mask to regular mask
     $networkMask = get_reg_mask($networkAddress, $networkMask);
-    my $network_db = esmith::NetworksDB->open()
-        || esmith::NetworksDB->create();
-    my $config_db    = esmith::ConfigDB->open();
+    my $network_db = esmith::NetworksDB::UTF8->open()
+        || esmith::NetworksDB::UTF8->create();
+    my $config_db    = esmith::ConfigDB::UTF8->open();
     my $localIP      = $config_db->get('LocalIP');
     my $localNetmask = $config_db->get('LocalNetmask');
     my ($localNetwork, $localBroadcast)
@@ -222,31 +246,38 @@ sub add_network {
     # in the form itself, but it just seemed too fiddly to do that
     # at the moment.  -- Skud 2002-04-11
     # I agree --bjr 2020-04-18
-    if ($routerNetwork ne $localNetwork) {
-        return (ret => 'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK');
-    }
     my ($network, $broadcast) = esmith::util::computeNetworkAndBroadcast($networkAddress, $networkMask);
 
+    if ($routerNetwork ne $localNetwork) {
+        return (ret => 'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK', vars => "$network,$networkMask,$networkRouter");
+    }
+
     if ($network eq $localNetwork) {
-        return (ret => 'ln_NETWORK_ALREADY_LOCAL');
+        return (ret => 'ln_NETWORK_ALREADY_LOCAL', vars => "$network,$networkMask,$networkRouter");
     }
 
     if ($network_db->get($network)) {
-        return (ret => 'ln_NETWORK_ALREADY_ADDED');
+        return (ret => 'ln_NETWORK_ALREADY_ADDED', vars => "$network,$networkMask,$networkRouter");
     }
-    $network_db->new_record(
+    $res = $network_db->new_record(
         $network,
         {   Mask   => $networkMask,
             Router => $networkRouter,
             type   => 'network',
         }
     );
-
-    # Untaint $network before use in system()
-    $network =~ /(.+)/;
-    $network = $1;
-    system("/sbin/e-smith/signal-event", "network-create", $network) == 0
-        or (return (ret => 'ln_ERROR_CREATING_NETWORK'));
+    if (! $res) {
+		#Record already existed
+		$c->app->log->info("Local Network:Network already exists:$network");
+		#return success message 
+	} else {
+		#Only call underlying batch if new record created
+		# Untaint $network before use in system()
+		$network =~ /(.+)/;
+		$network = $1;
+		system("/sbin/e-smith/signal-event", "network-create", $network) == 0
+			or (return (ret => 'ln_ERROR_CREATING_NETWORK', vars => "$network,$networkMask,$networkRouter"));
+	}
     my ($totalHosts, $firstAddr, $lastAddr) = esmith::util::computeHostRange($network, $networkMask);
     my $msg;
 
@@ -268,4 +299,4 @@ sub add_network {
         );
     } ## end else [ if ($totalHosts == 1) ]
 } ## end sub add_network
-1;
+1;

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Login;
 #----------------------------------------------------------------------
 # heading     : Support
 # description : Login
-# navigation  : 0000 001
+# navigation  : 0 200
 # menu        : N
 #
 # routes : end
@@ -18,7 +18,7 @@ use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
-use esmith::AccountsDB;
+use esmith::AccountsDB::UTF8;
 use SrvMngr::I18N;
 use SrvMngr::Model::Main;
 use SrvMngr qw( theme_list init_session );
@@ -26,7 +26,7 @@ my $MAX_LOGIN_ATTEMPTS   = 3;
 my $DURATION_BLOCKED     = 30 * 60;        # access blocked for 30 min
 my $TIMEOUT_FAILED_LOGIN = 1;
 my $RESET_DURATION       = 2 * 60 * 60;    # 2 hours for resetting
-our $adb = esmith::AccountsDB->open() or die "Couldn't open DB Accounts\n";
+our $adb;
 my $allowed_user_re = qr/^\w{5,10}$/;
 my %Login_Attempts;
 
@@ -39,6 +39,7 @@ sub main {
 sub login {
     my $c   = shift;
     my $trt = $c->param('Trt');
+    $adb = esmith::AccountsDB::UTF8->open() or die "Couldn't open DB Accounts\n";
 
     # password reset request
     if ($trt eq 'RESET') {
@@ -85,13 +86,13 @@ sub login {
         $c->session(logged_in => 1);        # set the logged_in flag
         $c->session(username  => $name);    # keep a copy of the username
 
-        #    if ( $name eq 'admin' || $adb->is_user_in_group($name, 'AdmiN') )  # for futur use
+        #    if ( $name eq 'admin' || $adb->is_user_in_group($name, 'Admin') )  # for futur use
         if ($name eq 'admin') {
             $c->session(is_admin => 1);
         } else {
             $c->session(is_admin => 0);
         }
-        $c->session(expiration => 600);     # expire this session in 10 minutes
+        $c->session(expiration => $c->config->{timeout} );     # expire this session in the time set  in config
         $c->flash(success => $c->l('use_WELCOME'));
         record_login_attempt($c, 'SUCCESS');
     } else {
@@ -114,6 +115,7 @@ sub mail_rescue {
     my $c    = shift;
     my $name = $c->param('Username');
     my $from = $c->param('From');
+    $adb = esmith::AccountsDB::UTF8->open() or die "Couldn't open DB Accounts\n";
     my $res;
     $res .= $c->l('use_TOO_MANY_LOGIN') if (is_denied($c));
 

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

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

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Manual;
 #----------------------------------------------------------------------
 # heading     : Support
 # description : Online manual
-# navigation  : 0000 100
+# navigation  : 0 300
 # menu        : N
 #
 # routes : end

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

@@ -13,14 +13,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-
 #use Regexp::Common qw /net/;
-#use Data::Dumper;
 use esmith::util;
-use esmith::HostsDB;
-#our $db = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
-#our $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
-#our $udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+use esmith::ConfigDB::UTF8; 
+
 my ($cdb,$tcp_db,$udp_db);
 
 my %ret = ();
@@ -34,9 +30,9 @@ sub main {
     $pf_datas{return} = "";
     my $title = $c->l('pf_FORM_TITLE');
     my $modul = '';
-	$cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
-	$tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
-	$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+    $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
+    $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+    $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
     $pf_datas{trt} = 'LIST';
     my @tcpforwards = $tcp_db->get_all;
     my @udpforwards = $udp_db->get_all;
@@ -57,9 +53,9 @@ sub do_display {
     $c->app->log->info($c->log_req);
     my $rt = $c->current_route;
     my $trt = ($c->param('trt') || 'LIST');
-	my $cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
-	my $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
-	my $udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+    my $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
+    my $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+    my $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
     $trt = 'DEL'  if ($rt eq 'portforwardingdel');
     $trt = 'ADD'  if ($rt eq 'portforwardingadd');
     $trt = 'ADD1' if ($rt eq 'portforwardingadd1');
@@ -142,6 +138,10 @@ sub do_display {
     if ($trt eq 'LIST') {
 
         #List all the port forwards
+        # Open them again as maybe written to above 
+        $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+        $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+
         my @tcpforwards = $tcp_db->get_all;
         my @udpforwards = $udp_db->get_all;
         my $empty       = 1 if not @tcpforwards and not @udpforwards;
@@ -168,10 +168,10 @@ sub add_portforward {
     my $fdb;
 
     if ($proto eq 'TCP') {
-        $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
+        $tcp_db = esmith::ConfigDB::UTF8->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
         $fdb = $tcp_db;
     } else {
-        $udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
+        $udp_db = esmith::ConfigDB::UTF8->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
         $fdb = $udp_db;
     }
 
@@ -211,6 +211,7 @@ sub add_portforward {
 
 sub get_destination_host {
     my $q           = shift;
+    $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
     my $dhost       = $q->param("dhost");
     my $localip     = $cdb->get_prop('InternalInterface', 'IPAddress');
     my $external_ip = $cdb->get_prop('ExternalInterface', 'IPAddress') || $localip;
@@ -357,6 +358,7 @@ sub isValidPort() {
 
 sub validate_destination_host {
     my $c     = shift;
+    $cdb = esmith::ConfigDB::UTF8->open || die "Can't open configuration database: $!\n";
     my $dhost = $c->param('dhost');
     $dhost =~ s/^\s+|\s+$//g;
     my $localip = $cdb->get_prop('InternalInterface', 'IPAddress');

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

@@ -14,15 +14,15 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-my $adb;
+use esmith::AccountsDB::UTF8;
+our $adb;
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
     my %prt_datas = ();
     my $title     = $c->l('prt_FORM_TITLE');
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $prt_datas{'trt'} = 'LIST';
     my @printerDrivers;
 
@@ -38,7 +38,7 @@ sub do_display {
     my $rt      = $c->current_route;
     my $trt     = ($c->param('trt') || 'LIST');
     my $printer = $c->param('printer') || '';
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 
     #$trt = 'DEL' if ( $printer );
     #$trt = 'ADD' if ( $rt eq 'printeradd' );
@@ -79,7 +79,7 @@ sub do_update {
     my $trt       = ($c->param('trt') || 'LIST');
     my %prt_datas = ();
     my $title     = $c->l('prt_FORM_TITLE');
-   	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $prt_datas{'trt'} = $trt;
     my ($res, $result) = '';
 

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Proxy;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Proxy settings
-# navigation  : 4000 710
+# navigation  : 4000 200
 #----------------------------------------------------------------------
 #
 # routes : end
@@ -14,11 +14,14 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-our $db = esmith::ConfigDB->open || die "Couldn't open config db";
+use esmith::ConfigDB::UTF8;
+
+our $db;
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
     my %prx_datas = ();
     my $title     = $c->l('prx_TITLE');
     my $modul     = $c->render_to_string(inline => $c->l('prx_FIRST_PAGE_DESCRIPTION'));
@@ -40,6 +43,7 @@ sub do_update {
     my $http_proxy_status = $c->param('http_proxy_status') || 'disabled';
     my $smtp_proxy_status = $c->param('smtp_proxy_status') || '';
     my $result            = "";
+    $db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
     my $squid = $db->get('squid') or $result = $c->l('prx_ERR_NO_SQUID_REC');
 
     # smtpd is allowed to not exist, as the relevant packages may not be
@@ -51,10 +55,10 @@ sub do_update {
     # Update the system
     #
     system("/sbin/e-smith/signal-event proxy-update") == 0
-        or $result = $c->l('prx_ERR_PROXY_UPDATE_FAILED');
+        or $result = $c->l('prx_ERR_PROXY_UPDATE_FAILED');  
     my $title = $c->l('prx_TITLE');
     if ($result eq '') { $result = $c->l('prx_SUCCESS'); }
     $c->stash(title => $title, modul => $result);
     $c->render(template => 'module');
 } ## end sub do_update
-1;
+1;

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Pseudonyms;
 #----------------------------------------------------------------------
 # heading     : User management
 # description : Pseudonyms
-# navigation  : 2000 210
+# navigation  : 2000 300
 #----------------------------------------------------------------------
 #
 # routes : end
@@ -14,15 +14,10 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::AccountsDB::UTF8;
+use esmith::DomainsDB::UTF8;
 
-#use Data::Dumper;
-#use esmith::FormMagick::Panel::pseudonyms;
-use esmith::AccountsDB;
-
-#use URI::Escape;
-#our $cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-my ($cdb,$adb);
+our ($cdb,$adb);
 
 sub main {
     my $c = shift;
@@ -32,8 +27,7 @@ sub main {
     my $notif     = '';
     $pse_datas{trt} = 'LST';
     my @pseudonyms;
-	#$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 
     if ($adb) {
         @pseudonyms = $adb->pseudonyms();
@@ -50,8 +44,7 @@ sub do_display {
     my $pseudonym = $c->param('pseudonym') || '';
     my $title     = $c->l('pse_FORM_TITLE');
     my %pse_datas = ();
- 	#$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 	$pse_datas{'trt'} = $trt;
 
     if ($trt eq 'ADD') {
@@ -97,8 +90,7 @@ sub do_update {
     my $rt        = $c->current_route;
     my $trt       = ($c->param('trt') || 'LST');
     my $title     = $c->l('pse_FORM_TITLE');
-   	#$cdb = esmith::ConfigDB->open   || die "Couldn't open configuration db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     my %pse_datas = ();
     $pse_datas{'trt'} = $trt;
     my ($res, $result) = '';
@@ -331,8 +323,7 @@ sub validate_new_pseudonym_name {
     if (defined $acct) {
         return ($c->l('pse_NAME_IN_USE'));
     } elsif ($pseudonym =~ /@/) {
-        use esmith::DomainsDB;
-        my $ddb = esmith::DomainsDB->open_ro
+        my $ddb = esmith::DomainsDB::UTF8->open_ro
             or die "Couldn't open DomainsDB\n";
         my ($lhs, $rhs) = split /@/, $pseudonym;
         return ($c->l('pse_PSEUDONYM_INVALID_DOMAIN')) unless ($ddb->get($rhs));

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

@@ -14,6 +14,9 @@ use SrvMngr qw(gen_locale_date_string);
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use List::Util qw(sum); 
+
+#use Mail::Log::Trace::Postfix;
 
 sub main {
     my $c = shift;
@@ -48,44 +51,66 @@ sub generateReport {
     my $c           = shift;
     my $report_type = shift;
     my $out         = '';
-
     #------------------------------------------------------------
-    # Looks good; go ahead and generate the report.
+    # Go ahead and generate the report.
     #------------------------------------------------------------
-    #	$| = 1;
     my $now_string = $c->gen_locale_date_string();
+    my $log_path = '/var/log/maillog';
     $out .= sprintf("<h3>%s %s </h3>", $c->l('REPORT_GENERATED'), $now_string);
-
-    if ($report_type =~ /^qmail-q/) {
-        open(QMAILQUEUEREPORT, "/var/qmail/bin/$report_type |");
-        $out .= sprintf "<pre>";
-
-        while (<QMAILQUEUEREPORT>) {
-            $out .= sprintf("%s", $_);
-        }
-        close QMAILQUEUEREPORT;
-        $out .= sprintf "</pre>";
-        $out .= sprintf("<h3>%s</h3>", $c->l('END_OF_REPORT'));
-        return '';
-    } ## end if ($report_type =~ /^qmail-q/)
-    chdir "/var/log/qmail";
-    open(QMAILANALOG,
-              "/bin/cat \@* current 2>/dev/null"
-            . "| /usr/local/bin/tai64nunix"
-            . "| /usr/local/qmailanalog/bin/matchup 5>/dev/null"
-            . "| /usr/local/qmailanalog/bin/$report_type |");
     $out .= sprintf "<pre>";
+    # Get the selected report from the form submission
+    my $selected_report = $report_type;
 
-    while (<QMAILANALOG>) {
+    # Call the relevant report sub based on the selection
+    if ($selected_report eq 'daily_summary') {
+        $out .= daily_summary_report($log_path);  
+    }
+    elsif ($selected_report eq 'daily_summary_today') {
+        $out .= daily_summary_report_today($log_path);  
+    }
+    elsif ($selected_report eq 'daily_summary_all') {
+        $out .= daily_summary_report_all($log_path);  
+    }
+    elsif ($selected_report eq 'top_senders') {
+        $out .= top_senders_and_recipients($log_path);  
+    }
+    elsif ($selected_report eq 'bounce_analysis') {
+        $out .= bounce_rate_analysis($log_path);  
+    }
+    elsif ($selected_report eq 'spam_and_virus') {
+        $out .= spam_and_virus_filter_report($log_path);  
+    }
+    elsif ($selected_report eq 'delivery_status') {
+        $out .= delivery_status_report($log_path);  
+    }
+    elsif ($selected_report eq 'geo_analysis') {
+        $out .= geographical_analysis_of_email($log_path);  
+    }
+    elsif ($selected_report eq 'traffic_analysis') {
+        $out .= traffic_analysis($log_path);  
+    }
+    elsif ($selected_report eq 'auth_analysis') {
+        $out .= authentication_analysis($log_path);  
+    }
+    elsif ($selected_report eq 'user_activity') {
+        $out .= user_activity_report($log_path);  
+    }
+    elsif ($selected_report eq 'error_reporting') {
+        $out .= error_reporting($log_path);  
+    }
+    elsif ($selected_report eq 'comparison_reports') {
+        $out .= comparison_reports($log_path, '/var/log/mail.log.1');
+    }
+    elsif ($selected_report eq 'customized_reports') {
+        $out .= customized_reports($log_path);  
+    }
+    else {
+        $out .= 'Invalid report selected';
+    }
 
-        # Cook any special HTML characters
-        s/\&/\&amp;/g;
-        s/\"/\&quot;/g;
-        s/\>/\&gt;/g;
-        s/\</\&lt;/g;
-        $out .= sprintf("%s", $_);
-    } ## end while (<QMAILANALOG>)
-    close QMAILANALOG;
+    # The $output variable now contains the generated report output.
+    # Further processing can be done here, or you can render it later.
+  
     $out .= sprintf "</pre>";
     $out .= sprintf("<h3>%s</h3>", $c->l('END_OF_REPORT'));
     return $out;
@@ -94,22 +119,243 @@ sub generateReport {
 sub reportType_list {
     my $c     = shift;
     my @array = (
-
-        #        [ $c->l('qma_LIST_OUTGOING') => 'qmail-qread' ],
-        #        [ $c->l('qma_SUMMARIZE_QUEUE') => 'qmail-qstat' ],
-        [ $c->l('qma_SUCCESSFUL_DELIVERY_DELAY') => 'zddist' ],
-        [ $c->l('qma_REASONS_DEFERRAL')          => 'zdeferrals' ],
-        [ $c->l('qma_REASONS_FAILURE')           => 'zfailures' ],
-        [ $c->l('qma_BASIC_STATS')               => 'zoverall' ],
-        [ $c->l('qma_RECIP_STATS')               => 'zrecipients' ],
-        [ $c->l('qma_RECIP_HOSTS')               => 'zrhosts' ],
-        [ $c->l('qma_RECIP_ORDERED')             => 'zrxdelay' ],
-        [ $c->l('qma_SENDER_STATS')              => 'zsenders' ],
-        [ $c->l('qma_SENDMAIL_STYLE')            => 'zsendmail' ],
-        [ $c->l('qma_REASONS_SUCCESS')           => 'zsuccesses' ],
-        [ $c->l('qma_SENDER_UIDS')               => 'zsuids' ]
-    );
+		[$c->l('qma_Daily_Summary_Report_yesterday') => 'daily_summary'],
+		[$c->l('qma_Daily_Summary_Report_today') => 'daily_summary_today'],
+		[$c->l('qma_Daily_Summary_Report_all') => 'daily_summary_all'],
+		#[$c->l('qma_Top Senders and Recipients') => 'top_senders'],
+		#[$c->l('qma_Bounce Rate Analysis') => 'bounce_analysis'],
+		#[$c->l('qma_Spam and Virus Filtering Report') => 'spam_and_virus'],
+		#[$c->l('qma_Delivery Status Report') => 'delivery_status'],
+		#[$c->l('qma_Geographic Analysis of Email') => 'geo_analysis'],
+		#[$c->l('qma_Traffic Analysis') => 'traffic_analysis'],
+		#[$c->l('qma_Authentication Analysis') => 'auth_analysis'],
+		#[$c->l('qma_User Activity Report') => 'user_activity'],
+		#[$c->l('qma_Error Reporting') => 'error_reporting'],
+		#[$c->l('qma_Comparison Reports') => 'comparison_reports'],
+		#[$c->l('qma_Customized Reports') => 'customized_reports'],
+	);
     my @sorted_array = sort { $a->[0] cmp $b->[0] } @array;
     return \@sorted_array;
 } ## end sub reportType_list
-1;
+
+sub daily_summary_report {
+    my $log_file = shift;  # Path to log file
+    my $output = qx(ls -1 /var/log/maillog* | xargs cat |pflogsumm -d yesterday --detail 0 --no-no-msg-size);
+    return format_as_html("Daily Summary Report", $output);
+}
+
+sub daily_summary_report_today {
+    my $log_file = shift;  # Path to log file
+    my $output = qx(ls -1 /var/log/maillog* | xargs cat |pflogsumm -d today --detail 0 --no-no-msg-size);
+    return format_as_html("Daily Summary Report", $output);
+}
+
+sub daily_summary_report_all {
+    my $log_file = shift;  # Path to log file
+    my $output = qx(ls -1 /var/log/maillog* | xargs cat |pflogsumm --detail 0 --no-no-msg-size);
+    return format_as_html("Summary Report across all logs", $output);
+}
+
+sub top_senders_and_recipients {
+    my $log_file = shift;
+    my $output = qx(pflogsumm --smtpd-stats $log_file);
+    return format_as_html("Top Senders and Recipients", $output);
+}
+
+sub bounce_rate_analysis {
+    my $log_file = shift;
+    my $output = qx(pflogsumm --bounce-detail 10 $log_file);  # Show up to 10 bounce details
+    return format_as_html("Bounce Rate Analysis", $output);
+}
+
+sub spam_and_virus_filter_report {
+    my $log_file = shift;
+    my $output = qx(pflogsumm -u 10 $log_file);  # User report with up to 10 entries
+    return format_as_html("Spam and Virus Filtering Report", $output);
+}
+
+sub delivery_status_report {
+    my $log_file = shift;
+    my $output = qx(pflogsumm --deferral-detail 10 $log_file);  # Show deferral details
+    return format_as_html("Delivery Status Report", $output);
+}
+
+sub geographical_analysis_of_email {
+    my $log_file = shift;
+    # `pflogsumm` doesn't have a specific option for geographic analysis in the help text;
+    # It's assumed this could be replaced with something relevant, like a SMTP detail.
+    my $output = qx(pflogsumm --smtp-detail 10 $log_file);  # Show up to 10 SMTP details
+    return format_as_html("Geographic Analysis of Email", $output);
+}
+
+sub traffic_analysis {
+    my $log_file = shift;
+    my $output = qx(pflogsumm --verbose-msg-detail $log_file);  # Request verbose detail
+    return format_as_html("Traffic Analysis", $output);
+}
+
+sub authentication_analysis {
+    my $log_file = shift;
+    my $output = qx(pflogsumm -u 10 --verbose-msg-detail $log_file);  # User detailed report
+    return format_as_html("Authentication Analysis", $output);
+}
+
+sub user_activity_report {
+    my $log_file = shift;
+    my $output = qx(pflogsumm -u 20 $log_file);  # Show user activity for up to 20 users
+    return format_as_html("User Activity Report", $output);
+}
+
+sub error_reporting {
+    my $log_file = shift;
+    my $output = qx(pflogsumm --problems-first $log_file);  # This will show problems first
+    return format_as_html("Error Reporting", $output);
+}
+
+sub comparison_reports {
+    my ($log_file1, $log_file2) = @_; # Comparing two log files
+    my $output = qx(pflogsumm $log_file1 $log_file2);  # Standard comparison without special flags
+    return format_as_html("Comparison Reports", $output);
+}
+
+sub customized_reports {
+    my $log_file = shift;
+    # Because we don't have a concrete custom flag, we'll consider using -d with specific detail.
+    my $output = qx(pflogsumm --detail 10 $log_file);  # Generally show detailed summary
+    return format_as_html("Customized Reports", $output);
+}
+
+sub format_as_html {
+    my ($title, $content) = @_;
+    return <<HTML;
+<h2>$title</h2>
+<pre>$content</pre>
+HTML
+}
+
+
+### 1. Message Tracking
+#sub trace_message {
+    #my ($log_path, $message_id) = @_;
+    ##my $tracer = Mail::Log::Trace::Postfix->new({log_file => $log_path});
+    ##$tracer->set_message_id($message_id);
+    
+    #my $output = "Message Tracking Report for ID: $message_id\n";
+    ##$output .= "=" x 50 . "\n";
+    ##$output .= sprintf "%-12s: %s\n", 'From', $tracer->get_from_address;
+    ##$output .= sprintf "%-12s: %s\n", 'Status', $tracer->get_final_status;
+    
+    ##$output .= "\nRecipients:\n";
+    ##$output .= join("\n", map { "- $_" } $tracer->get_recipient_addresses);
+    
+    ##$output .= "\n\nTimeline:\n";
+    ##my $timeline = $tracer->get_timestamps;
+    ##while (my ($stage, $time) = each %$timeline) {
+        ##$output .= sprintf "%-10s: %s\n", ucfirst($stage), $time;
+    ##}
+    
+    #return $output || "No records found for message ID: $message_id";
+#}
+
+#### 2. Queue Analysis
+#sub get_queue_stats {
+    #my $spool_dir = '/var/spool/postfix';
+    #my %queues = map { $_ => 0 } qw(active deferred bounce hold corrupt);
+    
+    #foreach my $q (keys %queues) {
+        #opendir(my $dh, "$spool_dir/$q");
+        #$queues{$q} = scalar(grep { -f "$spool_dir/$q/$_" } readdir($dh));
+        #closedir($dh);
+    #}
+    
+    #my $output = "Current Postfix Queue Status\n";
+    #$output .= "=" x 30 . "\n";
+    #$output .= sprintf "%-10s: %3d messages\n", ucfirst($_), $queues{$_} 
+        #for sort keys %queues;
+    #$output .= "\nTotal: " . sum(values %queues) . " messages in queue";
+    
+    #return $output;
+#}
+
+#### 3. Message Statistics
+#sub get_message_stats {
+    #my ($log_path) = @_;
+    #my %stats = (received => 0, rejected => 0, delivered => 0, 
+                #deferred => 0, bounced => 0, held => 0);
+
+    #open(my $fh, '<', $log_path);
+    #while(<$fh>) {
+        #$stats{received}++ if /qmgr.*: [A-Z0-9]+: from=/;
+        #$stats{delivered}++ if /status=sent/;
+        #$stats{rejected}++ if /NOQUEUE: reject/;
+        #$stats{deferred}++ if /status=deferred/;
+        #$stats{bounced}++ if /status=bounced/;
+        #$stats{held}++ if /status=hold/;
+    #}
+    #close($fh);
+    
+    #my $output = "Message Statistics for " . localtime . "\n";
+    #$output .= "=" x 40 . "\n";
+    #$output .= sprintf "%-12s: %6d\n", 'Received', $stats{received};
+    #$output .= sprintf "%-12s: %6d (%.1f%%)\n", 'Delivered', $stats{delivered},
+        #($stats{received} ? ($stats{delivered}/$stats{received}*100) : 0);
+    #$output .= sprintf "%-12s: %6d\n", 'Rejected', $stats{rejected};
+    #$output .= sprintf "%-12s: %6d\n", 'Deferred', $stats{deferred};
+    #$output .= sprintf "%-12s: %6d\n", 'Bounced', $stats{bounced};
+    #$output .= sprintf "%-12s: %6d\n", 'Held', $stats{held};
+    
+    #return $output;
+#}
+
+#### 4. User Activity Audit
+#sub get_user_activity {
+    #my ($log_path, $email) = @_;
+    ##my $tracer = Mail::Log::Trace::Postfix->new({log_file => $log_path});
+    
+    ##my $sent = scalar $tracer->find_messages_by_sender($email);
+    ##my $received = scalar $tracer->find_messages_by_recipient($email);
+    
+    #my $output = "Activity Report for: $email\n";
+    ##$output .= "=" x (length($email) + 18) . "\n";
+    ##$output .= "Messages sent:     $sent\n";
+    ##$output .= "Messages received: $received\n\n";
+    
+    ##$output .= "Last week's activity:\n";
+    ##$output .= join("\n", map { sprintf "- %s: %d messages", $_->[0], $_->[1] }
+        ##$tracer->get_weekly_stats($email));
+    
+    #return $output || "No activity found for $email";
+#}
+
+#### 5. Security Monitoring
+#sub detect_auth_failures {
+    #my ($log_path) = @_;
+    #my %failures;
+    
+    #open(my $fh, '<', $log_path);
+    #while(<$fh>) {
+        #if(/SASL (?:LOGIN|PLAIN) authentication failed.*?\[([0-9.]+)\]/) {
+            #$failures{$1}++;
+        #}
+    #}
+    #close($fh);
+    
+    #return "No authentication failures found" unless keys %failures;
+    
+    #my $output = "Authentication Failure Report\n";
+    #$output .= "=" x 30 . "\n";
+    #$output .= sprintf "%-15s %s\n", 'IP Address', 'Attempts';
+    #$output .= sprintf "%-15s %s\n", '-' x 15, '-' x 7;
+    
+    #foreach my $ip (sort { $failures{$b} <=> $failures{$a} } keys %failures) {
+        #$output .= sprintf "%-15s %5d\n", $ip, $failures{$ip};
+    #}
+    #$output .= "\nTotal failures: " . sum(values %failures);
+    
+    #return $output;
+#}
+
+
+
+
+1;

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Quota;
 #----------------------------------------------------------------------
 # heading     : User management
 # description : Quotas
-# navigation  : 2000 300
+# navigation  : 2000 500
 #----------------------------------------------------------------------
 #
 # routes : end
@@ -16,8 +16,8 @@ use Scalar::Util qw(looks_like_number);
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::AccountsDB::UTF8;
 
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
 my $adb;
 
 sub main {
@@ -25,7 +25,7 @@ sub main {
     $c->app->log->info($c->log_req);
     my %quo_datas = ();
     my $title     = $c->l('quo_FORM_TITLE');
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $quo_datas{'trt'} = 'LIST';
     my @userAccounts;
 
@@ -44,7 +44,7 @@ sub do_display {
     $trt = 'UPD' if ($user);
     my %quo_datas = ();
     my $title     = $c->l('quo_FORM_TITLE');
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $quo_datas{'trt'} = $trt;
 
     if ($trt eq 'UPD') {
@@ -73,7 +73,7 @@ sub do_update {
     $quo_datas{trt} = $trt;
     my $result = '';
     my $res;
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+    $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 
     if ($trt eq 'UPD') {
         $quo_datas{user}    = ($c->param('user') || '');

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

@@ -14,7 +14,7 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session ip_number subnet_mask get_reg_mask);
-use esmith::ConfigDB;
+use esmith::ConfigDB::UTF8;
 use esmith::util;
 use File::Basename;
 use Exporter;
@@ -30,7 +30,7 @@ our @EXPORT = qw( networkAccess_list passwordLogin_list get_ssh_permit_root_logi
 );
 
 #		get_pptp_sessions
-our $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+our  $db; 
 
 sub main {
     my $c = shift;
@@ -38,7 +38,7 @@ sub main {
     my $title     = $c->l('rma_FORM_TITLE');
     my $notif     = '';
     my %rma_datas = ();
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
 
     #$rma_datas{ipsecrwSess}  = $c->get_ipsecrw_sessions();
     #$rma_datas{pptpSessions} = $c->get_pptp_sessions();
@@ -60,7 +60,7 @@ sub do_action {
     my $title = $c->l('rma_FORM_TITLE');
     my ($result, $res, $trt) = '';
     my %rma_datas = ();
-    $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     $rma_datas{ipsecrwSess}  = ($c->param('IpsecrwSess')  || '');
     $rma_datas{ipsecrwReset} = ($c->param('IpsecrwReset') || '');
 
@@ -134,7 +134,7 @@ sub networkAccess_list {
     return [
         [ $c->l('rma_NO_ACCESS')         => 'off' ],
         [ $c->l('NETWORKS_ALLOW_LOCAL')  => 'private' ],
-        [ $c->l('NETWORKS_ALLOW_PUBLIC') => 'normal' ]
+        [ $c->l('NETWORKS_ALLOW_PUBLIC') => 'public' ]
     ];
 } ## end sub networkAccess_list
 
@@ -144,6 +144,7 @@ sub passwordLogin_list {
 }
 
 sub get_prop {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     my ($c, $item, $prop) = @_;
     warn "You must specify a record key"    unless $item;
     warn "You must specify a property name" unless $prop;
@@ -154,6 +155,7 @@ sub get_prop {
 sub get_value {
     my $c    = shift;
     my $item = shift;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     return ($db->get($item)->value());
 } ## end sub get_value
 
@@ -179,8 +181,8 @@ sub get_ssh_password_auth {
 }
 
 sub get_ssh_access {
-    my $status = get_prop('', 'sshd', 'status');
-
+	my $c = shift;
+    my $status = $c->get_prop('sshd', 'status');
     if (defined($status) && ($status eq 'enabled')) {
         my $access = get_prop('', 'sshd', 'access');
         $access = ($access eq 'public') ? 'public' : 'private';
@@ -202,6 +204,7 @@ sub get_ftp_password_login_access {
 } ## end sub get_ftp_password_login_access
 
 sub get_telnet_mode {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     my $telnet = $db->get('telnet');
     return ('off') unless $telnet;
     my $status = $telnet->prop('status') || 'disabled';
@@ -211,8 +214,8 @@ sub get_telnet_mode {
 } ## end sub get_telnet_mode
 
 sub get_ipsecrw_sessions {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     my $status = $db->get('ipsec')->prop('RoadWarriorStatus');
-
     if (defined($status) && ($status eq 'enabled')) {
         return ($db->get('ipsec')->prop('RoadWarriorSessions') || '0');
     } else {
@@ -221,6 +224,7 @@ sub get_ipsecrw_sessions {
 } ## end sub get_ipsecrw_sessions
 
 sub get_ipsecrw_status {
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     return undef unless ($db->get('ipsec'));
     return $db->get('ipsec')->prop('RoadWarriorStatus');
 }
@@ -228,6 +232,7 @@ sub get_ipsecrw_status {
 sub pptp_and_dhcp_range {
     my $c           = shift;
     my $val         = shift || 0;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     my $dhcp_status = $db->get_prop('dhcpd', 'status') || 'disabled';
     my $dhcp_end    = $db->get_prop('dhcpd', 'end') || '';
     my $dhcp_start  = $db->get_prop('dhcpd', 'start') || '';
@@ -245,6 +250,7 @@ sub pptp_and_dhcp_range {
 
 sub _get_valid_from {
     my $c   = shift;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     my $rec = $db->get('httpd-admin');
     return undef unless ($rec);
     my @vals = (split ',', ($rec->prop('ValidFrom') || ''));
@@ -287,12 +293,12 @@ sub validate_network_and_mask {
 
 sub change_settings {
     my ($c, %rma_datas) = @_;
-
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     #------------------------------------------------------------
     # good; go ahead and change the access.
     #------------------------------------------------------------
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     my $rec = $db->get('telnet');
-
     if ($rec) {
         if ($rma_datas{telnetAccess} eq "off") {
             $rec->set_prop('status', 'disabled');
@@ -363,7 +369,7 @@ sub change_settings {
 sub set_ipsecrw_sessions {
     my $c        = shift;
     my $sessions = shift;
-
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
     if (defined $sessions) {
         $db->get('ipsec')->set_prop('RoadWarriorSessions', $sessions);
 
@@ -378,6 +384,7 @@ sub add_new_valid_from {
     my $c    = shift;
     my $net  = shift;
     my $mask = shift;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
 
     # we transform bit mask to regular mask
     $mask = get_reg_mask($net, $mask);
@@ -400,6 +407,7 @@ sub remove_valid_from {
     my $c           = shift;
     my $remove_nets = shift;
     my @remove      = split /,/, $remove_nets;
+    $db = esmith::ConfigDB::UTF8->open || warn "Couldn't open configuration database";
 
     #	my @remove = $c->param('Remove_nets');
     my @vals = $c->_get_valid_from();

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

@@ -8,6 +8,8 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
+use esmith::ConfigDB::UTF8 qw(open_ro);
+use esmith::AccountsDB::UTF8 qw(open_ro);
 
 # retrieve a configuration db record
 sub getconfig {
@@ -16,8 +18,7 @@ sub getconfig {
     $c->app->log->info($c->log_req . ' ' . $key);
 
     if ($key) {
-        use esmith::ConfigDB qw(open_ro);
-        my $cdb = esmith::ConfigDB->open_ro;
+        my $cdb = esmith::ConfigDB::UTF8->open_ro;
         return getdb($c, $cdb, $key);
     } ## end if ($key)
 } ## end sub getconfig
@@ -29,8 +30,7 @@ sub getaccount {
     $c->app->log->info($c->log_req . ' ' . $key);
 
     if ($key) {
-        use esmith::AccountsDB qw(open_ro);
-        my $adb = esmith::AccountsDB->open_ro;
+        my $adb = esmith::AccountsDB::UTF8->open_ro;
         return getdb($c, $adb, $key);
     } ## end if ($key)
 } ## end sub getaccount

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

@@ -1,16 +1,11 @@
 package SrvMngr::Controller::Review;
 
 #----------------------------------------------------------------------
-# heading     : Support
+# heading     : Investigation
 # description : Review configuration
-# navigation  : 000 500
-# menu        : N
+# navigation  : 7000 400
 # routes : end
 #----------------------------------------------------------------------
-# heading-o     : Configuration
-# description-o : Review configuration
-# navigation-o  : 6000 6800
-#----------------------------------------------------------------------
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
@@ -18,17 +13,20 @@ use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 use SrvMngr qw(gen_locale_date_string);
-
+use esmith::ConfigDB::UTF8;
+use esmith::DomainsDB::UTF8;
+use esmith::NetworksDB::UTF8;
 
 #use SrvMngr::Review_sub qw(print_page);
 #use smeserver::Panel::review;
-our $db       = esmith::ConfigDB->open_ro   || die "Couldn't open config db";
-our $domains  = esmith::DomainsDB->open_ro  || die "Couldn't open domains";
-our $networks = esmith::NetworksDB->open_ro || die "Couldn't open networks";
+our $db;
+our $domains ;
+our $networks;
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
+    $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
     my $title     = $c->l('rvw_FORM_TITLE');
     my $modul     = $c->render_to_string(inline => $c->l('rvw_DESCRIPTION'));
     my %rvw_datas = ();
@@ -102,6 +100,7 @@ sub gen2_email_addresses {
 
 sub gen2_domains {
     my $c          = shift;
+    $domains  = esmith::DomainsDB::UTF8->open_ro  || die "Couldn't open domains";
     my @virtual    = $domains->get_all_by_prop(type => 'domain');
     my $numvirtual = @virtual;
 
@@ -130,6 +129,7 @@ serving.	(mojo ver)
 
 sub get2_local_networks {
     my $c           = shift;
+    $networks = esmith::NetworksDB::UTF8->open_ro || die "Couldn't open networks";
     my @nets        = $networks->get_all_by_prop('type' => 'network');
     my $numNetworks = @nets;
 
@@ -156,7 +156,7 @@ sub get_net_prop {
   my $fm = shift;
   my $item = shift;
   my $prop = shift;
-
+  $networks = esmith::NetworksDB::UTF8->open_ro || die "Couldn't open networks";
   my $record = $networks->get($item);
   if ($record) {
     return $record->prop($prop);
@@ -170,7 +170,7 @@ sub get_net_prop {
 
 sub get_local_networks {
     my $fm = shift;
-
+    $networks = esmith::NetworksDB::UTF8->open_ro || die "Couldn't open networks";
     my @nets = $networks->get_all_by_prop('type' => 'network');
 
     my $numNetworks = @nets;
@@ -270,6 +270,7 @@ sub print2_dhcp_stanza {
 sub get_value {
   my $fm = shift;
   my $item = shift;
+  $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
   my $record = $db->get($item);
   if ($record) {
     return $record->value();
@@ -286,7 +287,7 @@ sub get_prop {
 				 #otherwise, we don't want to grab it
   my $item = shift;
   my $prop = shift;
-
+  $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
   my $record = $db->get($item);
   if ($record) {
     return $record->prop($prop);
@@ -300,6 +301,7 @@ sub get_prop {
 sub get_public_ip_address
 {
     my $self = shift;
+    $db       = esmith::ConfigDB::UTF8->open_ro   || die "Couldn't open config db";
     my $sysconfig = $db->get('sysconfig');
     if ($sysconfig)
     {

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

@@ -1,9 +1,9 @@
 package SrvMngr::Controller::Roundcubepanel;
 
 #----------------------------------------------------------------------
-# heading     : System
+# heading     : Network
 # description : Webmail
-# navigation  : 99999 9999
+# navigation  : 6000 900
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # name   : roundcubepanel,    method : get,   url : /roundcubepanel,     ctlact : Roundcubepanel#main

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

@@ -3,7 +3,7 @@ package  SrvMngr::Controller::Support;
 #----------------------------------------------------------------------
 # heading     : Support
 # description : Support and licensing
-# navigation  : 0000 200
+# navigation  : 0 400
 # menu        : N
 #
 # routes : end

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

@@ -5,19 +5,18 @@ package SrvMngr::Controller::Swttheme;
 use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
-
+use esmith::ConfigDB::UTF8;
 #use SrvMngr qw(theme_list init_session);
-our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
 
 sub main {
     my $c     = shift;
+    my $db = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
     my $from  = $c->param('From') || '/';
     my $theme = $c->param('Theme');
     $c->app->log->info(" swt theme '$from'  '$theme' ");
     my $oldTheme = $c->session->{CurrentTheme};
 
     if ($theme ne $oldTheme) {
-
         #	$c->app->renderer->paths([$c->app->home->rel_file('themes/default/templates')]);
         #	$c->app->static->paths([$c->app->home->rel_file('themes/default/public')]);
         #	if ( $theme ne 'default' ) {
@@ -31,7 +30,7 @@ sub main {
         system("/sbin/e-smith/signal-event smanager-theme-change") == 0
             or warn "$c->l('ERROR_UPDATING')";
     } ## end if ($theme ne $oldTheme)
-## (not sure)     $c->flash( warning => $c->l('swt_LOGIN_AGAIN') );
+    ## (not sure)     $c->flash( warning => $c->l('swt_LOGIN_AGAIN') );
     $from = '/initial'  if $from eq '/';
     $from = '/' . $from if ($from !~ m|^\/|);
     $c->redirect_to($from);

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

@@ -15,28 +15,20 @@ use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session
     validate_password email_simple);
-
-#use esmith::FormMagick qw( validate_password );
-#use CGI::FormMagick::Validator qw( call_fm_validation );
-use esmith::AccountsDB;
-use esmith::ConfigDB;
+use esmith::AccountsDB::UTF8;
+use esmith::ConfigDB::UTF8;
 use esmith::util;
 
-#use esmith::FormMagick;
-#use esmith::cgi;
 #use File::Basename;
 #use Exporter;
 #use Carp qw(verbose);
-#use esmith::FormMagick::Panel::useraccounts;
-#our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
-#our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
 my ($cdb,$adb);
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     my $notif     = '';
     my %usr_datas = ();
     my $title     = $c->l('usr_FORM_TITLE');
@@ -55,8 +47,8 @@ sub do_display {
     my %usr_datas = ();
     my $title     = $c->l('usr_FORM_TITLE');
     my ($notif, $modul) = '';
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     $usr_datas{'trt'} = $trt;
 
     if ($trt eq 'ADD') {
@@ -143,8 +135,8 @@ sub do_update {
     $usr_datas{trt} = $trt;
     my $title = $c->l('usr_FORM_TITLE');
     my ($res, $result) = '';
-	$cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
-	$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+	$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
 
     if ($trt eq 'ADD') {
 
@@ -363,10 +355,10 @@ sub lock_account {
         $user = $1;
 
         if (system("/sbin/e-smith/signal-event", "user-lock", $user)) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
             return $c->l("usr_ERR_OCCURRED_LOCKING");
         }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
         return 'OK';
     } else {
         return $c->l('NO_SUCH_USER', $user);
@@ -387,10 +379,10 @@ sub remove_account {
         $user = $1;
 
         if (system("/sbin/e-smith/signal-event", "user-delete", $user)) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
             return $c->l("ERR_OCCURRED_DELETING");
         }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
         $adb->get($user)->delete;
         return 'OK';
     } else {
@@ -406,7 +398,7 @@ sub reset_password {
         return $c->l('usr_TAINTED_USER');
     }
     $user = $1;
-	my $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
+	my $adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
     my $acct = $adb->get($user);
 
     if ($acct->prop('type') eq "user") {
@@ -415,10 +407,10 @@ sub reset_password {
         undef $adb;
 
         if (system("/sbin/e-smith/signal-event", "password-modify", $user)) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
             return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
         }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
         return 'OK';
     } else {
         return $c->l('NO_SUCH_USER', $user);
@@ -671,10 +663,10 @@ sub modify_user {
         undef $adb;
 
         unless (system("/sbin/e-smith/signal-event", "user-modify", $acctName) == 0) {
-            $adb = esmith::AccountsDB->open();
+            $adb = esmith::AccountsDB::UTF8->open();
             return $c->l('usr_CANNOT_MODIFY_USER');
         }
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
     } ## end if ($acctType eq "user")
     return 'OK';
 } ## end sub modify_user
@@ -707,10 +699,10 @@ sub create_user {
     $acctName = $1;
 
     if (system("/sbin/e-smith/signal-event", "user-create", $acctName)) {
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
         return $c->l("usr_ERR_OCCURRED_CREATING");
     }
-    $adb = esmith::AccountsDB->open();
+    $adb = esmith::AccountsDB::UTF8->open();
     $c->set_groups();
     return 'OK';
 } ## end sub create_user
@@ -735,7 +727,7 @@ sub modify_admin {
     $acct->merge_props(%newProperties);
     undef $adb;
     my $status = system("/sbin/e-smith/signal-event", "user-modify-admin", 'admin');
-    $adb = esmith::AccountsDB->open();
+    $adb = esmith::AccountsDB::UTF8->open();
 
     if ($status == 0) {
         return 'OK';
@@ -759,8 +751,7 @@ sub system_validate_password {
 sub system_check_password {
     my $c     = shift;
     my $pass1 = shift;
-    use esmith::ConfigDB;
-    my $conf = esmith::ConfigDB->open();
+    my $conf = esmith::ConfigDB::UTF8->open();
     my ($check_type, $rec);
 
     if ($conf) {

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

@@ -12,12 +12,11 @@ use strict;
 use warnings;
 use Mojo::Base 'Mojolicious::Controller';
 use esmith::util;
-use esmith::ConfigDB;
-use esmith::AccountsDB;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw( theme_list init_session validate_password );
-#our $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";
 
 sub main {
     my $c         = shift;
@@ -161,7 +160,7 @@ sub reset_password {
     my $ret;
     return $c->l('usr_TAINTED_USER') unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/));
     $user = $1;
-    my $adb  = esmith::AccountsDB->open();
+    my $adb  = esmith::AccountsDB::UTF8->open();
     my $acct = $adb->get($user);
     return $c->l('NO_SUCH_USER', $user) unless ($acct->prop('type') eq 'user');
     $ret = esmith::util::setUserPasswordRequirePrevious($user, $oldpassword, $password) if $trt ne 'RESET';
@@ -171,10 +170,10 @@ sub reset_password {
     undef $adb;
 
     if (system("/sbin/e-smith/signal-event", "password-modify", $user)) {
-        $adb = esmith::AccountsDB->open();
+        $adb = esmith::AccountsDB::UTF8->open();
         return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
     }
-    $adb = esmith::AccountsDB->open();
+    $adb = esmith::AccountsDB::UTF8->open();
     return 'OK';
 } ## end sub reset_password
 
@@ -194,7 +193,7 @@ sub check_password {
     my $c        = shift;
     my $password = shift;
     my $strength;
-   	my $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";
+    my $cdb = esmith::ConfigDB::UTF8->open_ro || die "Couldn't open configuration db";
     my $rec = $cdb->get('passwordstrength');
     $strength = ($rec ? ($rec->prop('Users') || 'none') : 'none');
     return validate_password($c, $strength, $password);

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

@@ -15,14 +15,15 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-use esmith::ConfigDB;
 use File::Basename;
 use HTML::Entities;
 use SrvMngr qw(gen_locale_date_string);
 use File::Temp qw(tempfile);
 use constant TRUE  => 1;
 use constant FALSE => 0;
-our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+use esmith::ConfigDB::UTF8;
+
+our $cdb;
 our @logfiles = ();    # with array
 
 sub main {
@@ -31,7 +32,9 @@ sub main {
     my %log_datas = ();
     my $title     = $c->l('log_FORM_TITLE');
     my $notif     = '';
-    $log_datas{default_op} = ($cdb->get('viewlogfiles')->prop('DefaultOperation')) || 'view';
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
+    my $viewlog = $cdb->get('viewlogfiles');
+    $log_datas{default_op} = ($viewlog ? $viewlog->prop('DefaultOperation') : undef) || 'view';
     $c->stash(title => $title, notif => $notif, log_datas => \%log_datas);
     $c->render(template => 'viewlogfiles');
 } ## end sub main
@@ -230,6 +233,7 @@ sub showlogFile {
 sub download_logFile {
     my ($c, %log_datas) = @_;
     my $fullpath = "/var/log/$log_datas{filename}";
+    $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
 
     # Save this information for later.
     $cdb->get('viewlogfiles')->merge_props('DefaultOperation', $log_datas{operation});

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

@@ -13,11 +13,13 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
-our $db = esmith::ConfigDB->open || die "Couldn't open config db";
+use esmith::ConfigDB::UTF8;
+our $db ;
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
     my %wkg_datas = ();
     my $title     = $c->l('wkg_FORM_TITLE');
     my $modul     = '';
@@ -32,6 +34,7 @@ sub main {
 sub do_update {
     my $c = shift;
     $c->app->log->info($c->log_req);
+    $db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
     my $result          = "";
     my $workgroup       = ($c->param('Workgroup') || 'no');
     my $servername      = ($c->param('ServerName') || 'WS');
@@ -76,4 +79,4 @@ sub validate2_workgroup {
     return $c->l('INVALID_WORKGROUP_MATCHES_SERVERNAME') if ($servername eq $workgroup);
     return ('OK');
 } ## end sub validate2_workgroup
-1;
+1;

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

@@ -3,7 +3,7 @@ package SrvMngr::Controller::Yum;
 #----------------------------------------------------------------------
 # heading     : System
 # description : Software installer
-# navigation  : 4000 300
+# navigation  : 4000 500
 #
 # routes : end
 #----------------------------------------------------------------------
@@ -13,28 +13,30 @@ use Mojo::Base 'Mojolicious::Controller';
 use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session ip_number_or_blank);
-use esmith::ConfigDB;
+# dnf_* should remain ASCII; yum_repositories do not need to be UTF-8
+use esmith::ConfigDB::UTF8;
 use esmith::util;
 use File::Basename;
-our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+our $cdb;
 my $dnf_status_file = '/var/cache/dnf/dnf.status';
 
 #use File::stat;
 our %dbs;
 
 for (qw(available installed updates)) {
-    $dbs{$_} = esmith::ConfigDB->open_ro("dnf_$_")
+    $dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
         or die "Couldn't open dnf_$_ DB\n";
 }
 
 for (qw(repositories)) {
-    $dbs{$_} = esmith::ConfigDB->open("yum_$_")
+    $dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
         or die "Couldn't open yum_$_ DB\n";
 }
 
 sub main {
     my $c = shift;
     $c->app->log->info($c->log_req);
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
     my %yum_datas = ();
     my $title     = $c->l('yum_FORM_TITLE');
     my $dest      = 'yum';
@@ -60,6 +62,7 @@ sub do_display {
     my $c         = shift;
     my $rt        = $c->current_route;
     my $trt       = ($c->param('trt') || 'STAT');
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
     my %yum_datas = ();
     my $title     = $c->l('yum_FORM_TITLE');
     my ($notif, $dest) = '';

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Datetime/datetime_en.lex

@@ -1,5 +1,5 @@
-
 'dat_FORM_TITLE' => 'Date and time configuration',
+'dat_The_time_is_currently' => 'The time is currently:',
 'dat_INITIAL_DESC' => 'This is where you configure the date and time of this server. You may use an existing network time server or
 manually set the date and time for your time zone.',
 'dat_SET_DATE_TITLE' => 'Set Date and Time',
@@ -18,7 +18,7 @@ manually set the date and time for your time zone.',
 'dat_DECEMBER' => 'December',
 'dat_NEW_M/D/Y' => 'New month/day/year:',
 'dat_NEW_H/M/S' => 'New hour/min/sec:',
-'dat_AM/PM_AND_TZ' => 'AM/PM and time zone:',
+'dat_TZ' => 'Time zone:',
 'dat_NTP_ENABLE_DESC' => 'The server can periodically synchronize the system clock to a network time protocol (NTP) server. If you select this option, enter the hostname or IP address of the NTP server below.',
 'dat_NTP_CONFIGURE_DESC' => 'The server is periodically synchronizing the system clock to the network time protocol (NTP) server specified below. To synchronize to a different NTP server, enter a different hostname or IP address in the field below.',
 'dat_NTP_DISABLE_DESC' => 'Choose this option to stop syncronizing the system clock to the NTP
@@ -38,9 +38,7 @@ server.When the NTP service is disabled, you can set the system date and time ma
 'dat_INVALID_SECOND' => 'Error: invalid second',
 'dat_MONTH_BETWEEN_1_AND_12' => 'Please choose a month value between 1 and 12.',
 'dat_INVALID_MONTH' => 'Error: invalid month',
-'dat_UPDATING_CLOCK' => 'System clock is being updated. Please wait for a few seconds, 
-then click <A HREF="datetime?page=1&wherenext=Verify" TARGET="main">here</A>
-to verify changes.',
+'dat_UPDATING_CLOCK' => 'System clock is being updated',
 'dat_ERR_SETTING_CLOCK' => 'Error occurred while setting system time and hardware clock.',
 'dat_SERVER_DISABLED' => 'Network time server disabled successfully',
 'dat_SERVER_DISABLED_DESC' => 'You have disabled this service: The server will rely on its internal
@@ -57,3 +55,8 @@ clock, and <b>will not</b> try to synchronize from a time server.',
 'dat_NTP_DISABLE_TITLE' => 'Disable Network Time Server',
 'dat_CURRENT_SETTING' => 'Current setting',
 'Date and time' => 'Date and time',
+'dat_ntp_server' => 'NTP server',
+'dat_manually_set' => 'Set manually',
+'dat_NTP_Server_URL' =>'NTP Server URL:',
+'dat_set_manually' =>'Set Date and Time:',
+'dat_Invalid_date' => 'Invalid date',

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Emailsettings/emailsettings_en.lex

@@ -1,6 +1,5 @@
-
 'mai_FORM_TITLE' => 'E-mail settings',
-'E-mail' => 'E-mail',
+'mai_E-Mail' => 'E-mail',
 'mai_SUCCESS' => 'The new e-mail settings have been saved.',
 'mai_NEVER' => 'not at all',
 'mai_EVERY5MIN' => 'Every 5 minutes',
@@ -20,7 +19,7 @@ for dialup connections), or multi-drop (for dialup connections if
 ETRN is not supported by your Internet provider). Note that
 multi-drop mode is the only option available when the server is
 configured in private server and gateway mode.',
-'mai_LABEL_DELEGATE' => 'Address of internal mail server',
+'mai_LABEL_DELEGATE' => 'IP Address of internal mail server',
 'mai_TITLE_DELEGATE' => 'Delegate mail servers',
 'mai_DESC_DELEGATE' => 'Your server includes a complete, full-featured e-mail server. However,
 if for some reason you wish to delegate e-mail processing to
@@ -79,10 +78,9 @@ destination (recommended in most cases) or can deliver them via
 your Internet provider\'s SMTP server (recommended if you have an
 unreliable Internet connection or are using a residential Internet
 service). If using your Internet provider\'s SMTP server, specify
-its hostname or IP address below. Otherwise leave this field
-blank.',
-'mai_INVALID_SMARTHOST' => 'The smarthost name you entered is not a valid internet domain name
-and is not blank',
+its hostname or IP address below. Otherwise leave this field blank.',
+'mai_INVALID_SMARTHOST' => 'The smarthost name you entered is not a valid internet domain name and is not blank',
+'mai_INVALID_DELEGATE' => 'The delegate host name you entered is not a valid IP Address and is not blank',
 'mai_DESC_POP_ACCESS_CONTROL' => 'You can control POP3 server access. The setting \'Allow access
 only from local networks\' allows POP3 access only from your
 local network(s). The POP3S setting can be used to provide
@@ -150,5 +148,9 @@ The value for this tag can be defined below.',
 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' => 'SMTP Authentication for Internet provider',
 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' => 'Mail server user id',
 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' => 'Mail server password',
-'mai_VALIDATION_SMTPAUTH_NONBLANK' => 'This field cannot be left blank if SMTP Authentication is
+'mai_VALIDATION_SMTPAUTH_NONBLANK' => 'The user id and password fields cannot be left blank if SMTP Authentication is
 enabled.',
+'mai_ACC_panel_action_was_successful' => 'Email access settings saved sucessfully',
+'mai_DEL_panel_action_was_successful' => 'Email delivery settings saved sucessfully',
+'mai_FIL_panel_action_was_successful' => 'Email filtering settings saved sucessfully',
+'mai_REC_panel_action_was_successful' => 'Email receive settings saved sucessfully',

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex

@@ -151,4 +151,5 @@ SMALL => 'Small',
 MEDIUM => 'Medium',
 LARGE => 'Large',
 FIELD_INVALID_CHARS => 'A field you entered contains invalid characters.',
-
+'REPORT_GENERATED' => "Report generated",
+'END_OF_REPORT' => 'End of Report',

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Localnetworks/localnetworks_en.lex

@@ -12,13 +12,13 @@
 'ln_REMOVE_CONFIRM' => 'Are you sure you wish to remove this network?',
 'ln_DEFAULT' => 'default',
 'ln_NUMBER_OF_HOSTS' => 'Number of hosts',
-'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK' => 'Error: router address {$networkRouter} is not accessible  from local network. Did not add network.',
+'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK' => 'Error: router address [_3] is not accessible  from local network. Did not add network.',
 'ln_LOCALNETWORK_ADD'=>'Add network',
-'ln_NETWORK_ALREADY_LOCAL' => ' Error: network {$network} (derived from network  {$networkAddress} and subnet mask {$networkMask})   is already considered local. Did not add new network. ',
-'ln_NETWORK_ALREADY_ADDED' => 'Error: network {$network} (derived from network  {$networkAddress} and subnet mask {$networkMask})   has already been added. Did not add new network.',
+'ln_NETWORK_ALREADY_LOCAL' => ' Error: network [_1] (derived from network  [_1] and subnet mask [_2])   is already considered local. Did not add new network. ',
+'ln_NETWORK_ALREADY_ADDED' => 'Error: network [_1] (derived from network  [_1] and subnet mask [_2])   has already been added. Did not add new network.',
 'ln_ERROR_CREATING_NETWORK' => 'Error occurred while creating network.',
 'ln_SUCCESS' =>'Successfully added network [_1]/[_2] via router [_3].',
-'ln_SUCCESS_SINGLE_ADDRESS' =>'Successfully added network {$network}/{$networkMask} via router {$networkRouter}.  Your server will grant local access  privileges to the single IP address {$network}. ',
+'ln_SUCCESS_SINGLE_ADDRESS' =>'Successfully added network [_1]/[_2] via router [_3].  Your server will grant local access  privileges to the single IP address [_1]. ',
 'ln_SUCCESS_NETWORK_RANGE' =>'Successfully added network [_1]/[_2] via router [_3]. Your server will grant local access  privileges to [_4] IP addresses in the range  [_5] to [_6]. ',
 'ln_NO_SUCH_NETWORK' =>'Network not found in network db',
 'ln_SUCCESS_REMOVED_NETWORK' =>'Successfully removed network [_1]/[_2] via router [_3].',
@@ -26,5 +26,6 @@
 'ln_NO_ADDITIONAL_NETWORKS' => 'No additional networks',
 'ln_REMOVE_HOSTS_DESC' => 'Local hosts configured on the network you are about to remove have  been detected. By default, they will also be removed. Uncheck this  box if, for some reason, you do not wish this to happen. Note that  they will not be treated as local, and may not even be reachable,  after this network is removed. ',
 'ln_REMOVE_HOSTS_LABEL' => 'Remove hosts on network',
-'ln_extra' => '{$network}/{$networkMask} via router  $networkRouter}.',
+'ln_extra' => '[_1]/[_2] via router  $networkRouter}.',
 'ln_SUCCESS_NONSTANDARD_RANGE' =>'<p>Successfully added network [_1]/[_2] via router [_3].</p><p>  Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6].</p><p>  Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification  <b>[_7]</b> will be used instead.</p>',
+'ln_Failed to find network in Db' => 'Failed to find network in Db',

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Portforwarding/portforwarding_en.lex

@@ -1,16 +1,13 @@
 'pf_FORM_TITLE' => 'Configure Port Forwarding',
-'pf_FIRST_PAGE_DESCRIPTION' => '<p>
-                You can use this panel to modify your firewall rules so
+'pf_FIRST_PAGE_DESCRIPTION' => 'You can use this panel to modify your firewall rules so
                 as to open a specific port on this server and forward it
                 to another port on another host.  Doing so will permit
                 incoming traffic to directly access a private host on
                 your LAN.
-            </p><p>
                 WARNING: Misuse of this feature can seriously compromise the
                 security of your network. Do not use this feature
                 lightly, or without fully understanding the implications
-                of your actions.
-            </p>',
+                of your actions.',
 'pf_CREATE_RULE' => 'Create portforwarding rule',
 'pf_SUMMARY_ADD_DESC' => 'The following summarizes the port-forwarding rule
             that you are about to add. If you are satisfied with the rule,
@@ -22,13 +19,13 @@
             port-forwarding rules installed on this server. Click on the
             \'Remove\' link to remove the corresponding rule.',
 'pf_NO_FORWARDS' => 'There are currently no forwarded ports on the system.',
-'pf_CREATE_PAGE_DESCRIPTION' => '<p>Select the protocol, the port you wish to forward, the
+'pf_CREATE_PAGE_DESCRIPTION' => 'Select the protocol, the port you wish to forward, the
                 destination host, and the port on the destination host
                 that you wish to forward to. If you wish to specify a port
                 range, enter the lower and upper boundaries separated by a
                 hyphen. The destination port may be left blank, which will
                 instruct the firewall to leave the source port 
-                unaltered.</p>',
+                unaltered',
 'pf_LABEL_SOURCE_PORT' => 'Source Port(s)',
 'pf_LABEL_PROTOCOL' => 'Protocol',
 'pf_LABEL_DESTINATION_PORT' => 'Destination Port(s)',
@@ -53,4 +50,4 @@
 'pf_ERR_BADAHOST' => 'This does not appear to be a valid IP address list.
             ie: 192.168.0.1,192.168.1.1/24',
 'pf_IN_SERVERONLY' => 'This server is currently in serveronly mode and portforwarding
-    is possible only to localhost.',
+    is possible only to localhost.',

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmailanalog/qmailanalog_en.lex

@@ -8,6 +8,15 @@ reports are available.</P>
 these reports</P>',
 'qma_REPORT_TYPE' => 'Choose a report type',
 'qma_GENERATE_REPORT' => 'Generate report',
+'qma_INVALID_REPORT_TYPE' => 'Invalid report type: ',
+'qma_REPORT_GENERATED' => 'Report generated: ',
+'qma_END_OF_REPORT' => 'End of Report',
+'Mail log file analysis' => 'Mail log file analysis',
+
+'qma_Daily_Summary_Report_yesterday' => 'Summary report for yesterday',
+'qma_Daily_Summary_Report_today' => 'Summary report for today up to now',
+'qma_Daily_Summary_Report_all' => 'Summary report for all time up to now',
+
 'qma_LIST_OUTGOING' => 'List outgoing messages and recipients',
 'qma_SUMMARIZE_QUEUE' => 'Summarize status of mail queue',
 'qma_SUCCESSFUL_DELIVERY_DELAY' => 'Successful delivery delay distribution',
@@ -20,9 +29,4 @@ these reports</P>',
 'qma_SENDER_STATS' => 'Sender statistics',
 'qma_SENDMAIL_STYLE' => 'Sendmail style log',
 'qma_REASONS_SUCCESS' => 'Reasons for success',
-'qma_SENDER_UIDS' => 'Sender uids',
-'qma_INVALID_REPORT_TYPE' => 'Invalid report type: ',
-'qma_REPORT_GENERATED' => 'Report generated: ',
-'qma_END_OF_REPORT' => 'End of Report',
-'Mail log file analysis' => 'Mail log file analysis',
-
+'qma_SENDER_UIDS' => 'Sender uids',

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

@@ -4,19 +4,19 @@ use strict;
 use warnings;
 use utf8;
 
-use esmith::ConfigDB;
-use esmith::AccountsDB;
+use esmith::ConfigDB::UTF8;
+use esmith::AccountsDB::UTF8;
 use esmith::util;
 
 use Net::LDAP qw/LDAP_INVALID_CREDENTIALS/;
-
+our ($cdb,$adb);
 
 
 sub init_data {
 
     my %datas = ();
 
-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Config DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Config DB");
     my $sysconfig = $cdb->get("sysconfig");
 
     $datas{'lang'} = $sysconfig->prop('Language') || 'en_US';
@@ -42,7 +42,7 @@ sub init_data {
 
 sub reconf_needed {
 
-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Config DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Config DB");
     #my $unsafe = ($cdb->get('bootstrap-console') and $cdb->get('bootstrap-console')->prop('Run') eq 'yes') ||
     #     ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0';
 	my $unsafe = ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0';   
@@ -55,7 +55,7 @@ sub check_credentials {
     my ($c, $username, $password) = @_;
     return unless $username || $password;
 
-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Configuration DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Configuration DB");
     my $l = $cdb->get('ldap');
     my $status = $l->prop('status') || "disabled";
     unless ($status eq "enabled" ) {
@@ -88,13 +88,13 @@ sub check_adminalias {
     my $c = shift;
 
     my $alias;
-    my $cdb = esmith::ConfigDB->open_ro() or die("can't open Configuration DB");
+    $cdb = esmith::ConfigDB::UTF8->open_ro() or die("can't open Configuration DB");
     if (defined $cdb->get('AdminAlias')) {
 	$alias = $cdb->get('AdminAlias')->value;
     }
     return undef unless $alias;
 
-    my $adb = esmith::AccountsDB->open_ro() or die("can't open Accounts DB");
+    $adb = esmith::AccountsDB::UTF8->open_ro() or die("can't open Accounts DB");
     my $arec = $adb->get( $alias );
     return undef unless $arec;
 
@@ -105,4 +105,4 @@ sub check_adminalias {
 }
 
 
-1;
+1;

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

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

root/usr/share/smanager/script/routes.pl

@@ -5,11 +5,11 @@
 use strict;
 use warnings;
 
-use esmith::ConfigDB;
+use esmith::ConfigDB::UTF8;
 
 use constant WEBFUNCTIONS => '/usr/share/smanager/lib/SrvMngr/Controller/';
 
-my $rtdb = esmith::ConfigDB->open('routes') or
+my $rtdb = esmith::ConfigDB::UTF8->open('routes') or
         die "Couldn't access Routes database\n";
 
 my @routes = $rtdb->get_all_by_prop( type => 'route' );

root/usr/share/smanager/script/secrets.pl

@@ -7,7 +7,7 @@
 use strict;
 use warnings;
 
-use esmith::ConfigDB;
+use esmith::ConfigDB::UTF8;
 
 sub gen_pwd {
     use MIME::Base64 qw(encode_base64);
@@ -29,7 +29,7 @@ sub gen_pwd {
     return $p;
 }
 
-my $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
+my $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
 
 my $pwds = $cdb->get_prop('smanager','Secrets');
 

root/usr/share/smanager/script/srvmngr

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

root/usr/share/smanager/t/002_basic.t

@@ -6,8 +6,8 @@ use Test::Mojo;
 use FindBin;
 use lib "$FindBin::Bin/../lib";
 
-eval "use esmith::ConfigDB";
-plan skip_all => 'esmith::ConfigDB (and others) required for testing 002_basic' if $@;
+eval "use esmith::ConfigDB::UTF8";
+plan skip_all => 'esmith::ConfigDB::UTF8 (and others) required for testing 002_basic' if $@;
 
 plan tests => 3;
 

root/usr/share/smanager/t/004_panels.t

@@ -6,8 +6,8 @@ use Test::Mojo;
 use FindBin;
 use lib "$FindBin::Bin/../lib";
 
-eval "use esmith::ConfigDB";
-plan skip_all => 'esmith::ConfigDB (and others) required for testing 004_panels' if $@;
+eval "use esmith::ConfigDB::UTF8";
+plan skip_all => 'esmith::ConfigDB::UTF8 (and others) required for testing 004_panels' if $@;
 
 my $tests;
 plan tests => $tests;
@@ -17,8 +17,8 @@ BEGIN { $tests += 2 * 3 };
 my $t = Test::Mojo->new('SrvMngr');
 $t->ua->max_redirects(1);
 
-$t->get_ok('/')->status_is(200)->content_like(qr/SME Server 10/);
-$t->get_ok('/manual')->status_is(200)->content_like(qr/SME Server 10/);
+$t->get_ok('/')->status_is(200)->content_like(qr/SME Server 11/);
+$t->get_ok('/manual')->status_is(200)->content_like(qr/SME Server 11/);
 
 BEGIN { $tests += 5 * 2 };
 my @panels = qw/ Initial Login Manual Support Request /;

root/usr/share/smanager/themes/default/public/css/datetime.css

@@ -0,0 +1,51 @@
+.datetime-config-row {
+  display: flex;
+  align-items: stretch;
+  margin-bottom: 1em;
+}
+
+.datetime-label-col {
+  background: #e8f3e2; /* light green */
+  padding: 1em 0em 0em 0em;
+  min-width: 30%;
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-end;
+  font-weight: bold;
+  border-radius: 4px 0 0 4px;
+}
+
+.datetime-label {
+	display:inline-flex;
+}
+
+.datetime-fields-col {
+  background: #fff;
+  padding: 1em;
+  flex: 1;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-radius: 0 4px 4px 0;
+}
+
+.datetime-clock {
+	min-width: 20em;
+	display:inline-flex;
+	border:0px;
+	padding:5px;
+}
+
+.datetime-clock-label {
+	background-color:#e8f3e2;
+	display:inline-flex;
+	width:30%;
+	font-weight:bold;
+	text-align:right;
+	
+	
+}
+
+.ntp-test-result { font-weight: bold; }
+.ntp-test-success { color: green; }
+.ntp-test-error   { color: red; }
+.ntp-test-wait    { color: #333; }

root/usr/share/smanager/themes/default/public/css/emailsettings.css

@@ -0,0 +1,14 @@
+/*
+Generated by: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20
+*/
+.Emailsettings-panel {}
+.name {}
+.rout {}
+.name {}
+.rout {}
+.name {}
+.rout {}
+.name {}
+.rout {}
+.name {}
+.rout {}

root/usr/share/smanager/themes/default/public/css/module.css

@@ -0,0 +1,43 @@
+/* General styles for the module panel */
+#module {
+    padding: 20px;
+    border: 1px solid #ccc;
+    border-radius: 10px;
+    background-color: #f9f9f9;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+
+/* Debug information styling */
+#module p {
+    font-family: monospace;
+    color: #555;
+}
+
+#module pre {
+    background-color: #eee;
+    padding: 10px;
+    border-radius: 5px;
+}
+
+/* Error message styling */
+.sme-error {
+    color: #d9534f;
+    font-weight: bold;
+    margin-bottom: 15px;
+}
+
+/* Title styling */
+#module h1 {
+    font-family: Arial, sans-serif;
+    color: #333;
+    text-align: center;
+    margin-bottom: 20px;
+}
+
+/* Content styling */
+.module-content {
+    font-family: Georgia, serif;
+    font-size: 13px;
+    line-height: 1.2;
+    color: #555;
+}

root/usr/share/smanager/themes/default/public/css/new-sme-main.css

@@ -0,0 +1,505 @@
+ {
+    margin-left: 0;
+}
+
+a.alert {
+    color: red;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background: #e8f3e1;
+}
+
+a.item {
+    color: #00008b;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background: #e8f3e1;
+}
+
+a.item-current:hover,   a.warn-current:hover {
+    border-color: #888;
+}
+
+a.item-current:link,    a.warn-current:link,
+a.item-current:visited, a.warn-current:visited, 
+a.item-current:active,  a.warn-current:active,
+a.item-current:hover,   a.warn-current:hover {
+    display: block;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    color: black;
+    text-decoration: none;
+    background: #fff;
+    border-color: #888;
+    margin: 0;
+    border-style: solid;
+    border-width: 1px;
+    padding-right: 10px;
+    padding-left: 10px;
+    padding-bottom: 2px;
+    text-align: left;
+}
+
+a.item:active, a.item-current:active, 
+a.warn:active, a.warn-current:active {
+    display: block;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    color: white;
+    background: black;
+    text-decoration: none;
+    border-color: #000;
+    margin: 0;
+    border-style: solid;
+    border-width: 1px;
+    padding-right: 10px;
+    padding-left: 10px;
+    padding-bottom: 2px;
+    text-align: left;
+}
+
+a.item:hover, a.item-current:hover,
+a.warn:hover, a.warn-current:hover {
+    display: block;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    color: black;
+    text-decoration: none;
+    background: #ccc;
+    border-color: #888;
+    margin: 0;
+    border-style: solid;
+    border-width: 1px;
+    padding-right: 10px;
+    padding-left: 10px;
+    padding-bottom: 2px;
+    text-align: left;
+}
+
+a.item:link, a.item-current:link, 
+a.warn:link, a.warn-current:link {
+    display: block;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    color: black;
+    background: #e8f3e1;
+    text-decoration: none;
+    text-align: left;
+    border-color: #e8f3e1;
+    margin: 0;
+    border-style: solid;
+    border-width: 1px;
+    padding: 0 10px 2px;
+}
+
+a.item:visited, a.item-current:visited, 
+a.warn:visited, a.warn-current:visited {
+    display: block;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    color: black;
+    background: #e8f3e1;
+    text-decoration: none;
+    border-color: #e8f3e1;
+    margin: 0;
+    border-style: solid;
+    border-width: 1px;
+    padding-right: 10px;
+    padding-left: 10px;
+    padding-bottom: 2px;
+    text-align: left;
+}
+
+a.section-title {
+    display: inline-block;
+    color: #6CA345;
+    padding-left: 5px;
+    padding-right: 5px;
+    line-height: 18px;
+    font-weight: bold;
+}
+
+a.sl {
+    color: green;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background: #e8f3e1;
+}
+
+a.update {
+    color: red;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background: #98d36e;
+}
+
+a.warn:link,    a.warn-current:link, 
+a.warn:visited, a.warn-current:visited, 
+a.warn:active,  a.warn-current:active,
+a.warn:hover,   a.warn-current:hover {
+    background-image: url("/server-common/warn.gif");
+    background-repeat: no-repeat;
+    background-position: 10px;
+    padding-left: 25px;
+}
+
+a:active {
+    color: #606060;
+    text-decoration: none;
+}
+
+a:hover {
+    color: #F00;
+    text-decoration: none;
+}
+
+a:link {
+    color: #006921;
+    text-decoration: none;
+}
+
+a:visited {
+    color: #063;
+    text-decoration: none;
+}
+
+body {
+    background-color: #FFF;
+    color: #000;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    border-width: 0;
+}
+
+body, body.main {
+    margin: 5px 20px 5px 5px;
+}
+
+body, body.menu {
+    margin: 0 0 0 2px;
+}
+
+body.header {
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background-color: #bee6a2;
+    margin: 0;
+}
+
+body.main {
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background-color: #fff;
+    color: #000;
+}
+
+body.menu {
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background-color: #e8f3e1;
+}
+
+div.error, div.sme-error, span.error, span.sme-error {
+    color: red;
+    background-color: #f9f9f9;
+    border-width: 1px;
+    border-style: solid;
+    border-color: red;
+    padding: 10px;
+    border-radius: 10px;
+    
+}
+
+form {
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+h1, .h1 {
+    font-family: Verdana, Tahoma, sans-serif;
+    color: #333;
+    font-size: 18px;
+    margin-bottom: 4px;
+    margin-top: 12px;
+}
+
+h2, .h2 {
+    font-family: Verdana, Tahoma, sans-serif;
+    color: #333;
+    font-size: 14px;
+    margin-bottom: 3px;
+    margin-top: 12px;
+}
+
+h3, .h3 {
+    font-family: Verdana, Tahoma, sans-serif;
+    color: #333;
+    font-size: 12px;
+    margin-bottom: 2px;
+    margin-top: 12px;
+}
+
+h4, .h4 {
+    font-family: Verdana, Tahoma, sans-serif;
+    font-style: italic;
+    color: #333;
+    font-size: 12px;
+    margin-bottom: 2px;
+    margin-top: 10px;
+}
+
+hr.sectionbar {
+    color: #8ebe43;
+    background-color: #8ebe43;
+    height: 1px;
+    width: 80%;
+    border: 0;
+}
+
+hr.sme-copyrightbar {
+    color: #8ebe43;
+    background-color: #8ebe43;
+    height: 1px;
+    width: 100%;
+    border: 0;
+}
+
+input.action {
+    margin-left: 0;
+    background-color: #bee6a2;
+    color: darkgreen;
+    border-radius: 8px;
+    border: 2px solid #4CAF50;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+input.action2 {
+    margin-left: 0;
+    color: black;
+    background-color: #d4d0c8;
+    display: flex;
+    justify-content: center;
+}
+
+input.action:active {
+    background-color: #3e8e41;
+    transform: translate(-2px,2px);
+}
+
+input.action:hover {
+    background-color: #3e8e41;
+    color: white;
+}
+
+input.field-with-error {
+    background-color: #fd9e7e;
+}
+
+label.field-with-error {
+    color: #dd7e5e;
+}
+
+ol, ul, li {
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    font-weight: normal;
+    color: black;
+}
+
+p {
+    margin-top: 8px;
+    margin-bottom: 2px;
+}
+
+span {
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+}
+
+span.data {
+    padding: 2px;
+    font-weight: bold;
+    margin-left: 0;
+}
+
+span.data2 {
+    padding: 2px;
+}
+
+span.label {
+    display: inline-block;
+    font-weight: bold;
+    background-color: #e8f3e1;
+    width: 30%;
+    text-align: right;
+}
+
+span.label2 {
+    display: inline-block;
+    font-weight: bold;
+    background-color: #e8f3e1;
+    text-align: right;
+}
+
+table, tr, td, div, p, form {
+    color: #000;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+}
+
+table.sme-border {
+    border-collapse: collapse;
+    border: 2px solid #cccccc;
+    empty-cells: show;
+    margin: 5px;
+}
+
+table.sme-layout {
+    border-collapse: collapse;
+    margin-bottom: 2px;
+    margin-top: 2px;
+}
+
+table.sme-noborders {
+    padding: 0;
+    margin: 0 0 20px;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+}
+
+td {
+    text-align: left;
+}
+
+td.darkgrey {
+    background-color: #888;
+}
+
+td.label {
+    font-weight: bold;
+    background-color: #e8f3e1;
+    width: 30%;
+    text-align: right;
+}
+
+td.menu-cell {
+    margin: 0;
+    padding: 0;
+}
+
+td.section {
+    padding-bottom: 2px;
+    padding-top: 8px;
+    background-color: #e8f3e1;
+}
+
+td.sme-border a, td.sme-border-right a, td.sme-border-center a {
+    font-size: 10px;
+}
+
+td.sme-border, td.sme-border-warning, td.sme-border-right, td.sme-border-center {
+    border: 1px solid #cccccc;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    font-weight: normal;
+    color: #000;
+    text-align: left;
+    padding: 3px 2px;
+}
+
+td.sme-border-center {
+    text-align: center;
+}
+
+td.sme-border-right {
+    text-align: right;
+}
+
+td.sme-border-warning {
+    color: red;
+}
+
+/* sme-layout* : Used for top-level layout */
+ table.sme-layout {
+     border-collapse: collapse;
+     margin-bottom: 2px;
+     margin-top: 2px;
+}
+ tr.sme-layout {
+     border: 1px solid #dddddd;
+}
+ td.sme-layout {
+     border: 1px solid #dddddd;
+}
+
+td.sme-noborders-content {
+    text-align: left;
+    vertical-align: top;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+}
+
+td.sme-noborders-info, div.sme-noborders-info {
+    text-align: left;
+    vertical-align: top;
+}
+
+td.sme-noborders-label {
+    font-weight: bold;
+    text-align: right;
+    background-color: #e8f3e1;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    width: 33%;
+}
+
+td.sme-radiobutton {
+    width: 30px;
+}
+
+th.sme-border {
+    border: 1px;
+    background-color: #bee6a2;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+    font-weight: bold;
+    color: #000;
+    text-align: center;
+    vertical-align: bottom;
+    padding: 3px;
+}
+
+th.sme-layout {
+    border: 1px;
+    background-color: #e8f3e1;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 9pt;
+    font-weight: bold;
+    color: #000;
+    text-align: right;
+    padding: 4px;
+}
+
+tr.sme-layout {
+    border: 1px;
+}
+
+ul {
+    list-style-type: circle;
+}
+
+div.success, span.success {
+     color: #006400;
+     border-width: 1px;
+     border-style: solid;
+     border-color: #006400 ;
+     padding: 10px;
+     border-radius: 10px;
+}
+
+div.roundcube #roundcube{
+	width:100%;
+	height:600px;
+}

root/usr/share/smanager/themes/default/public/css/new_sme.css

@@ -0,0 +1,293 @@
+/* css/sme-password.css */
+.input-container {
+    position: relative;
+    display: inline-block;
+}
+.sme-password {
+    padding-right: 5px; /* Ensure space for the toggle icon */
+}
+.toggle-password {
+    position: absolute;
+    right: 4px; /* Position it towards the right */
+    top: 50%; /* Center vertically */
+    transform: translateY(-50%); /* Adjust for exact centering */
+    cursor: pointer;
+    width: 20px; /* Set the width of the icon */
+    height: 20px; /* Set the height of the icon */
+}
+
+.module {
+    padding: 20px;
+    border: 1px ;
+    border-radius: 10px;
+    background-color: #f9f9f9;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    margin-left: 10px !important;
+    margin-top: 10px;
+}
+
+.sme-copyright {
+    color: #777;
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 10px;
+}
+
+.logo {
+    height: 142%;
+    width: auto;
+    margin-left: -16px;
+}
+
+.gradient-panel {
+    width: 100%;
+    height: 40px;
+    background: linear-gradient(to right, white ,#c0e7a5 );
+    display: flex;
+    align-items: center;
+    position: relative;
+}
+
+.sme-error {
+    color: #d9534f;
+    display: block;
+    background-color: #fff;
+    border-width: 1px;
+    border-style: solid;
+    border-color: red;
+    padding: 2px;
+    font-weight: bold;
+    margin-bottom: 15px;
+}
+
+.login-button {
+    position: absolute;
+    left: 7%;
+    transform: translateX(-50%);
+    background-color: #4caf50b8;
+    color: white !important;
+    border: none;
+    padding: 8px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 14px;
+    cursor: pointer;
+    border-radius: 4px;
+    margin-left: 77%;
+}
+
+.sme-warning {
+    color: orange;
+    display: block;
+    background-color: #fff;
+    border-width: 1px;
+    border-style: solid;
+    border-color: orange;
+    padding: 2px;
+}
+
+.infobar {
+    font-family: Verdana, Tahoma, sans-serif;
+    font-size: 11px;
+    background-color: #98d36e;
+}
+
+.module-content {
+    font-family: Georgia, Garamond, serif;
+    font-size: 13px;
+    line-height: 1.2;
+    color: #555;
+}
+
+#help-button {
+    text-decoration: none;
+    font-size: 20px;
+    padding: 8px;
+    background-color: #98d36e;
+    border-radius: 4px;
+    color: #000;
+}
+
+/*
+#module {
+    padding: 20px;
+    border: 1px;
+    border-radius: 10px;
+    background-color: #f9f9f9;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+*/
+
+#container {
+    max-width: 100%;
+    position: relative;
+    margin: auto;
+}
+
+#header2 {
+    width:96%;
+    margin-left: 1px;
+    margin-top: 4px;
+}
+
+#main {
+    margin-left: 200px;
+    padding: 10px;
+}
+
+#central {
+    padding: 5px;
+}
+
+#footer {
+    padding-left: 5px;
+}
+
+#header {
+    width: 100%;
+    margin: auto;
+}
+
+#navigation {
+    width: 190px;
+    position: absolute;
+    padding: 5px;
+    background-color: #E8F3E1;
+    overflow: auto;
+    margin-top:20px;
+}
+
+#footer img {
+     float: right;
+     position: fixed;
+     /*margin-left: 40%;*/
+}
+
+.flag-style {
+     position: absolute;
+     transform: translateY(-50%);
+     left: 95%;
+    /*right: 20px;
+    */
+     width: 24px;
+     height: 14px;
+     display: inline-block;
+     vertical-align: middle;
+}
+
+
+/* flag container*/
+#flag-container span {
+	font-size: 24px;
+    display: flex;                     /* Allows for easy centering */
+    justify-content: center;           /* Center horizontally */
+    align-items: center;               /* Center vertically */
+    width: 100%;                       /* Full width of parent */
+    height: 24px;                      /* Set a fixed height */
+    border: 1px solid #ccc;            /* Light gray border */
+    border-radius: 5px;                /* Rounded corners */
+    cursor: default;                   /* Prevent text cursor */
+
+}
+
+.fallback-box {
+  display: inline-block; /* Make it inline-block to fit around the content */
+  border: 2px solid gray; /* Change the border color as desired */
+  padding: 10px; /* Add some padding */
+  border-radius: 10px; /* Round the corners of the box */
+  font-size: 60px; /* Adjust size if needed */
+  margin-top: 10px; /* Add some margin */
+  text-align: center; /* Center text inside the box */
+}
+
+ table.sme-border {
+     border-collapse: collapse;
+     border: 2px solid #cccccc;
+     empty-cells: show;
+     margin: 5px 5px 5px 2px;
+}
+ td.sme-border, td.sme-border-warning, td.sme-border-right, td.sme-border-center {
+     border: 1px solid #cccccc;
+     font-family: Verdana, Arial, Helvetica, sans-serif;
+     font-size: 10px;
+     font-weight: normal;
+     color: #000000;
+     text-align: left;
+     padding-left: 2px;
+     padding-right: 2px;
+     padding-top: 3px;
+     padding-bottom: 3px;
+}
+ td.sme-border-warning {
+     color: red;
+}
+ td.sme-border-right {
+    text-align: right;
+}
+ td.sme-border-center {
+    text-align: center;
+}
+ th.sme-border {
+     border: 1px solid #cccccc;
+     background-color: #bee6a2;
+     font-family: Verdana, Arial, Helvetica, sans-serif;
+     font-size: 10px;
+     font-weight: bold;
+     color: #000000;
+     text-align: center;
+     vertical-align: bottom;
+     padding-left: 3px;
+     padding-right: 3px;
+     padding-top: 3px;
+     padding-bottom: 3px;
+    /*border-width: 1px;
+     border-style: solid;
+     border-color: #F2F0EE #75736E #75736E #F2F0EE ;
+    */
+}
+ td.sme-border a, td.sme-border-right a, td.sme-border-center a {
+     font-size: 10px;
+}
+
+th.sme-layout {
+border: 1px solid #8ebe43;
+background-color: #bee6a2;
+    }
+table.sme-border {
+border: 2px solid #dddddd;
+    }
+td.sme-border-warning,
+td.sme-border-right,
+td.sme-border-center {
+border: 1px solid #dddddd;
+    }
+td.sme-border-right {text-align: right;}
+td.sme-border-center {text-align: center;}
+th.sme-border {
+border: 1px solid #dddddd;
+background-color: #e8f3e1;
+    }
+    
+.no-visited-state {
+     color: inherit;
+    /* Or specify the desired color */
+     text-decoration: none;
+    /* Or any other style you want to reset */
+}
+
+.no-visited-state:visited {
+     color: inherit;
+    /* Or specify the desired color */
+     text-decoration: none;
+    /* Or any other style you want to reset */
+}
+
+#busy-indicator {
+	display: none;
+	margin-top: 10px;
+	font-weight: bold;
+	color: red;
+}
+.busy {
+	cursor: wait; /* Change the cursor to a 'wait' cursor */
+}

root/usr/share/smanager/themes/default/public/js/datetime.js

@@ -0,0 +1,101 @@
+document.addEventListener('DOMContentLoaded', function() {
+  var select = document.getElementById('time_mode_select');
+  var ntpSection = document.getElementById('ntp_section');
+  var manualSection = document.getElementById('manual_section');
+
+  function toggleSections() {
+    if (select.value === 'dat_manually_set') {
+      ntpSection.style.display = 'none';
+      manualSection.style.display = 'block';
+    } else {
+      ntpSection.style.display = 'block';
+      manualSection.style.display = 'none';
+    }
+  }
+
+  select.addEventListener('change', toggleSections);
+  toggleSections(); // Set initial state
+});
+
+document.addEventListener('DOMContentLoaded', function() {
+  // Parse the initial server time from the input value
+  const clockElement = document.getElementById('real-time-clock');
+  if (!clockElement) return;
+
+  // Get the initial server time from the input's value
+  let serverTime = new Date(clockElement.value.replace(' ', 'T'));
+
+  function updateDateTime() {
+    // Format the date/time string as desired
+    const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+    const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+
+    const dayOfWeek = daysOfWeek[serverTime.getDay()];
+    const month = months[serverTime.getMonth()];
+    const day = serverTime.getDate();
+    const year = serverTime.getFullYear();
+
+    let hours = serverTime.getHours();
+    const ampm = hours >= 12 ? 'PM' : 'AM';
+    hours = hours % 12 || 12;
+
+    const minutes = serverTime.getMinutes().toString().padStart(2, '0');
+    const seconds = serverTime.getSeconds().toString().padStart(2, '0');
+
+    const dateTimeString = `${dayOfWeek}, ${month} ${day}, ${year} ${hours}:${minutes}:${seconds} ${ampm}`;
+    clockElement.value = dateTimeString;
+
+    // Advance serverTime by one second
+    serverTime.setSeconds(serverTime.getSeconds() + 1);
+  }
+
+  updateDateTime();
+  setInterval(updateDateTime, 1000);
+});
+
+document.addEventListener('DOMContentLoaded', function() {
+  const btn = document.getElementById('test-ntp-btn');
+  const input = document.getElementById('ntpserver');
+  const result = document.getElementById('ntp-test-result');
+
+  btn.addEventListener('click', function() {
+    const server = input.value.trim();
+    result.className = 'ntp-test-result'; // reset
+
+    if (!server) {
+      result.textContent = "Please enter a server address.";
+      result.classList.add('ntp-test-error');
+      return;
+    }
+    result.textContent = "Testing...";
+    result.classList.add('ntp-test-wait');
+
+    fetch('/smanager/datetimet', {
+      method: 'POST',
+      headers: {'Content-Type': 'application/json'},
+      body: JSON.stringify({ ntpserver: server })
+    })
+    .then(response => {
+      if (!response.ok) {
+        // HTTP error, e.g., 404, 500
+        throw new Error(`HTTP error: ${response.status} ${response.statusText}`);
+      }
+      return response.json();
+    })
+    .then(data => {
+      result.className = 'ntp-test-result'; // reset
+      if (data.success) {
+        result.textContent = `Server time: ${data.time}`;
+        result.classList.add('ntp-test-success');
+      } else {
+        result.textContent = `Error: ${data.error}`;
+        result.classList.add('ntp-test-error');
+      }
+    })
+    .catch(error => {
+      // Network error or thrown HTTP error
+      result.className = 'ntp-test-result ntp-test-error';
+      result.textContent = `Request failed: ${error.message}`;
+    });
+  });
+});

root/usr/share/smanager/themes/default/public/js/emailsettings.js

@@ -0,0 +1,5 @@
+//
+//Generated by: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20
+//
+$(document).ready(function() {
+});

root/usr/share/smanager/themes/default/public/js/qmailanalog.js

@@ -0,0 +1,25 @@
+document.addEventListener('DOMContentLoaded', function() {
+    const analysisType = document.getElementById('analysis_type');
+    const messageIdGroup = document.getElementById('message_id_group');
+    const emailAddressGroup = document.getElementById('email_address_group');
+
+    // Initially hide both controls
+    messageIdGroup.style.display = 'none';
+    emailAddressGroup.style.display = 'none';
+
+    analysisType.addEventListener('change', function() {
+        // Hide both controls first
+        messageIdGroup.style.display = 'none';
+        emailAddressGroup.style.display = 'none';
+
+        // Show the relevant control based on the selected option
+        switch(this.value) {
+            case 'trace_message':
+                messageIdGroup.style.display = 'block';
+                break;
+            case 'user_activity':
+                emailAddressGroup.style.display = 'block';
+                break;
+        }
+    });
+});

root/usr/share/smanager/themes/default/public/js/sme-password.js

@@ -28,4 +28,16 @@ $(document).ready(function() {
         var iconSrc = inputType === 'password' ? 'images/visible.png' : 'images/visible-slash.png';
         $(this).attr('src', iconSrc);
     });
+});
+
+// and busy cursor 
+$(document).ready(function() {
+	// Handle form submission for any form
+	$('form').on('submit', function(event) {
+	  // Disable all submit buttons and update their labels
+	  $(this).find('button[type="submit"]').prop('disabled', true).text('Please wait...');
+	  $(this).find('input[type="submit"]').prop('disabled', true).val('Please wait...');
+	  // Add busy cursor
+	  $('body').addClass('busy');
+	});
 });

root/usr/share/smanager/themes/default/templates/back_tape_configure.html.ep

@@ -74,10 +74,8 @@
 	</p><br>
 
 	%= hidden_field 'Function' => $bac_datas->{'function'}
-    <div class='center'>
 	%= submit_button $c->l('bac_UPDATE_CONF'), class => 'action'
-    </div>
 
     % end
 </div>
-% end
+% end

root/usr/share/smanager/themes/default/templates/back_tape_restore.html.ep

@@ -30,10 +30,8 @@
 
 	%= hidden_field 'Function' => $bac_datas->{'function'}
 
-    <div class='center'>
 	%= submit_button $c->l('bac_RESTORE_FROM_TAPE'), class => 'action'
-    </div>
 
     % end
 </div>
-% end
+% end

root/usr/share/smanager/themes/default/templates/back_workstn_configure.html.ep

@@ -44,12 +44,10 @@
 	</span></p>
 
 	%= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    <div class='center'>
 	%= submit_button $c->l('NEXT'), class => 'action'
-    </div>
 
     % end
 
 </div>
 
-% end
+% end

root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep

@@ -148,9 +148,7 @@
 
 	%= hidden_field 'Function' => $bac_datas->{function}
 	%= hidden_field 'VFSType' => $bac_datas->{vfstype}
-    <div class='center'>
 	%= submit_button $c->l('bac_UPDATE_CONF'), class => 'action'
-    </div>
     % end
 </div>
-% end
+% end

root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep

@@ -38,9 +38,7 @@
 	</span><br><br>
 
 	%= hidden_field 'Function' => $bac_datas->{'function'}
-    <div class='center'>
 	%= submit_button $c->l('bac_RESTORE_FROM_WORKSTN'), class => 'action'
-    </div>
     % end
 </div>
-% end
+% end

root/usr/share/smanager/themes/default/templates/back_workstn_restore1.html.ep

@@ -29,9 +29,7 @@
 	%=l 'bac_YOU_MUST_REBOOT'
 	</p>
 	%= hidden_field 'Function' => $bac_datas->{'function'}
-    <div class='center'>
 	%= submit_button $c->l('bac_REBOOT'), class => 'action'
-    </div>
     % end
 </div>
 

root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep

@@ -39,12 +39,10 @@
 	</span><br>
 	<br>
 	%= hidden_field 'Function' => $bac_datas->{'function'}
-    <div class='center'>
 	%= submit_button $c->l('PERFORM'), class => 'action'
-    </div>
 
     % end
 
 </div>
 
-% end
+% end

root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep

@@ -41,9 +41,7 @@
 	%= hidden_field 'Backupset' => $bac_datas->{'backupset'}
 	%= hidden_field 'Filterexp' => $bac_datas->{'filterexp'}
 
-    <div class='center'>
 	%= submit_button $c->l('PERFORM'), class => 'action'
-    </div>
 
     % end
 

root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore2.html.ep

@@ -24,9 +24,7 @@
 
     %= form_for '/backupd' => (method => 'POST') => begin
 	%= hidden_field 'Function' => $bac_datas->{'function'}
-    <div class='center'>
 	%= submit_button $c->l('NEXT'), class => 'action'
-    </div>
 
     % end
 

root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep

@@ -44,10 +44,8 @@
 
 	<br><br>
 	%= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    <div class='center'>
 	%= submit_button $c->l('bac_VERIFY'), class => 'action'
-    </div>
 
     % end
 </div>
-% end
+% end

root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep

@@ -28,10 +28,8 @@
 
     %= hidden_field 'Function' => $bac_datas->{'function'}
 
-    <div class='center'>
     %= submit_button $c->l('NEXT'), class => 'action'
-    </div>
 
     % end
 </div>
-% end
+% end

root/usr/share/smanager/themes/default/templates/backdown.html.ep

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

root/usr/share/smanager/themes/default/templates/backup.html.ep

@@ -70,12 +70,10 @@
 	</span></p>
 
 	<br>
-    <div class='center'>
-	%= submit_button $c->l('PERFORM'), class => 'action'
-    </div>
-
+ 	%= submit_button $c->l('PERFORM'), class => 'action'
+ 
     % end
 
 </div>
 
-% end
+% end

root/usr/share/smanager/themes/default/templates/datetime.html.ep

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

root/usr/share/smanager/themes/default/templates/emailaccess.html.ep

@@ -1,57 +0,0 @@
-% layout 'default', title => "Sme server 2 - emailaccess";
-
-% content_for 'module' => begin
-<div id='module' class='module emailaccess-panel'>
-
-    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $mai_datas
-	</p>
-    % }
-    
-    % if ( stash 'error' ) {
-    	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-    %}
-
-    <h1><%= $title%></h1>
-
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
-
-	%=l 'mai_DESC_POP_ACCESS_CONTROL'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_POP_ACCESS_CONTROL'
-	</span><span class=input>
-	% param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
-	%= select_field 'POPAccess' => $c->get_pop_opt(), class => 'input'
-	</span></p>
-
-	%=l 'mai_DESC_IMAP_ACCESS_CONTROL'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
-	</span><span class=input>
-	% param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
-	%= select_field 'IMAPAccess' => $c->get_imap_opt(), class => 'input'
-	</span></p>
-
-	%=l 'mai_DESC_WEBMAIL'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_WEBMAIL'
-	</span><span class=input>
-	% param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
-	%= select_field 'WebMail' => $c->get_webmail_opt(), class => 'input'
-	</span></p>
-
-    % 	my $btn = l('SAVE');
-	%= submit_button "$btn", class => 'action'
-
-	%= hidden_field 'trt' => 'ACC'
-    % end    
-
-</div>
-%end

root/usr/share/smanager/themes/default/templates/emaildeliver.html.ep

@@ -1,92 +0,0 @@
-% layout 'default', title => "Sme server 2 - emaildeliver";
-
-% content_for 'module' => begin
-<div id='module' class='module emaildeliver-panel'>
-
-    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $mai_datas
-	</p>
-    % }
-    
-    % if ( stash 'error' ) {
-    	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-    %}
-
-    <h1><%= $title%></h1>
-
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
-
-	<h2>
-	%=l 'mai_TITLE_UNKNOWN'
-	</h2>
-
-	%=l 'mai_DESC_UNKNOWN'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_UNKNOWN'
-	</span><span class=input>
-	% param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser';
-	%= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => 'input'
-	</span></p>
-
-	<hr class='menubar' />
-	<h2>
-	%=l 'mai_TITLE_DELEGATE'
-	</h2>
-
-	%=l 'mai_DESC_DELEGATE'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_DELEGATE'
-	</span><span class=input>
-	% param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer';
-	%= text_field 'DelegateMailServer', class => 'input'
-	</span></p>
-
-	<hr class='sectionbar' />
-	<h2>
-	%=l 'mai_TITLE_SMARTHOST'
-	</h2>
-
-	%=l 'mai_DESC_SMARTHOST'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SMARTHOST'
-	</span><span class=input>
-	% param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost';
-	%= text_field 'SMTPSmartHost', class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS'
-	</span><span class=input>
-	% param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
-	%= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID'
-	</span><span class=input>
-	% param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
-	%= text_field 'SMTPAUTHPROXY_Userid', class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD'
-	</span><span class=input>
-	% param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
-	%= password_field 'SMTPAUTHPROXY_Passwd', class => 'input'
-	</span></p>
-
-    % 	my $btn = l('SAVE');
-	%= submit_button "$btn", class => 'action'
-
-	%= hidden_field 'trt' => 'DEL'
-    % end    
-
-</div>
-%end

root/usr/share/smanager/themes/default/templates/emailfilter.html.ep

@@ -1,101 +0,0 @@
-% layout 'default', title => "Sme server 2 - emailfilter";
-
-% content_for 'module' => begin
-<div id='module' class='module emailfilter-panel'>
-
-    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $mai_datas
-	</p>
-    % }
-
-    % if ( stash 'error' ) {
-    	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-    %}
-
-    <h1><%= $title%></h1>
-
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
-
-	%=l 'mai_DESC_VIRUS_SCAN'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_VIRUS_SCAN'
-	</span><span class=input>
-	% param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus';
-	%= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
-	</span><br></p>
-
-	%=l 'mai_DESC_SPAM_SCAN'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SPAM_SCAN'
-	</span><span class=input>
-	% param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
-	%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SPAM_SENSITIVITY'
-	</span><span class=input>
-	% param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity';
-	%= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SPAM_TAGLEVEL'
-	</span><span class=input>
-	% param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel';
-	%= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SPAM_REJECTLEVEL'
-	</span><span class=input>
-	% param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel';
-	%= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SORTSPAM'
-	</span><span class=input>
-	% param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam';
-	%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
-	</span></p>
-
-	%=l 'mai_DESC_SPAM_SUBJECT'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SPAM_SUBJECTTAG'
-	</span><span class=input>
-	% param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag';
-	%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SPAM_SUBJECT'
-	</span><span class=input>
-	% param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject';
-	%= text_field 'SpamSubject' => class => 'input'
-	</span></p>
-
-	%=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_CONTENT_TO_BLOCK'
-	</span><span class=input>
-	% param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
-	%= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => 'input', multiple => "1"
-	</span></p>
-
-    % 	my $btn = l('SAVE');
-	%= submit_button "$btn", class => 'action'
-
-	%= hidden_field 'trt' => 'FIL'
-    % end
-
-</div>
-%end

root/usr/share/smanager/themes/default/templates/emailreceive.html.ep

@@ -1,167 +0,0 @@
-% layout 'default', title => "Sme server 2 - emailreceive";
-
-% content_for 'module' => begin
-
-% use constant FALSE => 0;
-% use constant TRUE  => 1;
-
-<div id='module' class='module emailreceive-panel'>
-
-    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $mai_datas
-	%= dumper $c->param('SMTPAuth')
-	</p>
-    % }
-
-    % if ( stash 'error' ) {
-    	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-    %}
-    
-    <h1><%= $title%></h1>
-
-    %= form_for '/emailsettingd' => (method => 'POST') => begin
-
-	%=l 'mai_DESC_MODE'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_MODE'
-	</span><span class=input>
-	% param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod';
-<!--
-	<pre>
-		%= dumper $mai_datas->{fetchmailmethod}
-		%= dumper $c->get_retrieval_opt()
-		%= param 'FetchmailMethod'
-	</pre>
--->
-	%= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => 'input'
-	</span></p>
-
-	%#=l 'mai_DESC_SMTP_AUTH_CONTROL'
-	<br />
-	%= l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client."
-	<br />
-	%= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send."
-	<br />
-	%= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send."
-	<br />
-
-	% my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-	<p><span class=label>
-		%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
-	</span><span class=input>
-    	% param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
-<!--
-	<pre>
-		%= dumper $c->get_smtp_auth_opt()
-		%= dumper $c->get_current_smtp_auth(FALSE)
-		%= dumper $c->get_db_prop("qpsmtpd","Authentication")
-		%= param 'SMTPAuth'
-	</pre>
--->
-		%= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => 'input'
-	</span></p>
-
-	% my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-	<p><span class=label>
-		%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
-	</span><span class=input>
-		% param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';
-	
-		%= select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => 'input'
-	</span></p>
-
-	%my $smtp_mesg=l('Submission port %u status:');
-	<p><span class=label>
-		%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-	</span><span class=input>
-    	% param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
-<!--
-	<pre>
-		%= dumper $c->get_smtp_ssl_auth_opt()
-		%= dumper $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE)
-		%= dumper $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE)
-		%= dumper $c->get_db_prop("uqpsmtpd","access")
-		%= param 'uSMTPAuth'
-	</pre>
--->
-	%= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => 'input'
-	</span></p>
-
-	<hr class="sectionbar" />
-	<h2>
-	%=l 'mai_TITLE_SECONDARY'
-	</h2>
-
-	%=l 'mai_DESC_SECONDARY'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SECONDARY'
-	</span><span class=input>
-	% param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer';
-	%= text_field 'SecondaryMailServer', class => 'input'
-	</span></p>
-
-	%=l 'mai_DESC_FETCH_PERIOD'
-
-	<p><span class=label>
-	%=l 'mai_LABEL_FETCH_PERIOD'
-	</span><span class=input>
-	% param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice';
-	%= select_field 'FreqOffice' => $c->fetchmail_freq(), class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_FETCH_PERIOD_NIGHTS'
-	</span><span class=input>
-	% param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside';
-	%= select_field 'FreqOutside' => $c->fetchmail_freq(), class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS'
-	</span><span class=input>
-	% param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend';
-	%= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_POP_ACCOUNT'
-	</span><span class=input>
-	% param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount';
-	%= text_field 'SecondaryMailAccount', class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_POP_PASS'
-	</span><span class=input>
-	% param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword';
-	%= password_field 'SecondaryMailPassword', class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SORT_METHOD'
-	</span><span class=input>
-	% param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader';
-	%= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => 'input'
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SORT_HEADER'
-	</span><span class=input>
-	% param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
-	%= text_field 'SecondaryMailEnvelope', class => 'input'
-	</span></p>
-
-    % 	my $btn = l('SAVE');
-	%= submit_button "$btn", class => 'action'
-
-	%= hidden_field 'trt' => 'REC'
-    % end    
-
-</div>
-%end

root/usr/share/smanager/themes/default/templates/emailsettings.html.ep

@@ -1,152 +1,70 @@
-% layout 'default', title => "Sme server 2 - emailsettings";
-
+%#
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 
+%#
+% layout 'default', title => "Sme server 2 - E-Mail", share_dir => './';
+%# css specific to this panel:
 % content_for 'module' => begin
 
 % use constant FALSE => 0;
 % use constant TRUE  => 1;
 
-<div id='module' class='module emailsettings-panel'>
+<div id="module" class="module Emailsettings-panel">
 
-    % if (config->{debug} == TRUE) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $mai_datas
-	</p>
+    % if (config->{debug} == 1) {
+	<pre>
+		%= dumper $c->current_route
+		%= dumper $mai_data->{trt}
+	</pre>
+    % }
+    
+    <h1><%=$title%></h1>
+
+    % if ( stash('modul')) {
+	%= $c->render_to_string(inline => stash('modul') );
     % }
 
-    % if ( stash 'error' ) {
-    	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-    %}
+   	%if ($c->stash('first')) {
+	    <br><p>
+		%=$c->render_to_string(inline =>$c->l($c->stash('first')))
+		</p>
 
-    <h1><%= $title%></h1>
+	%} elsif ($c->stash('success')) {
+		<div class='success '>
+				%= $c->l($c->stash('success'));
+		</div>
+		<br />
 
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-	<p><span class=label>
-	%=l 'mai_LABEL_POP_ACCESS_CONTROL'
-	</span><span class=data2>
-	%= $c->get_current_pop3_access( TRUE )
-	</span></p>
+	%} elsif ($c->stash('error')) { 
+	   <div class='sme-error'>
+				%= $c->l($c->stash('error'));
+    	</div>
+		<br />
+	%}
 
-	<p><span class=label>
-	%=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
-	</span><span class=data2>
-	%= $c->get_current_imap_access( TRUE )
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_WEBMAIL'
-	</span><span class=data2>
-	%= $c->get_current_webmail_status( TRUE )
-	</span></p>
-
-    % 	my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
-    <div class='center'>
-	%= submit_button "$btn", class => 'action'
-    </div>
-
-	%= hidden_field 'trt' => 'ACC'
-    % end    
-
-        <hr class="sectionbar" />
-    
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-	<p><span class=label>
-	%=l 'mai_LABEL_VIRUS_SCAN'
-	</span><span class=data2>
-	%= $c->get_virus_status(TRUE)
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SPAM_SCAN'
-	</span><span class=data2>
-	%= $c->get_spam_status(TRUE)
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT'
-	</span><span class=data2>
-	%= $c->get_patterns_status(TRUE)
-	</span></p>
-
-    % 	my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
-    <div class='center'>
-	%= submit_button "$btn", class => 'action'
-    </div>
-
-	%= hidden_field 'trt' => 'FIL'
-    % end    
-
-        <hr class="sectionbar" />
-
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-	<p><span class=label>
-	%=l 'mai_LABEL_MODE'
-	</span><span class=data2>
-	%= $mai_datas->{fetchmailmethod}
-	</span></p>
+	%#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 ($mai_data->{trt} eq "FRONT") {
+		%= include 'partials/_mai_FRONT'
+	%}
+	
+	% if ($mai_data->{trt} eq "ACC") {
+		%= include 'partials/_mai_ACC'
+	%}
+	
+	% if ($mai_data->{trt} eq "FIL") {
+		%= include 'partials/_mai_FIL'
+	%}
+	
+	% if ($mai_data->{trt} eq "REC") {
+		%= include 'partials/_mai_REC'
+	%}
+	
+	% if ($mai_data->{trt} eq "DEL") {
+		%= include 'partials/_mai_DEL'
+	%}
 	
-	% my $smtp_mesg;
 
-	% $smtp_mesg=l('SMTP port %u allow client to authenticate:');
-	<p><span class=label>
-		%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
-	</span><span class=data2>
-	%= $c->get_current_smtp_auth( TRUE )
-	</span></p>
-
-	% $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
-	<p><span class=label>
-		%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
-	</span><span class=data2>
-	%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE )
-	</span></p>
-
-	% $smtp_mesg=l 'Submission port %u status:';
-	<p><span class=label>
-		%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
-	</span><span class=data2>
-	%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE )
-	</span></p>
-	<br />
-
-    % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
-    <div class='center'>
-	%= submit_button "$btn", class => 'action'
-    </div>
-
-	%= hidden_field 'trt' => 'REC'
-    % end    
-
-        <hr class="sectionbar" />
-
-    %= form_for 'emailsettings' => (method => 'POST') => begin
-	<p><span class=label>
-	%=l 'mai_LABEL_UNKNOWN'
-	</span><span class=data2>
-	%= $c->get_emailunknownuser_status( TRUE )
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_DELEGATE'
-	</span><span class=data2>
-	%= $c->get_value('DelegateMailServer')
-	</span></p>
-
-	<p><span class=label>
-	%=l 'mai_LABEL_SMARTHOST'
-	</span><span class=data2>
-	%= $c->get_value('SMTPSmartHost')
-	</span></p>
-
-    % 	my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
-    <div class='center'>
-	%= submit_button "$btn", class => 'action'
-    </div>
-
-	%= hidden_field 'trt' => 'DEL'
-    % end    
 
 </div>
 %end

root/usr/share/smanager/themes/default/templates/exception_development.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="central" class="sme-error">
+<div id="central" class="sme-error module">
     <p><br>dev<br> Oups !!! 
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
@@ -14,4 +14,4 @@
     </p>
 </div>
 
-% end
+% end

root/usr/share/smanager/themes/default/templates/initial.html.ep

@@ -8,7 +8,7 @@
 	</p>
     % }
 
-<div id='central' class='central initial-panel'>
+<div id='central' class='central initial-panel module'>
 
     % if ( stash 'error' ) {
     	<br><div class=sme-error>

root/usr/share/smanager/themes/default/templates/layouts/default.html.ep

@@ -2,29 +2,24 @@
     PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
     "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<!-- default +jquery -->
 <head>
 <title><%= $title %></title>
     <link rel="made" href="mailto:bugs%40koozali.org">
     <meta name="copyright" content="(head.tmpl)Copyright 2003-2004 Mitel Corporation">
-    %= stylesheet '/css/sme_core.css'
-    %= stylesheet '/css/sme_main.css'
-    %= stylesheet '/css/sme_menu.css'
-    %= stylesheet '/css/styles.css'
-    %= stylesheet '/css/sme-password.css'
+
+    %= stylesheet '/css/new_sme.css'
+    %= stylesheet '/css/new-sme-main.css'
+
     %= content_for 'head_contrib'
-    % if (config 'hasJquery') {
-	%= include 'partials/_js_imports'
-	%= include 'common_js'
+    % if (config 'hasJquery') { 
+		%= include 'partials/_js_imports'
+		%= include 'common_js'
     % }
-    %= content_for 'refresh'
-    
+
+    %= content_for 'refresh' 
     %= stylesheet '/js/datatables.min.css'
-
 	%= javascript '/js/datatables.min.js'
-
 	%= stylesheet '/js/jquery-ui.min.css'
-
 	%= javascript '/js/jquery-ui.min.js'
 	%= javascript '/js/dataTables.buttons.min.js'
 	%= javascript '/js/jszip.min.js'
@@ -37,26 +32,23 @@
 
 	<link rel="stylesheet" href="/smanager/css/flag-icon.min.css">
 	%= stylesheet '/css/sme-jquery-overrides.css'
-	
-	<style>
-	#busy-indicator {
-		display: none;
-		margin-top: 10px;
-		font-weight: bold;
-		color: red;
-	}
-	.busy {
-		cursor: wait; /* Change the cursor to a 'wait' cursor */
-	}
-	</style>
 
+	%# panel specific css file 
+	% my $controller = stash('controller');
+	% if ($controller) {
+		% my $css_path = "css/$controller.css";
+		%# Use the url_for helper to generate the correct static file URL
+		% if (app->static->file($css_path)) {
+		  <link rel="stylesheet" href="<%= url_for("/$css_path") %>">
+		% }
+	% }
 
 </head>
-
 <body>
-%   if ( not defined $c->session->{lang} ) {
-%	SrvMngr::init_session ( $c );
-%    }
+	%   if ( not defined $c->session->{lang} ) {
+		% SrvMngr::init_session ( $c );
+	%    }
+
     <div id="header">
 	%= include 'partials/_header'
         % if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
@@ -65,42 +57,40 @@
     </div>
 
     <div id="container">
+		% if (config 'hasJquery') {
+			%= content 'js_toggleMenu'
+		% }
 
-	% if (config 'hasJquery') {
-	    %= content 'js_toggleMenu'
-	% }
-
-	<div id="navigation" class="col-md-3">
-	    %= include 'partials/_nav_menu'
-%	if ( $c->is_logged_in ) {
-	    %= include 'partials/_user_menu'
-%	}
-%	if ( $c->is_admin ) {
-	    %= include 'partials/_navig2'
-%	}
-	</div>
-	<div id="main" class="col-md-9">
-
-	    %= include 'partials/_info'
-
-	    % if (flash 'success') {
-		<br><div class=success>
-		%= $c->render_to_string(inline => flash 'success') 
+		<div id="navigation" class="col-md-3 module">
+			%= include 'partials/_nav_menu'
+			% if ( $c->is_logged_in ) {
+				%= include 'partials/_user_menu'
+			% }
+			% if ( $c->is_admin ) {
+				%= include 'partials/_navig2'
+			% }
 		</div>
-	    % }
-	    % if ( flash 'warning' ) {
-		<br><div class=sme-warning>
-		%= $c->render_to_string(inline => flash 'warning') 
+
+		<div id="main" class="col-md-9">
+			%= include 'partials/_info'
+			% if (flash 'success') {
+			<br><div class="success module">
+			%= $c->render_to_string(inline => flash 'success') 
+			</div>
+			% }
+			% if ( flash 'warning' ) {
+			<br><div class="sme-warning  module">
+			%= $c->render_to_string(inline => flash 'warning') 
+			</div>
+			%}
+			% if ( flash 'error' ) {
+			<br><div class="sme-error module">
+			%= $c->render_to_string(inline => flash 'error') 
+			</div>
+			%}
+			%= content 'module'
+			%= include 'partials/_footer'
 		</div>
-	    %}
-	    % if ( flash 'error' ) {
-		<br><div class=sme-error>
-		%= $c->render_to_string(inline => flash 'error') 
-		</div>
-	    %}
-	    %= content 'module'
-	    %= include 'partials/_footer'
-	</div>
     </div>
 
     % if (config 'hasJquery') {
@@ -108,23 +98,17 @@
 	%= content 'js_togglePassword'
     % }
 
-%= javascript '/js/sme-dataTable-setup.js'
-
-	<script>
-		$(document).ready(function() {
-			// Handle form submission for any form
-			$('form').on('submit', function(event) {
-				// Disable the submit button
-				$(this).find('button[type="submit"], input[type="submit"]').prop('disabled', true);
-				// Show the busy indicator
-//				$('#busy-indicator').show();
-				
-				// Change the cursor to "wait"
-				$('body').addClass('busy');
-			});
-		});
-	</script>
+	%= javascript '/js/sme-dataTable-setup.js'
 
+	%# Specific panel js code
+	% $controller = stash('controller');
+	% if ($controller) {
+		% my $js_path  = "js/$controller.js";
+		%# Use the url_for helper to generate the correct static file URL
+		% if (app->static->file($js_path)) {
+		  <script src="<%= url_for("/$js_path") %>"></script>
+		% }
+	% }
   
 </body>
 </html>

root/usr/share/smanager/themes/default/templates/module.html.ep

@@ -1,20 +1,27 @@
 % layout 'default', title => "Sme server 2 - module";
 
 % content_for 'module' => begin
-
+%= stylesheet '/css/module.css'
 <div id='module' class='module module-panel'>
     % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	</p>
+        <p>
+            <strong>Debug Info:</strong>
+            <pre><%= dumper $c->current_route %></pre>
+        </p>
     % }
-    % if ( stash 'error' ) {
-    	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
-    %}
-    <h1> <%=$title %></h1><br>
-    %= $c->render_to_string( inline => stash 'modul' )
+    
+    % if (stash 'error') {
+        <div class="sme-error">
+            <strong>Error:</strong><br>
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
+    
+    <h1><%= $title %></h1>
+    
+    <div class="module-content">
+        <%= $c->render_to_string(inline => stash 'modul') %>
+    </div>
 </div>
 
-%end
+% end

root/usr/share/smanager/themes/default/templates/not_found.development.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="central" class="sme-error">
+<div id="central" class="sme-error module">
     <p><br>dev<br> Oups !!! 
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
@@ -12,4 +12,4 @@
     </p>
 </div>
 
-% end
+% end

root/usr/share/smanager/themes/default/templates/not_found.html.ep

@@ -1,5 +1,5 @@
 % layout 'defaultlight', title => 'Sme server 2 - Error P';
-<div id='central' class='central not_found-panel'>
+<div id='central' class='central not_found-panel module'>
     <p><br><br>
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
@@ -7,4 +7,4 @@
     <br><br>
     	%= link_to Welcome => '/'
     </p>
-</div>
+</div>

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

@@ -85,7 +85,8 @@
 
     %= form_for '/domains' => (method => 'POST') => begin
 
-		<HR class="sectionbar">
+		<!-- <HR class="sectionbar">-->
+		<br>
 
 		% my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
 
@@ -119,4 +120,4 @@
 
 
 
-</div>
+</div>

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

@@ -1,5 +1,5 @@
-<div id="footer">
-<HR class="sme-copyrightbar">
+<div id="footer" class="module">
+<!--<HR class="sme-copyrightbar">-->
 <a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
 <font class="sme-copyright">
 %	if ( $c->is_logged_in && $c->is_admin) {

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

@@ -1,128 +1,12 @@
-<style>
-#h2l1 {
-    display: flex;                  /* Use flexbox layout */
-    justify-content: space-between; /* Space between child elements */
-    align-items: center;           /* Center items vertically */
-}
 
-#h2e11 {
-    flex: 1;                       /* Allow the first div to take available space on the left */
-}
-
-#h2e12 { 
-    display: flex;                 /* Make this div a flex container */
-    align-items: center;           /* Vertically center content in this div */
-    margin-left: 20px;            /* Add margin to the left of this div */
-}
-
-#flag-container {
-    display: flex;                 /* Make this div a flex container */
-    align-items: center;           /* Vertically center content in this div */
-    margin-left: 20px;             /* Add margin to the left of the flag container */
-    padding-right: 20px;           /* Add padding to the right side of the flag container */
-}
-
-.flag-icon {
-    width: 43px;
-    font-size: 20px;
-}
-
-#legacy-button button {
-    background-color: #98d36e; /* Button background color */
-    font-weight: lighter;      /* Lighter text for the button */
-    color: #063;               /* Button text color */
-    padding: 5px 10px;         /* Padding for the button */
-    border: none;              /* Remove default button border */
-    border-radius: 4px;        /* Rounded corners for button */
-    cursor: pointer;           /* Change cursor on hover */
-}
-
-#legacy-button button:hover {
-    background-color: #82c961; /* Change color on hover */
-}
-
-.infobar {
-    display: flex;                  /* Use flexbox for alignment */
-    justify-content: space-between; /* Space between child elements */
-    align-items: center;            /* Center items vertically */
-    padding: 10px;                  /* Adjust padding as desired */
-}
-
-#h2e21 {
-    flex: 1;                        /* Allow the first div to take available space on the left */
-}
-
-#h2e22 {
-    display: flex;                  /* Make this div a flex container */
-    justify-content: center;        /* Center the help button */
-    align-items: center;            /* Center vertically */
-    flex: none;                    /* Prevent this div from growing */
-    position: relative;             /* Relative position for centering */
-    width: 100px;                  /* Set a width for the help button container */
-}
-
-#h2e23 {
-    margin-left: auto;              /* Push the third div to the right */
-}
-
-.login-button {
-    background-color: #98d36e;     /* Button background color */
-    font-weight: bold;              /* Bold text */
-    color: #ffffff;                 /* Button text color */
-    padding: 8px 12px;              /* Adjust padding for button height */
-    border: none;                   /* Remove default border */
-    border-radius: 4px;             /* Rounded corners */
-    cursor: pointer;                /* Change cursor on hover */
-}
-
-.login-button:hover {
-    background-color: #82c961;      /* Change color on hover */
-}
-
-#help-button {
-    text-decoration: none;          /* Remove underline from link */
-    font-size: 20px;                /* Adjust font size as needed */
-    padding: 8px 12px;              /* Add padding to the help link */
-    background-color: #98d36e;      /* Background for visibility */
-    border-radius: 4px;             /* Rounded corners */
-    color: #000;                    /* Button text color */
-}
-
-#help-button:hover {
-    background-color: #82c961;      /* Change background on hover */
-}
-</style>
-
-<div id="header2" class="hd2">
-    <div id="h2l1"> 
-		<div id="h2e11">
-			<a target='_blank' href="http://www.koozali.org"><img src="images/smeserver_logo.jpg" height="40" alt="SME Server"></a>
-		</div> 
-
-		<div id="h2e22">
-			<button type='button'class="login-button"><a id="help-button" target="_parent" href="manual">?</a></button>
-		</div>
-    
-        <div id="h2e12">
-			<button type='button' class="login-button"><a id="legacy-button" href="/server-manager" target='_blank'>Legacy SM</a></button>
-        </div>
-		<div id="h2e23">
-			% if ( not defined $c->session->{username} ) {
-				<button type='button' class="login-button"><a target="_parent" href="login">Login</a></button>
-			% } else {
-				<button type='button' class="login-button"><a target="_parent" href="logout"><%= $c->session->{username} %> Logout</a></button>
-			% }
-		</div>
-		<div id="flag-container">
-			<!-- The flag icon will be inserted here -->
-		</div>
-    </div>
-	<div id="h2l2" class="infobar"> 
-		<div id="h2e21">
-			<b>
-				<%= session 'SystemName' %>@<%= session 'DomainName' %></b> 
-		</div>
-		
-		
+<div id="header2" class="hd2 module gradient-panel">
+	<img src="images/KoozaliServerManager.png" alt="Koozali Logo" class="logo" >
+	% if ( not defined $c->session->{username} ) {
+		<button type='button' class="login-button"><a class = "no-visited-state" target="_parent" href="login">Login</a></button>
+	% } else {
+		<button type='button' class="login-button"><a class = "no-visited-state" target="_parent" href="logout">Logout <%= $c->session->{username} %></a></button>
+	% }
+	<div id="flag-container" class = "flag-style">
+		<!--			 The flag icon will be inserted here -->
 	</div>
-</div>
+</div>

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

@@ -1,16 +1,16 @@
 <%     use POSIX qw(strftime); %>
 <div id="info">
     <% if (! $c->session->{PwdSet} ) { %>
-	<div class="sme-error"><h5>
+	<div class="sme-error module"><h5>
         Warning: you have not yet changed the default system password.</h5></div>
     <% } %>
     <% if ( $c->is_unsafe ) { %>
-	<div class="sme-error"><h5>
+	<div class="sme-error module"><h5>
         Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
         may leave your system in an unknown state!</h5></div>
     <% } %>
     <% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %>
-	<div class="sme-error"><h5>
+	<div class="sme-error module"><h5>
         Warning: Development or debug mode enabled AND public access is offered !
         </h5></div>
     <% } %>

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

@@ -1,42 +1,40 @@
 <div id='ln_add'>
 
 	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
-	
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
-	%if ($ret{'ret'} eq "") {
-   	
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <div class='success'>
-	       <h2> Operation Status Report</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-		</div>
-	   %} else { 
-	   <div class='sme-error'>
-	       <h2> Operation Status Report - Error</h2>
-			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
-    	</div>
-	%}
+	% if ($c->app->config->{debug}) {
+	<p>
+		%= dumper { ret_data => \%ret }
+	</p>  
+	% }
+
+	% if ($ret{ret} eq "") {
+		%=l "ln_FIRSTPAGE_DESC"
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
+	<br>
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
 	<br />
     % my $btn = l('ADD');
-    % my $network_db = esmith::NetworksDB->open();
-    
+    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
+
    % if (config->{debug} == 1) {
 	<p>
 	%= dumper $c->current_route
 	%= dumper $c->stash("ret")
 	</p>
     % }
-     
+
     %= form_for '/localnetworksb' => (method => 'POST') => begin
 		<h2>
 		%=l "ln_ADD_TITLE"
@@ -66,5 +64,4 @@
 			</p>
 	%end
 
-</div>
-
+</div>

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

@@ -6,12 +6,12 @@
     % my $router = $ln_datas->{router};
     
    % if (config->{debug} == 1) {
-	<p>
-	%= dumper $c->current_route
-	%= dumper $c->stash("ret")
-    %= dumper %$ln_datas
-    %= dumper $deletehosts
-	</p>
+	<pre>
+		%= dumper $c->current_route
+		%= dumper $c->stash("ret")
+		%= dumper %$ln_datas
+		%= dumper $deletehosts
+	</pre>
     % }
      
     %= form_for '/localnetworkse' => (method => 'POST') => begin
@@ -56,4 +56,4 @@
 
 	%end
 
-</div>
+</div>

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

@@ -3,39 +3,30 @@
     %= form_for '/localnetworksa' => (method => 'POST') => begin
 
 	% my $retref= $c->stash("ret");
-	% my %ret;
-	% unless (length($retref)) {%ret = (ret=>"");}
-	% else {%ret = %$retref;}
+	% my %ret = $retref ? %$retref : (ret => "");
+	% my @vars = split(/,/, $ret{vars} // '');
+	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
 
-    % if (config->{debug} == 1) {
-	<p>
-		%= dumper "Ret:".$ret{ret};
-	</p>	
-	%}
+	% if ($c->app->config->{debug}) {
+	<pre>
+		%= dumper { ret_data => \%ret }
+	</pre>  
+	% }
 
-	% my @vars = split(",",$ret{vars});
-	% my $var1 = @vars[0];
-	% my $var2 = @vars[1];
-	% my $var3 = @vars[2];
-	% my $var4 = @vars[3];
-	% my $var5 = @vars[4];
-	% my $var6 = @vars[5];
-	% my $var7 = @vars[6];
-
-
-	%if ($ret{ret} eq "") {
+	% if ($ret{ret} eq "") {
 		%=l "ln_FIRSTPAGE_DESC"
-	%} elsif (index($ret{ret},"SUCCESS") != -1) {
-	   <div class='success'>
-	       <h2> Operation Status Report</h2>
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
-		</div>
-	   %} else { 
-	   <div class='sme-error'>
-	       <h2> Operation Status Report - Error</h2>
-		%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
-    	</div>
-	%}
+	% } elsif (index($ret{ret},"SUCCESS") != -1) {
+	<br>
+	<div class='success'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% } else { 
+	<br>
+	<div class='sme-error'>
+		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+	</div>
+	% }
+
 
 	<p>
 	<br>
@@ -103,4 +94,4 @@
 		</table>
 			%= hidden_field 'trt' => $ln_datas->{trt}
 	%}
-</div>
+</div>