templatize commit types, so it could use icons, or whatever

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 7e47110593c30b9a2e1b5bd06f4f50b3b73ab8ca..abeda29c248dba2ad2722740b8149dca478072bb 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -5,6 +5,7 @@ use strict;
 use File::Find;
 use Memoize;
 use File::Spec;
 use File::Find;
 use Memoize;
 use File::Spec;

+use HTML::Template;

 
 BEGIN {
        $blosxom::version="is a proper perl module too much to ask?";
 
 BEGIN {
        $blosxom::version="is a proper perl module too much to ask?";


@@ -12,8 +13,8 @@ BEGIN {
 }
 
 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 }
 
 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";

-my ($srcdir, $destdir, %links, %oldlinks, %oldpagemtime, %renderedfiles,
-    %pagesources);
+my ($srcdir, $templatedir, $destdir, %links, %oldlinks, %oldpagemtime,
+    %renderedfiles, %pagesources);

 my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
 my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/;
 my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^\.|\/\.|\.html?$)!;
 my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
 my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/;
 my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^\.|\/\.|\.html?$)!;


@@ -25,15 +26,16 @@ my $url="";
 my $cgiurl="";
 my $historyurl="";
 my $svn=1;
 my $cgiurl="";
 my $historyurl="";
 my $svn=1;

