merge updated translations from l10n

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index c91914564fb2d05817c8b7ceb5f1674c0552de60..f2a32a9581077553d5b542fde40f428c15a5e41a 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -15,13 +15,14 @@ sub printheader ($) {
        if ($config{sslcookie}) {
                print $session->header(-charset => 'utf-8',
                        -cookie => $session->cookie(-httponly => 1, -secure => 1));
        if ($config{sslcookie}) {
                print $session->header(-charset => 'utf-8',
                        -cookie => $session->cookie(-httponly => 1, -secure => 1));

-       } else {
+       }
+       else {

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

-sub showform ($$$$;@) {
+sub prepform {

        my $form=shift;
        my $buttons=shift;
        my $session=shift;
        my $form=shift;
        my $buttons=shift;
        my $session=shift;


@@ -34,13 +35,24 @@ sub showform ($$$$;@) {
                });
        }
 
                });
        }
 

+       return $form;
+}
+
+sub showform ($$$$;@) {
+       my $form=prepform(@_);
+       shift;
+       my $buttons=shift;
+       my $session=shift;
+       my $cgi=shift;
+

        printheader($session);
        print misctemplate($form->title, $form->render(submit => $buttons), @_);
 }
 
 sub redirect ($$) {
        my $q=shift;
        printheader($session);
        print misctemplate($form->title, $form->render(submit => $buttons), @_);
 }
 
 sub redirect ($$) {
        my $q=shift;

-       my $url=shift;
+       eval q{use URI};
+       my $url=URI->new(shift);

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


@@ -51,7 +63,7 @@ sub redirect ($$) {
 }
 
 sub decode_cgi_utf8 ($) {
 }
 
 sub decode_cgi_utf8 ($) {

-       # decode_form_utf8 method is needed for 5.10
+       # decode_form_utf8 method is needed for 5.01

        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {


@@ -64,8 +76,9 @@ sub decode_form_utf8 ($) {
        if ($] >= 5.01) {
                my $form = shift;
                foreach my $f ($form->field) {
        if ($] >= 5.01) {
                my $form = shift;
                foreach my $f ($form->field) {

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

                        $form->field(name  => $f,
                        $form->field(name  => $f,

-                                    value => decode_utf8($form->field($f)),
+                                    value => \@value,

                                     force => 1,
                        );
                }
                                     force => 1,
                        );
                }


@@ -87,9 +100,10 @@ sub needsignin ($$) {
        }
 }
 
        }
 }
 

-sub cgi_signin ($$) {
+sub cgi_signin ($$;$) {

        my $q=shift;
        my $session=shift;
        my $q=shift;
        my $session=shift;

+       my $returnhtml=shift;

 
        decode_cgi_utf8($q);
        eval q{use CGI::FormBuilder};
 
        decode_cgi_utf8($q);
        eval q{use CGI::FormBuilder};


@@ -105,13 +119,10 @@ sub cgi_signin ($$) {
                action => $config{cgiurl},
                header => 0,
                template => {type => 'div'},
                action => $config{cgiurl},
                header => 0,
                template => {type => 'div'},

-               stylesheet => baseurl()."style.css",
+               stylesheet => 1,

        );
        my $buttons=["Login"];
        
        );
        my $buttons=["Login"];
        

-       if ($q->param("do") ne "signin" && !$form->submitted) {
-               $form->text(gettext("You need to log in first."));
-       }

        $form->field(name => "do", type => "hidden", value => "signin",
                force => 1);
        
        $form->field(name => "do", type => "hidden", value => "signin",
                force => 1);
        


@@ -126,6 +137,11 @@ sub cgi_signin ($$) {
                $form->validate;
        }
 
                $form->validate;
        }
 

+       if ($returnhtml) {
+               $form=prepform($form, $buttons, $session, $q);
+               return $form->render(submit => $buttons);
+       }
+

        showform($form, $buttons, $session, $q);
 }
 
        showform($form, $buttons, $session, $q);
 }
 


@@ -142,7 +158,12 @@ sub cgi_postsignin ($$) {
                exit;
        }
        else {
                exit;
        }
        else {

-               error(gettext("login failed, perhaps you need to turn on cookies?"));
+               if ($config{sslcookie} && ! $q->https()) {
+                       error(gettext("probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https"));
+               }
+               else {
+                       error(gettext("login failed, perhaps you need to turn on cookies?"));
+               }

        }
 }
 
        }
 }
 


@@ -179,7 +200,7 @@ sub cgi_prefs ($$) {
                params => $q,
                action => $config{cgiurl},
                template => {type => 'div'},
                params => $q,
                action => $config{cgiurl},
                template => {type => 'div'},

-               stylesheet => baseurl()."style.css",
+               stylesheet => 1,

                fieldsets => [
                        [login => gettext("Login")],
                        [preferences => gettext("Preferences")],
                fieldsets => [
                        [login => gettext("Login")],
                        [preferences => gettext("Preferences")],


@@ -226,26 +247,57 @@ sub cgi_prefs ($$) {
                $form->text(gettext("Preferences saved."));
        }
        
                $form->text(gettext("Preferences saved."));
        }
        

-       showform($form, $buttons, $session, $q);
+       showform($form, $buttons, $session, $q,
+               prefsurl => "", # avoid showing the preferences link
+       );
+}
+
+sub cgi_custom_failure ($$$) {
+       my $q=shift;
+       my $httpstatus=shift;
+       my $message=shift;
+
+       print $q->header(
+               -status => $httpstatus,
+               -charset => 'utf-8',
+       );
+       print $message;
+
+       # Internet Explod^Hrer won't show custom 404 responses
+       # unless they're >= 512 bytes
+       print ' ' x 512;
+
+       exit;

 }
 
 sub check_banned ($$) {
        my $q=shift;
        my $session=shift;
 
 }
 
 sub check_banned ($$) {
        my $q=shift;
        my $session=shift;
 

+       my $banned=0;

        my $name=$session->param("name");
        my $name=$session->param("name");

-       if (defined $name) {
-               if (grep { $name eq $_ } @{$config{banned_users}}) {
-                       print $q->header(-status => "403 Forbidden");
-                       $session->delete();
-                       print gettext("You are banned.");
-                       # Internet Explorer won't show custom 404 responses
-                       # unless they're >= 512 bytes
-                       print " " x 512;
-                       cgi_savesession($session);
-                       exit;
+       if (defined $name && 
+           grep { $name eq $_ } @{$config{banned_users}}) {
+               $banned=1;
+       }
+
+       foreach my $b (@{$config{banned_users}}) {
+               if (pagespec_match("", $b,
+                       ip => $session->remote_addr(),
+                       name => defined $name ? $name : "",
+               )) {
+                       $banned=1;
+                       last;

                }
        }
                }
        }

+
+       if ($banned) {
+               $session->delete();
+               cgi_savesession($session);
+               cgi_custom_failure(
+                       $q, "403 Forbidden",
+                       gettext("You are banned."));
+       }

 }
 
 sub cgi_getsession ($) {
 }
 
 sub cgi_getsession ($) {