factor out IE stupididy workaround
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 1 Feb 2009 00:02:50 +0000 (19:02 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 1 Feb 2009 00:02:50 +0000 (19:02 -0500)
IkiWiki/CGI.pm
IkiWiki/Plugin/goto.pm

index c91914564fb2d05817c8b7ceb5f1674c0552de60..3000ed1000d1d978fc4ed633da4463de901a2baa 100644 (file)
@@ -229,6 +229,20 @@ sub cgi_prefs ($$) {
        showform($form, $buttons, $session, $q);
 }
 
+sub cgi_custom_failure ($$) {
+       my $header=shift;
+       my $message=shift;
+
+       print $header;
+       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;
@@ -236,14 +250,11 @@ sub check_banned ($$) {
        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;
+                       cgi_custom_failure(
+                               $q->header(-status => "403 Forbidden"),
+                               gettext("You are banned."));
                }
        }
 }
index 9e7a2621fabe3c754f49ee9d582afb17b8f85712..7cc8cb4840f42ec8817ad1ae0a9cec726694b9f0 100644 (file)
@@ -44,15 +44,14 @@ sub cgi_goto ($;$) {
        my $link = bestlink("", $page);
 
        if (! length $link) {
-               print $q->header(-status => "404 Not Found");
-               print IkiWiki::misctemplate(gettext("missing page"),
-                       "<p>".
-                       sprintf(gettext("The page %s does not exist."),
-                               htmllink("", "", $page)).
-                       "</p>".
-                       # Internet Explorer won't show custom 404 responses
-                       # unless they're >= 512 bytes
-                       (" " x 512));
+               IkiWiki::cgi_custom_failure(
+                       $q->header(-status => "404 Not Found"),
+                       IkiWiki::misctemplate(gettext("missing page"),
+                               "<p>".
+                               sprintf(gettext("The page %s does not exist."),
+                                       htmllink("", "", $page)).
+                               "</p>")
+               )
        }
        else {
                IkiWiki::redirect($q, urlto($link, undef, 1));