diff --git a/usermin/index.cgi b/usermin/index.cgi index 84b4b0aca..7a9447540 100755 --- a/usermin/index.cgi +++ b/usermin/index.cgi @@ -49,10 +49,9 @@ if (!$miniserv{'root'} && !-d $miniserv{'root'}) { exit; } -$ver = &get_usermin_version(); &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0, &help_search_link("usermin", "google"), undef, undef, - &text('index_version', &get_usermin_version(1))); + &text('index_version', &get_usermin_version(1, 1))); @links = ( "edit_access.cgi", "edit_bind.cgi", diff --git a/usermin/usermin-lib.pl b/usermin/usermin-lib.pl index 0c78f163b..7477763bf 100755 --- a/usermin/usermin-lib.pl +++ b/usermin/usermin-lib.pl @@ -57,26 +57,35 @@ sub put_usermin_miniserv_config &write_file($usermin_miniserv_config, \%usermin_miniserv_config_cache); } -=head2 get_usermin_version +=head2 get_usermin_version([format_dev_version], [include_release]) Returns the version number of Usermin on this system. =cut sub get_usermin_version { -my ($ui_format_dev) = @_; +my ($ui_format_dev, $inc_release_version) = @_; local %miniserv; &get_usermin_miniserv_config(\%miniserv); open(VERSION, "<$miniserv{'root'}/version"); local $version = ; close(VERSION); $version =~ s/\r|\n//g; +my $release_version = ""; +# Usermin minor version +if ($inc_release_version) { + my $usermin_version_release = read_file_contents("$miniserv{'root'}/release") || ""; + $usermin_version_release =~ s/\r|\n//g; + $release_version = "-".$usermin_version_release + if ($usermin_version_release > 1); + } + # Format dev version nicely if ($ui_format_dev && length($version) == 13) { - return substr($version, 0, 5) . "." . substr($version, 5, 5 - 1) . "." . substr($version, 5 * 2 - 1); + return substr($version, 0, 5) . "." . substr($version, 5, 5 - 1) . "." . substr($version, 5 * 2 - 1) . $release_version; } else { - return $version; + return $version . $release_version; } }