michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-22 12:10:28 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Give more control over GPL vs pro messages

Browse Source
This commit is contained in:
Jamie Cameron
2020-06-25 20:48:26 -07:00
parent 647f387b22
commit 19fd20deee
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webmin/system_info.pl
View File

@@ -110,12 +110,17 @@ foreach my $a (@ann) {
# Check if this announcement should be skipped
next if ($hide{$a->{'file'}});
next if ($a->{'skip_virtualmin_pro'} && $vmpro);
next if ($a->{'skip_virtualmin_gpl'} && %vminfo && !$vmpro);
next if ($a->{'skip_cloudmin_pro'} && $cmpro);
next if ($a->{'skip_cloudmin_gpl'} && %cminfo && !$cmpro);
next if ($a->{'skip_pro'} && ($vmpro || $cmpro));
next if ($a->{'atleast_version'} && $ver < $a->{'atleast_version'});
next if ($a->{'atmost_version'} && $ver > $a->{'atmost_version'});
next if ($a->{'user_types'} && $a->{'user_types'} !~ /\Q$utype\E/);
next if ($a->{'beta'} && !$gconfig{'beta_announce'});
next if ($a->{'depends'} && !&foreign_check($a->{'depends'}));
next if ($a->{'installed'} &&
&foreign_installed($a->{'installed'}, 1) != 2);
(my $id = $a->{'file'}) =~ s/\.//;
my $info = { 'id' => "announce_".$id,