$NetBSD: patch-ay,v 1.4 2020/09/07 10:34:52 mef Exp $ Set &html_escape and more --- mailboxes/mail_search.cgi.orig 2012-06-29 22:31:50.000000000 +0000 +++ mailboxes/mail_search.cgi @@ -46,7 +46,8 @@ if ($in{'simple'}) { @searchlist = ( [ $field, $what ] ); @rv = &mailbox_search_mail(\@searchlist, 0, $folder); print "

",&text('search_results5', scalar(@rv), - "$field", "$what")," ..

\n"; + "" . &html_escape($field) . "", "" . + &html_escape($what) . "")," ..

\n"; } else { # Just search by Subject and From in one folder @@ -73,7 +74,8 @@ if ($in{'simple'}) { &error($text{'search_eboolean'}); } print "

",&text('search_results2', scalar(@rv), - "$in{'search'}")," ..

\n"; + "" . &html_escape($in{'search'}) . + "")," ..

\n"; } foreach $mail (@rv) { $mail->{'folder'} = $folder; @@ -106,9 +108,9 @@ else { # Show list of messages, with form if (@rv) { print &ui_form_start("delete_mail.cgi", "post"); - print &ui_hidden("user", $in{'user'}); - print &ui_hidden("dom", $in{'dom'}); - print &ui_hidden("folder", $in{'folder'}); + print &ui_hidden("user", &html_escape($in{'user'})); + print &ui_hidden("dom", &html_escape($in{'folder'})); + print &ui_hidden("folder", &html_escape($in{'folder'})); if ($config{'top_buttons'} && !$multi_folder) { &show_buttons(1, \@folders, $folder, \@rv, $in{'user'}, 1); } @@ -121,10 +123,10 @@ if (@rv) { else { print "$text{'search_none'}

\n"; } - -&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=$in{'folder'}", - $text{'sform_return'} ), - "list_mail.cgi?user=$in{'user'}&folder=$in{'folder'}&dom=$in{'dom'}", - $text{'mail_return'}, + +&ui_print_footer($in{'simple'} ? ( ) : ( "search_form.cgi?folder=" . + &urlize($in{'folder'}), $text{'sform_return'} ), + "list_mail.cgi?user=" . &urlize($in{'user'}) . "&folder=" . + &urlize($in{'folder'}) . "&dom=" . &urlize($in{'dom'}), $text{'mail_return'}, &user_list_link(), $text{'index_return'});