* Sat Jul 26 2025 Brian Read <brianr@koozali.org> 11.0.0-110.sme

- Get cifs workstation backup restore to show backup sets [SME: 12645]
  Add lex file for roundcubepanel to provide lex environment for lex strings

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

@@ -25,6 +25,8 @@ use esmith::AccountsDB::UTF8;
 use esmith::util;
 use File::Basename;
 use File::Find;
+# Set to avoid using link counts as it may not work for cifs shares.
+$File::Find::dont_use_nlink = 1;
 use File::Path qw(make_path remove_tree);
 use esmith::Backup;
 use esmith::BackupHistoryDB; #no UTF8 and not in use 
@@ -1670,7 +1672,7 @@ sub get_Backupset_options () {
     my $err;
     $mntdir = "/$smbshare" if ($VFSType eq 'usb');
     my $setbackuplist = sub {
-
+		$c->app->log->info("File presented: $_");
         if ($_ =~ /\.dar/) {
             my $dir = $File::Find::dir;
             my $backupref;
@@ -1696,6 +1698,7 @@ sub get_Backupset_options () {
     }
 
     # Finding existing backups
+    
     find { wanted => \&$setbackuplist, untaint => 1, untaint_pattern => qr|^([-+@\w\s./]+)$| }, $mntbkdir;
     my %blabels = ();
     my @list;
@@ -1703,6 +1706,7 @@ sub get_Backupset_options () {
     foreach $key (sort keys %backupfiles) {
         my $labkey = $mntbkdir . '/' . $backupfiles{$key}[0] . '/' . $backupfiles{$key}[1];
         $blabels{$labkey} = $backupfiles{$key}[1] . " (" . $backupfiles{$key}[0] . ")";
+        $c->app->log->info("Pushing $blabels{$labkey} to $labkey");
         push @list, [ "$blabels{$labkey}" => "$labkey" ];
     } ## end foreach $key (sort keys %backupfiles)
     $error_message .= $c->bunmount($mntdir, $VFSType);
@@ -2129,4 +2133,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/Datetime-Custom.pm

@@ -255,7 +255,7 @@ sub validate_change_datetime {
     }
 
     if (($minute < 0) || ($minute > 59)) {
-        return $c->l('datINVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
+        return $c->l('dat_INVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
     }
     my $second = $c->param('second');
 

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

@@ -132,7 +132,7 @@ sub do_update {
             # Untaint groupName before use in system()
             ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
             system("/sbin/e-smith/signal-event", "group-create", "$groupName") == 0
-                or $result .= $c->l('qgp_CREATE_ERROR') . "\n";
+                or $result .= $c->l('grp_CREATE_ERROR') . "\n";
         } ## end if (!$result)
 
         if (!$result) {
@@ -161,7 +161,7 @@ sub do_update {
             # Untaint groupName before use in system()
             ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
             system("/sbin/e-smith/signal-event", "group-modify", "$groupName") == 0
-                or $result .= $c->l('qgp_MODIFY_ERROR') . "\n";
+                or $result .= $c->l('grp_MODIFY_ERROR') . "\n";
         } ## end if (!$result)
 
         if (!$result) {
@@ -414,4 +414,4 @@ sub validate_description {
         return ($c->l('FM_ERR_UNEXPECTED_DESC'));
     }
 } ## end sub validate_description
-1
+1

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

@@ -176,7 +176,7 @@ sub do_update {
             $result .= $res unless $res eq 'OK';
 
             if (!$result) {
-                $result = $c->l('usrUSER_CREATED') . ' ' . $user;
+                $result = $c->l('usr_USER_CREATED') . ' ' . $user;
                 $usr_datas{trt} = 'SUC';
             }
         } ## end if (!$result)
@@ -361,7 +361,7 @@ sub lock_account {
         $adb = esmith::AccountsDB::UTF8->open();
         return 'OK';
     } else {
-        return $c->l('NO_SUCH_USER', $user);
+        return $c->l('usr_NO_SUCH_USER', $user);
     }
 } ## end sub lock_account
 
@@ -380,13 +380,13 @@ sub remove_account {
 
         if (system("/sbin/e-smith/signal-event", "user-delete", $user)) {
             $adb = esmith::AccountsDB::UTF8->open();
-            return $c->l("ERR_OCCURRED_DELETING");
+            return $c->l("usr_ERR_OCCURRED_DELETING");
         }
         $adb = esmith::AccountsDB::UTF8->open();
         $adb->get($user)->delete;
         return 'OK';
     } else {
-        return $c->l('NO_SUCH_USER', $user);
+        return $c->l('usr_NO_SUCH_USER', $user);
     }
 } ## end sub remove_account
 
@@ -413,7 +413,7 @@ sub reset_password {
         $adb = esmith::AccountsDB::UTF8->open();
         return 'OK';
     } else {
-        return $c->l('NO_SUCH_USER', $user);
+        return $c->l('usr_NO_SUCH_USER', $user);
     }
 } ## end sub reset_password
 
@@ -788,7 +788,7 @@ sub system_change_password {
     if ($result == 0) {
         return 'OK';
     } else {
-        return $c->l("Error occurred while modifying password for admin.", 'First');
+        return $c->l("Error occurred while modifying password for admin.");
     }
 } ## end sub system_change_password
-1
+1

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

@@ -21,6 +21,7 @@ use SrvMngr qw( theme_list init_session validate_password );
 sub main {
     my $c         = shift;
     my %pwd_datas = ();
+    my $title = $c->l("pwd_ACCOUNT_PASSWORD_CHANGE");
 
     if ($c->is_logged_in) {
         $pwd_datas{Account} = $c->session->{username};
@@ -34,7 +35,7 @@ sub main {
 
         # request already treated or outdated
         if ($c->pwdrst->{$name}{confirmed} != 1 or $c->pwdrst->{$name}{date} < time()) {
-            $mess = $c->l('use_INVALID_REQUEST') . ' -step 1-';
+            $mess = $c->l('pwd_INVALID_REQUEST') . ' -step 1-';
         }
 
         if ($mess) {
@@ -47,7 +48,7 @@ sub main {
         $pwd_datas{Account}            = $name;
         $pwd_datas{trt}                = 'RESET';
         $pwd_datas{jwt}                = $jwt;
-        $c->flash(success => $c->l('use_OK_FOR_RESET'));
+        $c->flash(success => $c->l('pwd_OK_FOR_RESET'));
     } ## end else [ if ($c->is_logged_in) ]
     $c->stash(pwd_datas => \%pwd_datas);
     $c->render('userpassword');
@@ -74,7 +75,7 @@ sub change_password {
 
         # request already treated or outdated
         if ($c->pwdrst->{$name}{confirmed} != 2 or $c->pwdrst->{$name}{date} < time()) {
-            $mess = $c->l('use_INVALID_REQUEST') . ' -step 2-';
+            $mess = $c->l('pwd_INVALID_REQUEST') . ' -step 2-';
         }
 
         if (!$name or $c->is_logged_in or $name ne $acctName) {
@@ -158,7 +159,7 @@ sub change_password {
 sub reset_password {
     my ($c, $trt, $user, $password, $oldpassword) = @_;
     my $ret;
-    return $c->l('usr_TAINTED_USER') unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/));
+    return $c->l('pwd_TAINTED_USER') unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/));
     $user = $1;
     my $adb  = esmith::AccountsDB::UTF8->open();
     my $acct = $adb->get($user);
@@ -171,7 +172,7 @@ sub reset_password {
 
     if (system("/sbin/e-smith/signal-event", "password-modify", $user)) {
         $adb = esmith::AccountsDB::UTF8->open();
-        return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
+        return $c->l("pwd_ERR_OCCURRED_MODIFYING_PASSWORD");
     }
     $adb = esmith::AccountsDB::UTF8->open();
     return 'OK';
@@ -199,4 +200,4 @@ sub check_password {
     return validate_password($c, $strength, $password);
 } ## end sub check_password
 
-1;
+1;

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

@@ -34,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');
@@ -78,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

@@ -4,6 +4,12 @@ package SrvMngr::Controller::Yum;
 # heading     : System
 # description : Software installer
 # navigation  : 4000 500
+
+    #$if_admin->get('/yum')->to('yum#main')->name('yum');
+    #$if_admin->post('/yum')->to('yum#do_display')->name('yumd1');
+    #$if_admin->get('/yumd')->to('yum#do_display')->name('yumd');
+    #$if_admin->post('/yumd')->to('yum#do_update')->name('yumu');
+
 #
 # routes : end
 #----------------------------------------------------------------------
@@ -23,20 +29,20 @@ my $dnf_status_file = '/var/cache/dnf/dnf.status';
 #use File::stat;
 our %dbs;
 
-for (qw(available installed updates)) {
-    $dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
-        or die "Couldn't open dnf_$_ DB\n";
-}
-
-for (qw(repositories)) {
-    $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";
+	for (qw(available installed updates)) {
+		$dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
+			or die "Couldn't open dnf_$_ DB\n";
+	}
+
+	for (qw(repositories)) {
+		$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
+			or die "Couldn't open yum_$_ DB\n";
+	}
     my %yum_datas = ();
     my $title     = $c->l('yum_FORM_TITLE');
     my $dest      = 'yum';
@@ -63,6 +69,15 @@ sub do_display {
     my $rt        = $c->current_route;
     my $trt       = ($c->param('trt') || 'STAT');
     $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
+	for (qw(available installed updates)) {
+		$dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
+			or die "Couldn't open dnf_$_ DB\n";
+	}
+
+	for (qw(repositories)) {
+		$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
+			or die "Couldn't open yum_$_ DB\n";
+	}
     my %yum_datas = ();
     my $title     = $c->l('yum_FORM_TITLE');
     my ($notif, $dest) = '';
@@ -113,6 +128,16 @@ sub do_update {
     $c->app->log->info($c->log_req);
     my $rt        = $c->current_route;
     my $trt       = $c->param('trt');
+    $cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
+	for (qw(available installed updates)) {
+		$dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
+			or die "Couldn't open dnf_$_ DB\n";
+	}
+
+	for (qw(repositories)) {
+		$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
+			or die "Couldn't open yum_$_ DB\n";
+	}
     my %yum_datas = ();
     $yum_datas{trt} = $trt;
     my $title = $c->l('yum_FORM_TITLE');
@@ -456,4 +481,4 @@ sub show_yum_log {
     my $yum_log = $cdb->get_prop_and_delete('dnf', 'LogFile');
     return $out;
 } ## end sub show_yum_log
-1;
+1;

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

@@ -153,4 +153,11 @@ 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',
+'mai_REC_panel_action_was_successful' => 'Email receive settings saved sucessfully',
+
+'mai_SMTP_port_authenticate' => 'Smtp port %u allow client to authenticate:',
+'mai_SMTP_port_(25)' => '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.',
+'mai_SMTP_Submission' => 'Smtp submission port (587) will require starttls, then authenticate to send.',
+'mai_SMTPS_port_(465)' => 'Smtps port (465) will require implicit ssl/tls then authenticate to send.',
+'mai_SMTPS_SSL/TLS' => 'Smtps ssl/tls auth: port %u status:',
+'mai_Submission_port' => 'Submission port %u status:'

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Roundcubepanel/roundcubepanel_en.lex

@@ -0,0 +1 @@
+

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Userpassword/userpassword_en.lex

@@ -19,3 +19,5 @@
 'pwd_PASSWORD_CHANGE_SUCCESS' => 'Your password has been successfully changed.',
 'pwd_DESCRIPTION' => '<P>To change your account password, please fill out the following form. You will need to provide the name of your account, your old password, and your desired new password. (You must type the new password twice.)</P><P>If you cannot change your password because you have forgotten the old one, your local system administrator can reset your password using the <EM>server manager</EM>.</P>',
 'pwd_DESCRIPTION_RESET' => '<P>To reset your account password, please fill out the following form. You will need to provide your desired new password. (You must type it twice.)</P><P>In cas of problem, your local system administrator can reset your password using the <EM>server manager</EM>.</P>',
+'pwd_PASSWORD_DESCRIPTION' => 'The password must be composed of at least twelve characters with uppercase and lowercase letters, numbers and non-alphanumeric characters.',
+'pwd_PASSWORD_WIKI' => "If you want to know more about passwords, then please refer to the <a href='https://wiki.koozali.org/Useful_Commands#Password_strength'>Wiki</a>",

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

@@ -89,21 +89,21 @@
 		
 		% my $smtp_mesg;
 
-		% $smtp_mesg=l('SMTP port %u allow client to authenticate:');
+		% $smtp_mesg=l('mai_SMTP_port_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:');
+		% $smtp_mesg=l('mai_SMTPS_SSL/TLS');
 		<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:';
+		% $smtp_mesg=l 'mai_Submission_port';
 		<p><span class=label>
 			%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
 		</span><span class=data2>

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

@@ -38,14 +38,14 @@
 
 		%#=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."
+		%= l "mai_SMTP_port_(25)"
 		<br />
-		%= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send."
+		%= l "mai_SMTPS_port_(465)"
 		<br />
-		%= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send."
+		%= l "mai_SMTP_Submission"
 		<br />
 
-		% my $smtp_mesg=l('SMTP port %u allow client to authenticate:');
+		% my $smtp_mesg=l('mai_SMTP_port_authenticate');
 		<p><span class=label>
 			%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
 		</span><span class=input>

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

@@ -25,6 +25,12 @@
     %  my $btn = l('pwd_PASSWORD_CHANGE');
     %  my $url = '/userpassword';
 	%= $c->render_to_string( inline => l('pwd_DESCRIPTION'));
+	
+	<p>
+    <%= $c->render_to_string( inline => l('pwd_PASSWORD_DESCRIPTION')) %><br />
+    <%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI')) %>
+    </p>
+
     % if ( $pwd_datas->{trt} eq 'RESET' ) {
     %     $btn = l('pwd_PASSWORD_RESET');
     %     $url = '/userpasswordr';

smeserver-manager.spec

@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 103
+%define release 110
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -146,6 +146,30 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Sat Jul 26 2025 Brian Read <brianr@koozali.org> 11.0.0-110.sme
+- Get cifs workstation backup restore to show backup sets [SME: 12645]
+  Add lex file for roundcubepanel to provide lex environment for lex strings 
+
+* Wed Jul 16 2025 Brian Read <brianr@koozali.org> 11.0.0-109.sme
+- A few more error message corrections [SME: 13078]
+
+* Wed Jul 16 2025 Brian Read <brianr@koozali.org> 11.0.0-108.sme
+- Password change panel - add extra descriptive text [SME: 13081]
+
+* Tue Jul 15 2025 Brian Read <brianr@koozali.org> 11.0.0-107.sme
+- Email Settings panel: Fix lex strings with long names and no prefix [SME: 13080]
+
+* Mon Jul 14 2025 Brian Read <brianr@koozali.org> 11.0.0-106.sme
+- Datetime panel: Typo in error message - missing _ [SME: 13078]
+- ditto user accounts panel                         [SME: 13078]
+- ditto groups panel                                [SME: 13078]
+
+* Mon Jul 14 2025 Brian Read <brianr@koozali.org> 11.0.0-105.sme
+- Adjust db opening in Software install panel [SME: 13077]
+
+* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-104.sme
+- Fix DB not open in Workgrouyp panel sometimes. [SME: 13070]
+
 * Thu Jul 03 2025 Brian Read <brianr@koozali.org> 11.0.0-103.sme
 - Fix a couple of typos [SME: 13065]