Fix Virtualmin version detection virtualmin/virtualmin-gpl#597

webmin · Jul 26, 2023 · bf6a13e · bf6a13e
1 parent 6a29d8b
commit bf6a13e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/authentic-init.pl b/authentic-init.pl
@@ -817,14 +817,8 @@ sub check_pro_package
 {
     my ($id) = @_;
     if (&foreign_available("virtual-server") && $id eq "vm") {
-        my %virtualmin = &get_module_info("virtual-server");
-        if ($virtualmin{'version'} =~ /pro/is) {
-            return 1;
-        } elsif ($virtualmin{'version'} =~ /gpl/is) {
-            return 0;
-        } else {
-            return 1;
-        }
+        &foreign_require("virtual-server");
+        return $virtual_server::virtualmin_pro ? 1 : 0;
     } elsif (&foreign_available("server-manager") && $id eq "cm") {
         my %cloudmin = &get_module_info("server-manager");
         if ($cloudmin{'version'} =~ /pro/is || $cloudmin{'version'} =~ /real/is) {

diff --git a/authentic-lib.pl b/authentic-lib.pl
@@ -695,13 +695,11 @@ sub get_sysinfo_vars
 
         # Virtualmin version
         if ($has_virtualmin) {
+            &foreign_require("virtual-server");
+            my ($major, $minor, $build) = &virtual_server::get_module_version_and_type(1);
             my ($vs_license, $__virtual_server_version);
-
             $vs_license               = check_pro_package('vm');
-            $__virtual_server_version = (defined(@$info_arr[2]) ? @$info_arr[2]->{'vm_version'} : undef);
-            $__virtual_server_version =~ s/.gpl//igs;
-            $__virtual_server_version =~ s/.pro//igs;
-
+            $__virtual_server_version = ("$major.$minor".(defined($build) ? ".$build" : '')."");
             $virtualmin_version = (
                 product_version_update($__virtual_server_version, 'v') . " " . (
                     $vs_license eq '0' ? '' :