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
2024-01-20 10:40:36 -08:00
parent fd56523955 a6f5e593b0
commit 78c64ea786
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql/search_form.cgi
View File

@@ -27,7 +27,7 @@ for($i=0; $i<10; $i++) {
[ [ "", "&nbsp;" ],
map { [ $_->{'field'}, $_->{'field'} ] } @str ]),"</td>\n";
print "<td>",&ui_select("match_$i", 0,
[ map { [ $_, $text{'view_match'.$_} ] } (0.. 3) ]),"</td>\n";
[ map { [ $_, $text{'view_match'.$_} ] } (0.. 5) ]),"</td>\n";
print "<td>",&ui_textbox("for_$i", undef, 30),"</td>\n";
print "</tr>\n";
}

9
updown/download.cgi
View File

@@ -22,7 +22,7 @@ foreach $u (@urls) {
$host = $1; $page = $3;
}
else {
&error(&text('download_eurl', $u));
&error(&text('download_eurl', &html_escape($u)));
}
if ($host =~ /^([^:\@]+):([^:\@]+)\@(\S+)/) {
$user = $1;
@@ -41,13 +41,14 @@ foreach $u (@urls) {
}
$in{'dir'} || &error($text{'upload_edir'});
&can_write_file($in{'dir'}) ||
&error(&text('download_eaccess', "<tt>$in{'dir'}</tt>", $!));
&error(&text('download_eaccess',
"<tt>".&html_escape($in{'dir'})."</tt> : " . $!));
$download{'dir'} = $in{'dir'};
if ($can_mode != 3) {
# User can be entered
scalar(@uinfo = getpwnam($in{'user'})) || &error($text{'upload_euser'});
&can_as_user($in{'user'}) ||
&error(&text('download_eucannot', $in{'user'}));
&error(&text('download_eucannot', &html_escape($in{'user'})));
$download{'uid'} = $uinfo[2];
$in{'group_def'} || scalar(@ginfo = getgrnam($in{'group'})) ||
&error($text{'upload_egroup'});
@@ -149,7 +150,7 @@ else {
}
}
if ($error) {
print "<p><b>",&text('download_failed', $error),"</b><p>\n";
print "<p><b>",&text('download_failed', &html_escape($error)),"</b><p>\n";
}
&ui_print_footer("index.cgi?mode=download", $text{'index_return'});