michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-18 04:22:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jamie Cameron
2014-04-25 22:57:09 -07:00
parent 4470edb19b 50df0471d9
commit dbcb5e0198
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
WebminCore.pm
View File

@@ -30,8 +30,11 @@ push(@EXPORT, qw($config_directory $var_directory $remote_error_handler %month_t
push(@EXPORT, qw(&theme_post_save_domain &theme_post_save_domains &theme_post_save_server &theme_select_server &theme_select_domain &theme_post_save_folder &theme_post_change_modules &theme_address_button &theme_virtualmin_ui_rating_selector &theme_virtualmin_ui_show_cron_time &theme_virtualmin_ui_parse_cron_time &theme_virtualmin_ui_html_editor_bodytags &theme_virtualmin_ui_show_html_editor));
$called_from_webmin_core = 1;
do "web-lib.pl";
do "ui-lib.pl";
my $script;
$script = -r '../web-lib.pl' ? '../web-lib.pl' : './web-lib.pl';
do $script;
$script = -r '../ui-lib.pl' ? '../ui-lib.pl' : './ui-lib.pl';
do $script;
1;

2
webmin/refresh_modules.cgi
View File

@@ -1,7 +1,7 @@
#!/usr/local/bin/perl
# Refresh the list of visible modules
require 'webmin-lib.pl';
require './webmin-lib.pl';
&ReadParse();
&ui_print_unbuffered_header(undef, $text{'refreshmods_title'}, "", undef, 0, 1);

2
webmin/webmin-lib.pl
View File

@@ -1035,7 +1035,7 @@ if ($cache) {
}
my $temp = &transname();
my $perl = &get_perl_path();
system("$perl $root_directory/oschooser.pl $file $temp 1");
system("$root_directory/oschooser.pl $file $temp 1");
my %rv;
&read_env_file($temp, \%rv);
$rv{'time'} = time();