Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 68226725b758bf82b4dc23701d89efa6e88f2f37..89f4f2d732715aa3465ca9b7d181409c469e6d75 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -12,7 +12,7 @@ use Encode;
 sub printheader ($) {
        my $session=shift;
        
 sub printheader ($) {
        my $session=shift;
        

-       if ($ENV{HTTPS} || $config{sslcookie}) {
+       if (($ENV{HTTPS} && lc $ENV{HTTPS} ne "off") || $config{sslcookie}) {

                print $session->header(-charset => 'utf-8',
                        -cookie => $session->cookie(-httponly => 1, -secure => 1));
        }
                print $session->header(-charset => 'utf-8',
                        -cookie => $session->cookie(-httponly => 1, -secure => 1));
        }


@@ -46,39 +46,57 @@ sub showform ($$$$;@) {
        my $cgi=shift;
 
        printheader($session);
        my $cgi=shift;
 
        printheader($session);

-       print misctemplate($form->title, $form->render(submit => $buttons), @_);
+       print cgitemplate($cgi, $form->title,
+               $form->render(submit => $buttons), @_);

 }
 
 }
 

-# Like showform, but the base url will be set to allow edit previews
-# that use links relative to the specified page.
-sub showform_preview ($$$$;@) {
-       my $form=shift;
-       my $buttons=shift;
-       my $session=shift;
+sub cgitemplate ($$$;@) {

        my $cgi=shift;
        my $cgi=shift;

+       my $title=shift;
+       my $content=shift;

        my %params=@_;
        my %params=@_;

+       
+       my $template=template("page.tmpl");

 
 

-       # The base url needs to be a full URL, and urlto may return a path.
-       my $baseurl = absurl(urlto($params{page}), $cgi->url);
-
-       showform($form, $buttons, $session, $cgi, @_,
-               forcebaseurl => $baseurl);
-}
-
-# Forces a partial url (path only) to absolute, using the same
-# URL scheme as the CGI. Full URLs are left unchanged.
-sub absurl ($$) {
-       my $partialurl=shift;
-       my $q=shift;
-
-       eval q{use URI};
-       return URI->new_abs($partialurl, $q->url);
+       my $page="";
+       if (exists $params{page}) {
+               $page=delete $params{page};
+               $params{forcebaseurl}=urlto($page);
+       }
+       run_hooks(pagetemplate => sub {
+               shift->(
+                       page => $page,
+                       destpage => $page,
+                       template => $template,
+               );
+       });
+       templateactions($template, "");
+
+       my $baseurl = baseurl();
+
+       $template->param(
+               dynamic => 1,
+               title => $title,
+               wikiname => $config{wikiname},
+               content => $content,
+               baseurl => $baseurl,
+               html5 => $config{html5},
+               %params,
+       );
+       
+       return $template->output;

 }
 
 sub redirect ($$) {
        my $q=shift;
        eval q{use URI};
 }
 
 sub redirect ($$) {
        my $q=shift;
        eval q{use URI};

-       my $url=URI->new(absurl(shift, $q));
+
+       my $topurl;
+       if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) {
+               $topurl = $q->url;
+       }
+
+       my $url=URI->new(urlabs(shift, $topurl));

        if (! $config{w3mmode}) {
                print $q->redirect($url);
        }
        if (! $config{w3mmode}) {
                print $q->redirect($url);
        }


@@ -93,16 +111,27 @@ sub decode_cgi_utf8 ($) {
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {

-                       $cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
+                       $cgi->param($f, map { decode_utf8 $_ }
+                               @{$cgi->param_fetch($f)});

                }
        }
 }
 
                }
        }
 }
 

