smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- Get cifs workstation backup restore to show backup sets [SME: 12645]
  Add lex file for roundcubepanel to provide lex environment for lex strings
This commit is contained in:
Brian Read
2025-07-27 20:24:40 +01:00
parent 237f2f21ab
commit 837b855101
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
View File

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

1
root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Roundcubepanel/roundcubepanel_en.lex Normal file
View File

@@ -0,0 +1 @@

6
smeserver-manager.spec
View File

@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 11.0.0
%define release 109
%define release 110
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -146,6 +146,10 @@ 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]