+my $anonok=0;

 
 sub usage { #{{{
 
 sub usage { #{{{

-       die "usage: ikiwiki [options] source dest\n";
+       die "usage: ikiwiki [options] source templates dest\n";

 } #}}}
 
 sub error ($) { #{{{
        if ($cgi) {
                print "Content-type: text/html\n\n";
 } #}}}
 
 sub error ($) { #{{{
        if ($cgi) {
                print "Content-type: text/html\n\n";

-               print "Error: @_\n";
+               print misctemplate("Error", "<p>Error: @_</p>");

                exit 1;
        }
        else {
                exit 1;
        }
        else {


@@ -42,7 +44,12 @@ sub error ($) { #{{{
 } #}}}
 
 sub debug ($) { #{{{
 } #}}}
 
 sub debug ($) { #{{{

-       print "@_\n" if $verbose;
+       if (! $cgi) {
+               print "@_\n" if $verbose;
+       }
+       else {
+               print STDERR "@_\n" if $verbose;
+       }

 } #}}}
 
 sub mtime ($) { #{{{
 } #}}}
 
 sub mtime ($) { #{{{


@@ -216,8 +223,7 @@ sub htmlize ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub linkbacks ($$) { #{{{
-       my $content=shift;
+sub backlinks ($) { #{{{

        my $page=shift;
 
        my @links;
        my $page=shift;
 
        my @links;


@@ -235,59 +241,82 @@ sub linkbacks ($$) { #{{{
                                $p_trimmed=~s/^\Q$dir\E// &&
                                $page_trimmed=~s/^\Q$dir\E//;
                                       
                                $p_trimmed=~s/^\Q$dir\E// &&
                                $page_trimmed=~s/^\Q$dir\E//;
                                       

-                       push @links, "<a href=\"$href\">$p_trimmed</a>";
+                       push @links, { url => $href, page => $p_trimmed };

                }
        }
 
                }
        }
 

-       $content.="<hr><p>Links: ".join(" ", sort @links)."</p>\n" if @links;
-       return $content;
-} #}}}
-
-sub indexlink () { #{{{
-       return "<a href=\"$url\">$wikiname</a>/ ";
+       return sort { $a->{page} cmp $b->{page} } @links;

 } #}}}
        
 } #}}}
        

-sub finalize ($$) { #{{{
-       my $content=shift;
+sub parentlinks ($) { #{{{

        my $page=shift;
        my $page=shift;

-
-       my $title=basename($page);
-       $title=~s/_/ /g;

        
        

+       my @ret;

        my $pagelink="";
        my $path="";
        my $pagelink="";
        my $path="";

+       my $skip=1;

        foreach my $dir (reverse split("/", $page)) {
        foreach my $dir (reverse split("/", $page)) {

-               if (length($pagelink)) {
-                       $pagelink="<a href=\"$path$dir.html\">$dir</a>/ $pagelink";
+               if (! $skip) {
+                       unshift @ret, { url => "$path$dir.html", page => $dir };

                }
                else {
                }
                else {

-                       $pagelink=$dir;
+                       $skip=0;

                }
                $path.="../";
        }
                }
                $path.="../";
        }

-       $path=~s/\.\.\/$/index.html/;
-       $pagelink=indexlink()." $pagelink";
+       unshift @ret, { url => $path , page => $wikiname };
+       return @ret;
+} #}}}
+
+sub indexlink () { #{{{
+       return "<a href=\"$url\">$wikiname</a>";
+} #}}}
+       
+sub finalize ($$) { #{{{
+       my $content=shift;
+       my $page=shift;
+
+       my $title=basename($page);
+       $title=~s/_/ /g;
+       
+       my $template=HTML::Template->new(blind_cache => 1,
+               filename => "$templatedir/page.tmpl");

        
        

-       my @actions;

        if (length $cgiurl) {
        if (length $cgiurl) {

-               push @actions, "<a href=\"$cgiurl?do=edit&page=$page\">Edit</a>";
-               push @actions, "<a href=\"$cgiurl?do=recentchanges\">RecentChanges</a>";
+               $template->param(editurl => "$cgiurl?do=edit&page=$page");
+               if ($svn) {
+                       $template->param(recentchangesurl => "$cgiurl?do=recentchanges");
+               }

        }
        }

+

        if (length $historyurl) {
        if (length $historyurl) {

-               my $url=$historyurl;
-               $url=~s/\[\[\]\]/$pagesources{$page}/g;
-               push @actions, "<a href=\"$url\">History</a>";
+               my $u=$historyurl;
+               $u=~s/\[\[\]\]/$pagesources{$page}/g;
+               $template->param(historyurl => $u);

        }
        
        }
        

-       $content="<html>\n<head><title>$title</title></head>\n<body>\n".
-                 "<h1>$pagelink</h1>\n".
-                 "@actions\n<hr>\n".
-                 $content.
-                 "</body>\n</html>\n";
+       $template->param(
+               title => $title,
+               wikiname => $wikiname,
+               parentlinks => [parentlinks($page)],
+               content => $content,
+               backlinks => [backlinks($page)],
+       );

        
        

-       return $content;
+       return $template->output;

 } #}}}
 
 } #}}}
 

+# Important security check. Make sure to call this before saving any files
+# to the source directory.
+sub check_overwrite ($$) { #{{{
+       my $dest=shift;
+       my $src=shift;
+       
+       if (! exists $renderedfiles{$src} && -e $dest) {
+               error("$dest exists and was not rendered from $src before, not overwriting");
+       }
+} #}}}
+               

 sub render ($) { #{{{
        my $file=shift;
        
 sub render ($) { #{{{
        my $file=shift;
        


@@ -300,15 +329,16 @@ sub render ($) { #{{{
                
                $content=linkify($content, $file);
                $content=htmlize($type, $content);
                
                $content=linkify($content, $file);
                $content=htmlize($type, $content);

-               $content=linkbacks($content, $page);

                $content=finalize($content, $page);
                
                $content=finalize($content, $page);
                

+               check_overwrite("$destdir/".htmlpage($page), $page);

                writefile("$destdir/".htmlpage($page), $content);
                $oldpagemtime{$page}=time;
                $renderedfiles{$page}=htmlpage($page);
        }
        else {
                $links{$file}=[];
                writefile("$destdir/".htmlpage($page), $content);
                $oldpagemtime{$page}=time;
                $renderedfiles{$page}=htmlpage($page);
        }
        else {
                $links{$file}=[];

+               check_overwrite("$destdir/$file", $file);

                writefile("$destdir/$file", $content);
                $oldpagemtime{$file}=time;
                $renderedfiles{$file}=$file;
                writefile("$destdir/$file", $content);
                $oldpagemtime{$file}=time;
                $renderedfiles{$file}=$file;


@@ -397,7 +427,7 @@ sub rcs_recentchanges ($) { #{{{
                my $div=qr/^--------------------+$/;
                my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
                my $state='start';
                my $div=qr/^--------------------+$/;
                my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
                my $state='start';

-               my ($rev, $user, $when, @pages, $message);
+               my ($rev, $user, $when, @pages, @message);

                foreach (`LANG=C svn log -v '$svn_url'`) {
                        chomp;
                        if ($state eq 'start' && /$div/) {
                foreach (`LANG=C svn log -v '$svn_url'`) {
                        chomp;
                        if ($state eq 'start' && /$div/) {


@@ -409,23 +439,35 @@ sub rcs_recentchanges ($) { #{{{
                                $when=concise(ago(time - str2time($3)));
                        }
                        elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
                                $when=concise(ago(time - str2time($3)));
                        }
                        elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {

-                               push @pages, pagename($1) if length $1;
+                               push @pages, { link => htmllink("", pagename($1), 1) }
+                                       if length $1;

                        }
                        elsif ($state eq 'header' && /^$/) {
                                $state='body';
                        }
                        elsif ($state eq 'body' && /$div/) {
                        }
                        elsif ($state eq 'header' && /^$/) {
                                $state='body';
                        }
                        elsif ($state eq 'body' && /$div/) {

+                               my $committype="web";
+                               if (defined $message[0] &&
+                                   $message[0]->{line}=~/^web commit by (\w+)(.*)/) {
+                                       $user="$1";
+                                       $message[0]->{line}=$2;
+                               }
+                               else {
+                                       $committype="svn";
+                               }
+                               

                                push @ret, { rev => $rev, user => $user,
                                push @ret, { rev => $rev, user => $user,

-                                       when => $when, message => $message,
+                                       commitype => $commitype,
+                                       when => $when, message => [@message],

                                        pages => [@pages] } if @pages;
                                return @ret if @ret >= $num;
                                
                                $state='header';
                                        pages => [@pages] } if @pages;
                                return @ret if @ret >= $num;
                                
                                $state='header';

-                               $message=$rev=$user=$when=undef;
-                               @pages=();
+                               $rev=$user=$when=undef;
+                               @pages=@message=();

                        }
                        elsif ($state eq 'body') {
                        }
                        elsif ($state eq 'body') {

-                               $message.="$_<br>\n";
+                               push @message, {line => $_},

                        }
                }
        }
                        }
                }
        }


@@ -526,10 +568,10 @@ FILE:             foreach my $file (@files) {
                }
        }
 
                }
        }
 

-       # handle linkbacks; if a page has added/removed links, update the
+       # handle backlinks; if a page has added/removed links, update the

        # pages it links to
        # TODO: inefficient; pages may get rendered above and again here;
        # pages it links to
        # TODO: inefficient; pages may get rendered above and again here;

-       # problem is the linkbacks could be wrong in the first pass render
+       # problem is the backlinks could be wrong in the first pass render

        # above
        if (%rendered) {
                my %linkchanged;
        # above
        if (%rendered) {
                my %linkchanged;


@@ -559,7 +601,7 @@ FILE:               foreach my $file (@files) {
                foreach my $link (keys %linkchanged) {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                foreach my $link (keys %linkchanged) {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {

-                               debug("rendering $linkfile, to update its linkbacks");
+                               debug("rendering $linkfile, to update its backlinks");

                                render($linkfile);
                        }
                }
                                render($linkfile);
                        }
                }


@@ -579,7 +621,7 @@ sub gen_wrapper ($$) { #{{{
                error("$this doesn't seem to be executable");
        }
 
                error("$this doesn't seem to be executable");
        }
 

-       my @params=($srcdir, $destdir, "--wikiname=$wikiname");
+       my @params=($srcdir, $templatedir, $destdir, "--wikiname=$wikiname");

        push @params, "--verbose" if $verbose;
        push @params, "--rebuild" if $rebuild;
        push @params, "--nosvn" if !$svn;
        push @params, "--verbose" if $verbose;
        push @params, "--rebuild" if $rebuild;
        push @params, "--nosvn" if !$svn;


@@ -587,6 +629,7 @@ sub gen_wrapper ($$) { #{{{
        push @params, "--url=$url" if $url;
        push @params, "--cgiurl=$cgiurl" if $cgiurl;
        push @params, "--historyurl=$historyurl" if $historyurl;
        push @params, "--url=$url" if $url;
        push @params, "--cgiurl=$cgiurl" if $cgiurl;
        push @params, "--historyurl=$historyurl" if $historyurl;

+       push @params, "--anonok" if $anonok;

        my $params=join(" ", @params);
        my $call='';
        foreach my $p ($this, $this, @params) {
        my $params=join(" ", @params);
        my $call='';
        foreach my $p ($this, $this, @params) {


@@ -645,30 +688,67 @@ EOF
        print "successfully generated ikiwiki-wrap\n";
        exit 0;
 } #}}}
        print "successfully generated ikiwiki-wrap\n";
        exit 0;
 } #}}}

+               
+sub misctemplate ($$) { #{{{
+       my $title=shift;
+       my $pagebody=shift;
+       
+       my $template=HTML::Template->new(
+               filename => "$templatedir/misc.tmpl"
+       );
+       $template->param(
+               title => $title,
+               indexlink => indexlink(),
+               wikiname => $wikiname,
+               pagebody => $pagebody,
+       );
+       return $template->output;
+}#}}}

 
 sub cgi_recentchanges ($) { #{{{
        my $q=shift;
        
 
 sub cgi_recentchanges ($) { #{{{
        my $q=shift;
        

-       my $list="<ul>\n";
-       foreach my $change (rcs_recentchanges(100)) {
-               $list.="<li>";
-               $list.=join(", ", map { htmllink("", $_, 1) } @{$change->{pages}});
-               $list.="<br>\n";
-               $list.="changed ".$change->{when}." by ".
-                      htmllink("", $change->{user}, 1).
-                      ": <i>".$change->{message}."</i>\n";
-               $list.="</li>\n";
-       }
-       $list.="</ul>\n";
-               
-       print $q->header,
-             $q->start_html("RecentChanges"),
-             $q->h1(indexlink()." RecentChanges"),
-             $list,
-             $q->end_form,
-             $q->end_html;
+       my $template=HTML::Template->new(
+               filename => "$templatedir/recentchanges.tmpl"
+       );
+       $template->param(
+               title => "RecentChanges",
+               indexlink => indexlink(),
+               wikiname => $wikiname,
+               changelog => [rcs_recentchanges(100)],
+       );
+       print $q->header, $template->output;

 } #}}}
 
 } #}}}
 

+sub userinfo_get ($$) { #{{
+       my $user=shift;
+       my $field=shift;
+
+       eval q{use Storable};
+       my $userdata=eval{ Storable::lock_retrieve("$srcdir/.ikiwiki/userdb") };
+       if (! defined $userdata || ! ref $userdata || 
+           ! exists $userdata->{$user} || ! ref $userdata->{$user}) {
+               return "";
+       }
+       return $userdata->{$user}->{$field};
+} #}}
+
+sub userinfo_set ($$) { #{{
+       my $user=shift;
+       my $info=shift;
+       
+       eval q{use Storable};
+       my $userdata=eval{ Storable::lock_retrieve("$srcdir/.ikiwiki/userdb") };
+       if (! defined $userdata || ! ref $userdata) {
+               $userdata={};
+       }
+       $userdata->{$user}=$info;
+       my $oldmask=umask(077);
+       my $ret=Storable::lock_store($userdata, "$srcdir/.ikiwiki/userdb");
+       umask($oldmask);
+       return $ret;
+} #}}
+

 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;


@@ -680,7 +760,6 @@ sub cgi_signin ($$) { #{{{
                header => 1,
                method => 'POST',
                validate => {
                header => 1,
                method => 'POST',
                validate => {

-                       name => '/^\w+$/',

                        confirm_password => {
                                perl => q{eq $form->field("password")},
                        },
                        confirm_password => {
                                perl => q{eq $form->field("password")},
                        },


@@ -690,18 +769,16 @@ sub cgi_signin ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $q->request_uri,
                javascript => 0,
                params => $q,
                action => $q->request_uri,

+               header => 0,
+               template => (-e "$templatedir/signin.tmpl" ? "$templatedir/signin.tmpl" : "")

        );
        
        );
        

-       $form->sessionid($session->id);

        $form->field(name => "name", required => 0);
        $form->field(name => "do", type => "hidden");
        $form->field(name => "page", type => "hidden");
        $form->field(name => "password", type => "password", required => 0);
        $form->field(name => "confirm_password", type => "password", required => 0);
        $form->field(name => "email", required => 0);
        $form->field(name => "name", required => 0);
        $form->field(name => "do", type => "hidden");
        $form->field(name => "page", type => "hidden");
        $form->field(name => "password", type => "password", required => 0);
        $form->field(name => "confirm_password", type => "password", required => 0);
        $form->field(name => "email", required => 0);

-       if ($session->param("name")) {
-               $form->field(name => "name", value => $session->param("name"));
-       }

        if ($q->param("do") ne "signin") {
                $form->text("You need to log in before you can edit pages.");
        }
        if ($q->param("do") ne "signin") {
                $form->text("You need to log in before you can edit pages.");
        }


@@ -717,167 +794,202 @@ sub cgi_signin ($$) { #{{{
                        $form->field(name => $opt, required => 1);
                }
        
                        $form->field(name => $opt, required => 1);
                }
        

-               # Validate password differently depending on how form was
-               # submitted.
+               # Validate password differently depending on how
+               # form was submitted.

                if ($form->submitted eq 'Login') {
                        $form->field(
                                name => "password",
                                validate => sub {
                if ($form->submitted eq 'Login') {
                        $form->field(
                                name => "password",
                                validate => sub {

-                                       # TODO get real user password
-                                       shift eq "foo";
+                                       length $form->field("name") &&
+                                       shift eq userinfo_get($form->field("name"), 'password');

                                },
                        );
                                },
                        );

+                       $form->field(name => "name", validate => '/^\w+$/');

                }
                else {
                        $form->field(name => "password", validate => 'VALUE');
                }
                }
                else {
                        $form->field(name => "password", validate => 'VALUE');
                }

+               # And make sure the entered name exists when logging
+               # in or sending email, and does not when registering.
+               if ($form->submitted eq 'Register') {
+                       $form->field(
+                               name => "name",
+                               validate => sub {
+                                       my $name=shift;
+                                       length $name &&
+                                       ! userinfo_get($name, "regdate");
+                               },
+                       );
+               }
+               else {
+                       $form->field(
+                               name => "name",
+                               validate => sub {
+                                       my $name=shift;
+                                       length $name &&
+                                       userinfo_get($name, "regdate");
+                               },
+                       );
+               }

        }
        else {
        }
        else {

-               # Comments only shown first time.
+               # First time settings.

                $form->field(name => "name", comment => "use FirstnameLastName");
                $form->field(name => "confirm_password", comment => "(only needed");
                $form->field(name => "email",            comment => "for registration)");
                $form->field(name => "name", comment => "use FirstnameLastName");
                $form->field(name => "confirm_password", comment => "(only needed");
                $form->field(name => "email",            comment => "for registration)");

+               if ($session->param("name")) {
+                       $form->field(name => "name", value => $session->param("name"));
+               }

        }
 
        if ($form->submitted && $form->validate) {
                if ($form->submitted eq 'Login') {
                        $session->param("name", $form->field("name"));
        }
 
        if ($form->submitted && $form->validate) {
                if ($form->submitted eq 'Login') {
                        $session->param("name", $form->field("name"));

-                       if (defined $form->field("do")) {
-                               $q->redirect(
+                       if (defined $form->field("do") && 
+                           $form->field("do") ne 'signin') {
+                               print $q->redirect(

                                        "$cgiurl?do=".$form->field("do").
                                        "&page=".$form->field("page"));
                        }
                        else {
                                        "$cgiurl?do=".$form->field("do").
                                        "&page=".$form->field("page"));
                        }
                        else {

-                               $q->redirect($url);
+                               print $q->redirect($url);

                        }
                }
                elsif ($form->submitted eq 'Register') {
                        }
                }
                elsif ($form->submitted eq 'Register') {

-                       # TODO: save registration info
-                       $form->field(name => "confirm_password", type => "hidden");
-                       $form->field(name => "email", type => "hidden");
-                       $form->text("Registration successful. Now you can Login.");
-                       print $form->render(submit => ["Login"]);;
+                       my $user_name=$form->field('name');
+                       if (userinfo_set($user_name, {
+                                          'email' => $form->field('email'),
+                                          'password' => $form->field('password'),
+                                          'regdate' => time
+                                        })) {
+                               $form->field(name => "confirm_password", type => "hidden");
+                               $form->field(name => "email", type => "hidden");
+                               $form->text("Registration successful. Now you can Login.");
+                               print $session->header();
+                               print misctemplate($form->title, $form->render(submit => ["Login"]));
+                       }
+                       else {
+                               error("Error saving registration.");
+                       }

                }
                elsif ($form->submitted eq 'Mail Password') {
                }
                elsif ($form->submitted eq 'Mail Password') {

-                       # TODO mail password
+                       my $user_name=$form->field("name");
+                       my $template=HTML::Template->new(
+                               filename => "$templatedir/passwordmail.tmpl"
+                       );
+                       $template->param(
+                               user_name => $user_name,
+                               user_password => userinfo_get($user_name, "password"),
+                               wikiurl => $url,
+                               wikiname => $wikiname,
+                               REMOTE_ADDR => $ENV{REMOTE_ADDR},
+                       );
+                       
+                       eval q{use Mail::Sendmail};
+                       my ($fromhost) = $cgiurl =~ m!/([^/]+)!;
+                       print STDERR "$< $> >>> $cgiurl ".(getpwuid($>))[0]."@".$fromhost."\n";
+                       sendmail(
+                               To => userinfo_get($user_name, "email"),
+                               From => "$wikiname admin <".(getpwuid($>))[0]."@".$fromhost.">",
+                               Subject => "$wikiname information",
+                               Message => $template->output,
+                       ) or error("Failed to send mail");
+                       

                        $form->text("Your password has been emailed to you.");
                        $form->text("Your password has been emailed to you.");

-                       print $form->render(submit => ["Login", "Register", "Mail Password"]);;
+                       $form->field(name => "name", required => 0);
+                       print $session->header();
+                       print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));

                }
        }
        else {
                }
        }
        else {

-               print $form->render(submit => ["Login", "Register", "Mail Password"]);;
+               print $session->header();
+               print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));

        }
 } #}}}
 
        }
 } #}}}
 

