(no commit message)

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 1763828a4eef973fce3296e2ffdd452f22e0a058..1db96f9f284ac24ee395224484517a6d264270ad 100644 (file)
--- 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");
                }
 
@@ -416,7 +412,9 @@ sub cgi (;$$) {
 
        eval q{use CGI};
        error($@) if $@;
+       no warnings "once";
        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
+       use warnings;
 
        if (! $q) {
                binmode(STDIN);
@@ -486,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"),
                "<p class=\"error\">".gettext("Error").": $message</p>");