michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jamie Cameron
2025-04-25 16:51:05 -07:00
parent cef76798f8 4f046c1d6d
commit 8bd079f52f
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebminCore.pm
View File

@@ -30,7 +30,7 @@ push(@EXPORT, qw(&unique));
push(@EXPORT, qw($config_directory $var_directory $remote_error_handler %month_to_number_map %number_to_month_map $webmin_feedback_address $default_lang $default_charset $module_index_name $module_index_link %in $in @in $progress_callback_prefix $progress_callback_url $wait_for_debug $wait_for_input @matches $theme_no_table $webmin_logfile $pragma_no_cache));
# Functions defined in themes
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 &theme_post_change_theme &theme_pre_change_theme &theme_fonts &theme_css_inline &theme_forgot_url));
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 &theme_post_change_theme &theme_pre_change_theme &theme_fonts &theme_css_inline &theme_forgot_url &theme_forgot_handler));
$called_from_webmin_core = 1;
do "web-lib.pl";

7
forgot.cgi
View File

@@ -7,9 +7,12 @@ $no_acl_check++;
$trust_unknown_referers = 1;
&init_config();
&ReadParse();
$gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
my $forgot_timeout = 10;
&load_theme_library();
&error_setup($text{'forgot_err'});
$gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
&theme_forgot_handler($0) if (defined(&theme_forgot_handler));
my $forgot_timeout = 10;
$remote_user && &error($text{'forgot_elogin'});
# Check that the random ID is valid

2
forgot_form.cgi
View File

@@ -6,9 +6,11 @@ use WebminCore;
$no_acl_check++;
&init_config();
&ReadParse();
&load_theme_library();
&error_setup($text{'forgot_err'});
$gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
&theme_forgot_handler($0) if (defined(&theme_forgot_handler));
$remote_user && &error($text{'forgot_elogin'});
&ui_print_header(undef, $text{'forgot_title'}, "", undef, undef, 1, 1);

6
forgot_send.cgi
View File

@@ -10,11 +10,12 @@ $no_acl_check++;
&error_setup($text{'forgot_err'});
$gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
&theme_forgot_handler($0) if (defined(&theme_forgot_handler));
$remote_user && &error($text{'forgot_elogin'});
# Slow down the rate of password reset requests (plus needs better check by IP
# to limit the number of requests per IP in a given time period)
sleep(3);
sleep(1);
# Lookup the Webmin user
&foreign_require("acl");
@@ -75,7 +76,8 @@ $link{'id'} || &error($text{'forgot_erandom'});
&write_file("$main::forgot_password_link_dir/$link{'id'}", \%link);
my $baseurl = &get_webmin_email_url();
my $url = $baseurl.'/forgot.cgi?id='.&urlize($link{'id'});
$url = &theme_forgot_url($baseurl, $link{'id'}) if (defined(&theme_forgot_url));
$url = &theme_forgot_url($baseurl, $link{'id'}, $link{'user'})
if (defined(&theme_forgot_url));
&ui_print_header(undef, $text{'forgot_title'}, "", undef, undef, 1, 1);

14
servers/edit_serv.cgi
View File

@@ -103,15 +103,17 @@ if ($access{'forcelink'}) {
}
else {
# Login mode
my $qulbl = &quote_escape($text{'edit_user'}, '"');
my $qplbl = &quote_escape($text{'edit_pass'}, '"');
my $linksel = &ui_radio("mode", $mode,
[ [ 0, "$text{'edit_mode0'}<br>" ],
[ 1, &text('edit_mode12',
&ui_textbox("wuser", $mode == 1 ? $s->{'user'} : "", 8,
undef, undef, " aria-label=\"$text{'edit_user'}\" ".
"placeholder=\"$text{'edit_user'}\""),
&ui_password("wpass", $s->{'pass'}, 8, undef,
undef, " aria-label=\"$text{'edit_pass'}\" ".
"placeholder=\"$text{'edit_pass'}\""))."<br>" ],
&ui_textbox("wuser", $mode == 1 ? $s->{'user'} : "", 8,
undef, undef,
" aria-label=\"$qulbl\" placeholder=\"$qulbl\""),
&ui_password("wpass", $s->{'pass'}, 8, undef, undef,
" aria-label=\"$qplbl\" placeholder=\"$qplbl\"")).
"<br>" ],
[ 2, "$text{'edit_mode2'}<br>" ],
($access{'pass'} && !$main::session_id || $mode == 3 ?
( [ 3, "$text{'edit_mode3'}<br>".