-sub cgi () { #{{{
-       eval q{use CGI};
-       eval q{use CGI::Session};
-       
-       my $q=CGI->new;
-       # session id has to be _sessionid for CGI::FormBuilder to work.
-       # TODO: stop having the formbuilder emit cookies and change session
-       # id to something else.
-       CGI::Session->name("_sessionid");
-       my $session = CGI::Session->new(undef, $q,
-               { Directory=> "$srcdir/.ikiwiki/sessions" });
-       
-       my $do=$q->param('do');
-       if (! defined $do || ! length $do) {
-               error("\"do\" parameter missing");
-       }
-       
-       if ($do eq 'recentchanges') {
-               cgi_recentchanges($q);
-               return;
-       }
-       
-       if (! defined $session->param("name") || $do eq 'signin') {
-               cgi_signin($q, $session);
-               return;
-       }
+sub cgi_editpage ($$) { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       eval q{use CGI::FormBuilder};
+       my $form = CGI::FormBuilder->new(
+               fields => [qw(do from page content comments)],
+               header => 1,
+               method => 'POST',
+               validate => {},
+               required => [qw{}],
+               javascript => 0,
+               params => $q,
+               action => $q->request_uri,
+               table => 0,
+               template => "$templatedir/editpage.tmpl"
+       );

        
        

-       my ($page)=$q->param('page')=~/$wiki_file_regexp/;
+       my ($page)=$form->param('page')=~/$wiki_file_regexp/;

        if (! defined $page || ! length $page || $page ne $q->param('page') ||
            $page=~/$wiki_file_prune_regexp/ || $page=~/^\//) {
                error("bad page name");
        }
        $page=lc($page);
        if (! defined $page || ! length $page || $page ne $q->param('page') ||
            $page=~/$wiki_file_prune_regexp/ || $page=~/^\//) {
                error("bad page name");
        }
        $page=lc($page);

-       
-       my $action=$q->request_uri;
-       $action=~s/\?.*//;
-       
-       if ($do eq 'create') {
-               if (exists $pagesources{lc($page)}) {
-                       # hmm, someone else made the page in the meantime?
-                       print $q->redirect("$url/".htmlpage($page));
-               }

 
 

-               my @page_locs;
-               my ($from)=$q->param('from')=~/$wiki_file_regexp/;
-               if (! defined $from || ! length $from ||
-                   $from ne $q->param('from') ||
-                   $from=~/$wiki_file_prune_regexp/ || $from=~/^\//) {
-                       @page_locs=$page;
-               }
-               else {
-                       my $dir=$from."/";
-                       $dir=~s![^/]+/$!!;
-                       push @page_locs, $dir.$page;
-                       push @page_locs, "$from/$page";
-                       while (length $dir) {
+       $form->field(name => "do", type => 'hidden');
+       $form->field(name => "from", type => 'hidden');
+       $form->field(name => "page", value => "$page", force => 1);
+       $form->field(name => "comments", type => "text", size => 80);
+       $form->field(name => "content", type => "textarea", rows => 20,
+               cols => 80);
+       
+       if (! $form->submitted || ! $form->validate) {
+               if ($form->field("do") eq "create") {
+                       if (exists $pagesources{lc($page)}) {
+                               # hmm, someone else made the page in the
+                               # meantime?
+                               print $q->redirect("$url/".htmlpage($page));
+                               return;
+                       }
+                       
+                       my @page_locs;
+                       my ($from)=$form->param('from')=~/$wiki_file_regexp/;
+                       if (! defined $from || ! length $from ||
+                           $from ne $form->param('from') ||
+                           $from=~/$wiki_file_prune_regexp/ || $from=~/^\//) {
+                               @page_locs=$page;
+                       }
+                       else {
+                               my $dir=$from."/";

                                $dir=~s![^/]+/$!!;
                                push @page_locs, $dir.$page;
                                $dir=~s![^/]+/$!!;
                                push @page_locs, $dir.$page;

+                               push @page_locs, "$from/$page";
+                               while (length $dir) {
+                                       $dir=~s![^/]+/$!!;
+                                       push @page_locs, $dir.$page;
+                               }
+                       }
+
+                       $form->tmpl_param("page_select", 1);
+                       $form->field(name => "page", type => 'select',
+                               options => \@page_locs);
+                       $form->title("creating $page");
+               }
+               elsif ($form->field("do") eq "edit") {
+                       my $content="";
+                       if (exists $pagesources{lc($page)}) {
+                               $content=readfile("$srcdir/$pagesources{lc($page)}");
+                               $content=~s/\n/\r\n/g;

                        }
                        }

+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "content", value => $content,
+                               force => 1);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->title("editing $page");

                }
                
                }
                

-               $q->param("do", "save");
-               print $q->header,
-                     $q->start_html("Creating $page"),
-                     $q->h1(indexlink()." Creating $page"),
-                     $q->start_form(-action => $action),
-                     $q->hidden('do'),
-                     "Select page location:",
-                     $q->popup_menu('page', \@page_locs),
-                     $q->textarea(-name => 'content',
-                              -default => "",
-                              -rows => 20,
-                              -columns => 80),
-                     $q->br,
-                     "Optional comment about this change:",
-                     $q->br,
-                     $q->textfield(-name => "comments", -size => 80),
-                     $q->br,
-                     $q->submit("Save Page"),
-                     $q->end_form,
-                     $q->end_html;
-       }
-       elsif ($do eq 'edit') {
-               my $content="";
-               if (exists $pagesources{lc($page)}) {
-                       $content=readfile("$srcdir/$pagesources{lc($page)}");
-                       $content=~s/\n/\r\n/g;
-               }
-               $q->param("do", "save");
-               print $q->header,
-                     $q->start_html("Editing $page"),
-                     $q->h1(indexlink()." Editing $page"),
-                     $q->start_form(-action => $action),
-                     $q->hidden('do'),
-                     $q->hidden('page'),
-                     $q->textarea(-name => 'content',
-                              -default => $content,
-                              -rows => 20,
-                              -columns => 80),
-                     $q->br,
-                     "Optional comment about this change:",
-                     $q->br,
-                     $q->textfield(-name => "comments", -size => 80),
-                     $q->br,
-                     $q->submit("Save Page"),
-                     $q->end_form,
-                     $q->end_html;
-       }
-       elsif ($do eq 'save') {
+               $form->tmpl_param("can_commit", $svn);
+               $form->tmpl_param("indexlink", indexlink());
+               print $form->render(submit => ["Save Page"]);
+       }
+       else {
+               # save page

                my $file=$page.$default_pagetype;
                my $newfile=1;
                if (exists $pagesources{lc($page)}) {
                my $file=$page.$default_pagetype;
                my $newfile=1;
                if (exists $pagesources{lc($page)}) {


@@ -885,14 +997,21 @@ sub cgi () { #{{{
                        $newfile=0;
                }
                
                        $newfile=0;
                }
                

-               my $content=$q->param('content');
+               my $content=$form->field('content');

                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                writefile("$srcdir/$file", $content);
                
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                writefile("$srcdir/$file", $content);
                

-               my $message="web commit from $ENV{REMOTE_ADDR}";
-               if (defined $q->param('comments')) {
-                       $message.=": ".$q->param('comments');
+               my $message="web commit ";
+               if ($session->param("name")) {
+                       $message.="by ".$session->param("name");
+               }
+               else {
+                       $message.="from $ENV{REMOTE_ADDR}";
+               }
+               if (defined $form->field('comments') &&
+                   length $form->field('comments')) {
+                       $message.=": ".$form->field('comments');

                }
                
                if ($svn) {
                }
                
                if ($svn) {


@@ -909,6 +1028,48 @@ sub cgi () { #{{{
                
                print $q->redirect("$url/".htmlpage($page));
        }
                
                print $q->redirect("$url/".htmlpage($page));
        }

+} #}}}
+
+sub cgi () { #{{{
+       eval q{use CGI};
+       eval q{use CGI::Session};
+       
+       my $q=CGI->new;
+       
+       my $do=$q->param('do');
+       if (! defined $do || ! length $do) {
+               error("\"do\" parameter missing");
+       }
+       
+       # This does not need a session.
+       if ($do eq 'recentchanges') {
+               cgi_recentchanges($q);
+               return;
+       }
+       
+       CGI::Session->name("ikiwiki_session");
+
+       my $oldmask=umask(077);
+       my $session = CGI::Session->new("driver:db_file", $q,
+               { FileName => "$srcdir/.ikiwiki/sessions.db" });
+       umask($oldmask);
+       
+       # Everything below this point needs the user to be signed in.
+       if ((! $anonok && ! defined $session->param("name") ||
+               ! userinfo_get($session->param("name"), "regdate")) || $do eq 'signin') {
+               cgi_signin($q, $session);
+       
+               # Force session flush with safe umask.
+               my $oldmask=umask(077);
+               $session->flush;
+               umask($oldmask);
+               
+               return;
+       }
+       
+       if ($do eq 'create' || $do eq 'edit') {
+               cgi_editpage($q, $session);
+       }

        else {
                error("unknown do parameter");
        }
        else {
                error("unknown do parameter");
        }


@@ -925,14 +1086,16 @@ if (grep /^-/, @ARGV) {
                "rebuild" => \$rebuild,
                "wrapper" => \$wrapper,
                "svn!" => \$svn,
                "rebuild" => \$rebuild,
                "wrapper" => \$wrapper,
                "svn!" => \$svn,

+               "anonok!" => \$anonok,

                "cgi" => \$cgi,
                "url=s" => \$url,
                "cgiurl=s" => \$cgiurl,
                "historyurl=s" => \$historyurl,
        ) || usage();
 }
                "cgi" => \$cgi,
                "url=s" => \$url,
                "cgiurl=s" => \$cgiurl,
                "historyurl=s" => \$historyurl,
        ) || usage();
 }

-usage() unless @ARGV == 2;
+usage() unless @ARGV == 3;

 ($srcdir) = possibly_foolish_untaint(shift);
 ($srcdir) = possibly_foolish_untaint(shift);

+($templatedir) = possibly_foolish_untaint(shift);

 ($destdir) = possibly_foolish_untaint(shift);
 
 if ($cgi && ! length $url) {
 ($destdir) = possibly_foolish_untaint(shift);
 
 if ($cgi && ! length $url) {