X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/317d19842c40b5056989ad0ce22b632df9153444..c72fbbe21d3f1cd42495d0da690cdd9e0b46ced7:/IkiWiki/CGI.pm?ds=sidebyside diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index cbc2fe8eb..1db96f9f2 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -58,11 +58,6 @@ sub cgitemplate ($$$;@) { my $template=template("page.tmpl"); - my $topurl = $config{url}; - if (defined $cgi && ! $config{w3mmode} && ! $config{reverse_proxy}) { - $topurl = $cgi->url; - } - my $page=""; if (exists $params{page}) { $page=delete $params{page}; @@ -299,8 +294,9 @@ sub cgi_prefs ($$) { return; } elsif ($form->submitted eq 'Save Preferences' && $form->validate) { - if (defined $form->field('email')) { - userinfo_set($user_name, 'email', $form->field('email')) || + my $email = $form->field('email'); + if (defined $email) { + userinfo_set($user_name, 'email', $email) || error("failed to set email"); } @@ -488,6 +484,9 @@ sub cgi (;$$) { sub cgierror ($) { my $message=shift; + eval q{use HTML::Entities}; + $message = encode_entities($message); + print "Content-type: text/html\n\n"; print cgitemplate(undef, gettext("Error"), "

".gettext("Error").": $message

");