michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2021-07-06 12:16:21 -07:00
parent 37a4f57196 aa4bfae569
commit 1b065b5474
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webmin/webmin-lib.pl
View File

@@ -1209,12 +1209,20 @@ if (&foreign_check("acl")) {
# New Webmin version is available, but only once per day
my $now = time();
my %raccess = &get_module_acl('root');
my %rdisallow = map { $_, 1 } split(/\s+/, $raccess{'disallow'});
my %access = &get_module_acl();
my %disallow = map { $_, 1 } split(/\s+/, $access{'disallow'});
if (&foreign_available($module_name) && !$noupdates &&
!$gconfig{'nowebminup'} && !$disallow{'upgrade'}) {
my %allow = map { $_, 1 } split(/\s+/, $access{'allow'});
my %role = map { $_, 1 } split(/\s+/, $access{'role'});
if (&foreign_available($module_name) && !$gconfig{'nowebminup'} && !$noupdates &&
(
$allow{'upgrade'} || $role{'upgrader'} ||
(!$disallow{'upgrade'} && !$rdisallow{'upgrade'})
)
) {
if (!$config{'last_version_check'} ||
$now - $config{'last_version_check'} > 24*60*60) {
$now - $config{'last_version_check'} > 24*60*60) {
# Cached last version has expired .. re-fetch
my ($ok, $version) = &get_latest_webmin_version();
if ($ok) {