michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add API function to get the release, and clean up version function

Browse Source
This commit is contained in:
Jamie Cameron
2021-08-25 17:38:40 -07:00
parent 18d0c858c8
commit 2daa5e845d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebminCore.pm
View File

File diff suppressed because one or more lines are too long

21
web-lib-funcs.pl
View File

@@ -4123,9 +4123,8 @@ sub get_webmin_version
{
my ($ui_format_dev) = @_;
if (!$get_webmin_version) {
open(VERSION, "<$root_directory/version") || return 0;
($get_webmin_version = <VERSION>) =~ tr/\r|\n//d;
close(VERSION);
$get_webmin_version = &read_file_contents("$root_directory/version");
$get_webmin_version =~ s/\r|\n//g;
}
# Format dev version nicely
if ($ui_format_dev && length($get_webmin_version) == 13) {
@@ -4136,6 +4135,22 @@ else {
}
}
=head2 get_webmin_version_release
Returns the release version of Webmin currently being run, such as 2. Or an
empty string if there is no release.
=cut
sub get_webmin_version_release
{
if (!defined($get_webmin_version_release)) {
$get_webmin_version_release = &read_file_contents(
"$root_directory/release") || "";
$get_webmin_version_release =~ s/\r|\n//g;
}
return $get_webmin_version_release;
}
=head2 get_module_acl([user], [module], [no-rbac], [no-default])
Returns a hash containing access control options for the given user and module.