Compare commits
2 Commits
11_0_0-108
...
master
Author | SHA1 | Date | |
---|---|---|---|
837b855101 | |||
237f2f21ab |
@@ -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;
|
@@ -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
|
@@ -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;
|
@@ -0,0 +1 @@
|
||||
|
@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
|
||||
%define name smeserver-manager
|
||||
Name: %{name}
|
||||
%define version 11.0.0
|
||||
%define release 108
|
||||
%define release 110
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -146,6 +146,13 @@ 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]
|
||||
|
||||
|
Reference in New Issue
Block a user