+sub safe_decode_utf8 ($) {
+    my $octets = shift;
+    if (!Encode::is_utf8($octets)) {
+        return decode_utf8($octets);
+    }
+    else {
+        return $octets;
+    }
+}
+

 sub decode_form_utf8 ($) {
        if ($] >= 5.01) {
                my $form = shift;
                foreach my $f ($form->field) {
 sub decode_form_utf8 ($) {
        if ($] >= 5.01) {
                my $form = shift;
                foreach my $f ($form->field) {

-                       my @value=map { decode_utf8($_) } $form->field($f);
+                       my @value=map { safe_decode_utf8($_) } $form->field($f);

                        $form->field(name  => $f,
                                     value => \@value,
                                     force => 1,
                        $form->field(name  => $f,
                                     value => \@value,
                                     force => 1,


@@ -119,7 +148,7 @@ sub needsignin ($$) {
 
        if (! defined $session->param("name") ||
            ! userinfo_get($session->param("name"), "regdate")) {
 
        if (! defined $session->param("name") ||
            ! userinfo_get($session->param("name"), "regdate")) {

-               $session->param(postsignin => $ENV{QUERY_STRING});
+               $session->param(postsignin => $q->query_string);

                cgi_signin($q, $session);
                cgi_savesession($session);
                exit;
                cgi_signin($q, $session);
                cgi_savesession($session);
                exit;


@@ -302,16 +331,19 @@ sub check_banned ($$) {
 
        my $banned=0;
        my $name=$session->param("name");
 
        my $banned=0;
        my $name=$session->param("name");

+       my $cloak=cloak($name) if defined $name;

        if (defined $name && 
        if (defined $name && 

-           grep { $name eq $_ } @{$config{banned_users}}) {
+           grep { $name eq $_ || $cloak eq $_ } @{$config{banned_users}}) {

                $banned=1;
        }
 
        foreach my $b (@{$config{banned_users}}) {
                if (pagespec_match("", $b,
                        ip => $session->remote_addr(),
                $banned=1;
        }
 
        foreach my $b (@{$config{banned_users}}) {
                if (pagespec_match("", $b,
                        ip => $session->remote_addr(),

-                       name => defined $name ? $name : "",
-               )) {
+                       name => defined $name ? $name : "")
+                  || pagespec_match("", $b,
+                       ip => cloak($session->remote_addr()),
+                       name => defined $cloak ? $cloak : "")) {

                        $banned=1;
                        last;
                }
                        $banned=1;
                        last;
                }


@@ -339,7 +371,8 @@ sub cgi_getsession ($) {
                        { FileName => "$config{wikistatedir}/sessions.db" })
        };
        if (! $session || $@) {
                        { FileName => "$config{wikistatedir}/sessions.db" })
        };
        if (! $session || $@) {

-               error($@." ".CGI::Session->errstr());
+               my $error = $@;
+               error($error." ".CGI::Session->errstr());

        }
        
        umask($oldmask);
        }
        
        umask($oldmask);


@@ -378,7 +411,9 @@ sub cgi (;$$) {
 
        eval q{use CGI};
        error($@) if $@;
 
        eval q{use CGI};
        error($@) if $@;

+       no warnings "once";

        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
        $CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};

+       use warnings;

 
        if (! $q) {
                binmode(STDIN);
 
        if (! $q) {
                binmode(STDIN);


@@ -417,7 +452,7 @@ sub cgi (;$$) {
                        # userinfo db.
                        if (! userinfo_get($session->param("name"), "regdate")) {
                                userinfo_setall($session->param("name"), {
                        # userinfo db.
                        if (! userinfo_get($session->param("name"), "regdate")) {
                                userinfo_setall($session->param("name"), {

-                                       email => "",
+                                       email => defined $session->param("email") ? $session->param("email") : "",

                                        password => "",
                                        regdate => time,
                                }) || error("failed adding user");
                                        password => "",
                                        regdate => time,
                                }) || error("failed adding user");


@@ -448,8 +483,11 @@ sub cgi (;$$) {
 sub cgierror ($) {
        my $message=shift;
 
 sub cgierror ($) {
        my $message=shift;
 

+       eval q{use HTML::Entities};
+       $message = encode_entities($message);
+

        print "Content-type: text/html\n\n";
        print "Content-type: text/html\n\n";

-       print misctemplate(gettext("Error"),
+       print cgitemplate(undef, gettext("Error"),

                "<p class=\"error\">".gettext("Error").": $message</p>");
        die $@;
 }
                "<p class=\"error\">".gettext("Error").": $message</p>");
        die $@;
 }