* Support a w3mmode, which lets w3m run ikiwiki using its local CGI

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 73afe2468edaaa7c3c73fbb2cb427183e2a63ca9..671f0b9248c463db5cbc9e4c5713217735760f8e 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,11 +4,23 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
-use encoding 'utf8'; # force use of utf8 for io layer
+use open qw{:utf8 :std};
 use Encode;
 
 package IkiWiki;
 
+sub redirect ($$) { #{{{
+       my $q=shift;
+       my $url=shift;
+       if (! $config{w3mmode}) {
+               print $q->redirect($url);
+       }
+       else {
+               print "Content-type: text/plain\n";
+               print "W3m-control: GOTO $url\n\n";
+       }
+} #}}}
+
 sub page_locked ($$;$) { #{{{
        my $page=shift;
        my $session=shift;
@@ -34,6 +46,13 @@ sub cgi_recentchanges ($) { #{{{
        
        unlockwiki();
 
+       # Optimisation: building recentchanges means calculating lots of
+       # links. Memoizing htmllink speeds it up a lot (can't be memoized
+       # during page builds as the return values may change, but they
+       # won't here.)
+       eval q{use Memoize};
+       memoize("htmllink");
+
        my $template=template("recentchanges.tmpl"); 
        $template->param(
                title => "RecentChanges",
@@ -151,7 +170,7 @@ sub cgi_signin ($$) { #{{{
                        $session->param("name", $form->field("name"));
                        if (defined $form->field("do") && 
                            $form->field("do") ne 'signin') {
-                               print $q->redirect(cgiurl(
+                               redirect($q, cgiurl(
                                        do => $form->field("do"),
                                        page => $form->field("page"),
                                        title => $form->field("title"),
@@ -160,7 +179,7 @@ sub cgi_signin ($$) { #{{{
                                ));
                        }
                        else {
-                               print $q->redirect($config{url});
+                               redirect($q, $config{url});
                        }
                }
                elsif ($form->submitted eq 'Register') {
@@ -265,11 +284,11 @@ sub cgi_prefs ($$) { #{{{
        
        if ($form->submitted eq 'Logout') {
                $session->delete();
-               print $q->redirect($config{url});
+               redirect($q, $config{url});
                return;
        }
        elsif ($form->submitted eq 'Cancel') {
-               print $q->redirect($config{url});
+               redirect($q, $config{url});
                return;
        }
        elsif ($form->submitted eq "Save Preferences" && $form->validate) {
@@ -309,7 +328,7 @@ sub cgi_editpage ($$) { #{{{
        
        # This untaint is safe because titlepage removes any problimatic
        # characters.
-       my ($page)=Encode::decode_utf8($form->param('page'));
+       my ($page)=decode_utf8($form->param('page'));
        $page=titlepage(possibly_foolish_untaint(lc($page)));
        if (! defined $page || ! length $page ||
            $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
@@ -317,10 +336,13 @@ sub cgi_editpage ($$) { #{{{
        }
        $page=lc($page);
        
-       my $file=$page.$config{default_pageext};
+       my $file;
        if (exists $pagesources{lc($page)}) {
                $file=$pagesources{lc($page)};
        }
+       else {
+               $file=$page.".".$config{default_pageext};
+       }
        my $newfile=0;
        if (! -e "$config{srcdir}/$file") {
                $newfile=1;
@@ -346,21 +368,21 @@ sub cgi_editpage ($$) { #{{{
        }
        
        if ($form->submitted eq "Cancel") {
-               print $q->redirect("$config{url}/".htmlpage($page));
+               redirect($q, "$config{url}/".htmlpage($page));
                return;
        }
        elsif ($form->submitted eq "Preview") {
                require IkiWiki::Render;
                # Apparently FormBuilder doesn't not treat input as
                # utf-8, so decode from it.
-               my $content = Encode::decode_utf8($form->field('editcontent'));
-               my $comments = Encode::decode_utf8($form->field('comments'));
+               my $content=decode_utf8($form->field('editcontent'));
+               my $comments=decode_utf8($form->field('comments'));
                $form->field(name => "editcontent",
                                value => $content, force => 1);
                $form->field(name => "comments",
                                value => $comments, force => 1);
                $form->tmpl_param("page_preview",
-                       htmlize($config{default_pageext},
+                       htmlize(pagetype($file),
                                linkify($page, $page, $content)));
        }
        else {
@@ -409,7 +431,7 @@ sub cgi_editpage ($$) { #{{{
                        if (! @page_locs) {
                                # hmm, someone else made the page in the
                                # meantime?
-                               print $q->redirect("$config{url}/".htmlpage($page));
+                               redirect($q, "$config{url}/".htmlpage($page));
                                return;
                        }
                                
@@ -442,7 +464,7 @@ sub cgi_editpage ($$) { #{{{
                page_locked($page, $session);
                
                # Decode utf-8 since FormBuilder does not
-               my $content=Encode::decode_utf8($form->field('editcontent'));
+               my $content=decode_utf8($form->field('editcontent'));
 
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
@@ -458,7 +480,7 @@ sub cgi_editpage ($$) { #{{{
                }
                if (defined $form->field('comments') &&
                    length $form->field('comments')) {
-                       $message.=": ".Encode::decode_utf8($form->field('comments'));
+                       $message.=": ".decode_utf8($form->field('comments'));
                }
                
                if ($config{rcs}) {
@@ -477,7 +499,7 @@ sub cgi_editpage ($$) { #{{{
                                        force => 1);
                                $form->tmpl_param("page_conflict", 1);
                                $form->field("editcontent", value => $conflict, force => 1);
-                               $form->field(name => "comments", value => Encode::decode_utf8($form->field('comments')), force => 1);
+                               $form->field(name => "comments", value => decode_utf8($form->field('comments')), force => 1);
                                $form->field("do", "edit)");
                                $form->tmpl_param("page_select", 0);
                                $form->field(name => "page", type => 'hidden');
@@ -494,7 +516,7 @@ sub cgi_editpage ($$) { #{{{
                
                # The trailing question mark tries to avoid broken
                # caches and get the most recent version of the page.
-               print $q->redirect("$config{url}/".htmlpage($page)."?updated");
+               redirect($q, "$config{url}/".htmlpage($page)."?updated");
        }
 } #}}}