X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki;h=f65f96b011b31dc39ef9499f8e77cf7a85adf1cf;hp=daf9c6d9069b30a3b857edc7240634c249a758be;hb=add57e9e6a44a2ea8624d23df9350954c55a4f91;hpb=7459d69d478aa4686245da5c59fce034317307ce diff --git a/ikiwiki b/ikiwiki index daf9c6d90..f65f96b01 100755 --- a/ikiwiki +++ b/ikiwiki @@ -5,6 +5,7 @@ use strict; use File::Find; use Memoize; use File::Spec; +use HTML::Template; 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"; -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?$)!; @@ -25,9 +26,10 @@ my $url=""; my $cgiurl=""; my $historyurl=""; my $svn=1; +my $anonok=0; sub usage { #{{{ - die "usage: ikiwiki [options] source dest\n"; + die "usage: ikiwiki [options] source templates dest\n"; } #}}} sub error ($) { #{{{ @@ -127,7 +129,7 @@ sub writefile ($$) { #{{{ close OUT; } #}}} -sub findlinks { #{{{ +sub findlinks ($) { #{{{ my $content=shift; my @links; @@ -216,8 +218,7 @@ sub htmlize ($$) { #{{{ } } #}}} -sub linkbacks ($$) { #{{{ - my $content=shift; +sub backlinks ($) { #{{{ my $page=shift; my @links; @@ -235,53 +236,67 @@ sub linkbacks ($$) { #{{{ $p_trimmed=~s/^\Q$dir\E// && $page_trimmed=~s/^\Q$dir\E//; - push @links, "$p_trimmed"; + push @links, { url => $href, page => $p_trimmed }; } } - $content.="

Links: ".join(" ", sort @links)."

\n" if @links; - return $content; + return @links; } #}}} - -sub finalize ($$) { #{{{ - my $content=shift; + +sub parentlinks ($) { #{{{ my $page=shift; - - my $title=basename($page); - $title=~s/_/ /g; + my @ret; my $pagelink=""; my $path=""; + my $skip=1; foreach my $dir (reverse split("/", $page)) { - if (length($pagelink)) { - $pagelink="$dir/ $pagelink"; + if (! $skip) { + unshift @ret, { url => "$path$dir.html", page => $dir }; } else { - $pagelink=$dir; + $skip=0; } $path.="../"; } - $path=~s/\.\.\/$/index.html/; - $pagelink="$wikiname/ $pagelink"; + return @ret; +} #}}} + +sub indexlink () { #{{{ + return "$wikiname/ "; +} #}}} + +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) { - push @actions, "Edit"; - push @actions, "RecentChanges"; + $template->param(editurl => "$cgiurl?do=edit&page=$page"); + $template->param(recentchangesurl => "$cgiurl?do=recentchanges"); } + if (length $historyurl) { - my $url=$historyurl; - $url=~s/\[\[\]\]/$pagesources{$page}/g; - push @actions, "History"; + my $u=$historyurl; + $u=~s/\[\[\]\]/$pagesources{$page}/g; + $template->param(historyurl => $u); } - $content="\n$title\n\n". - "

$pagelink

\n". - "@actions\n
\n". - $content. - "\n\n"; + $template->param( + title => $title, + indexlink => $url, + wikiname => $wikiname, + parentlinks => [parentlinks($page)], + content => $content, + backlinks => [backlinks($page)], + ); - return $content; + return $template->output; } #}}} sub render ($) { #{{{ @@ -296,7 +311,6 @@ sub render ($) { #{{{ $content=linkify($content, $file); $content=htmlize($type, $content); - $content=linkbacks($content, $page); $content=finalize($content, $page); writefile("$destdir/".htmlpage($page), $content); @@ -312,7 +326,7 @@ sub render ($) { #{{{ } #}}} sub loadindex () { #{{{ - open (IN, "$srcdir/.index") || return; + open (IN, "$srcdir/.ikiwiki/index") || return; while () { $_=possibly_foolish_untaint($_); chomp; @@ -328,7 +342,10 @@ sub loadindex () { #{{{ } #}}} sub saveindex () { #{{{ - open (OUT, ">$srcdir/.index") || error("cannot write to .index: $!"); + if (! -d "$srcdir/.ikiwiki") { + mkdir("$srcdir/.ikiwiki"); + } + open (OUT, ">$srcdir/.ikiwiki/index") || error("cannot write to index: $!"); foreach my $page (keys %oldpagemtime) { print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ". join(" ", @{$links{$page}})."\n" @@ -390,7 +407,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 ($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/) { @@ -402,23 +419,24 @@ sub rcs_recentchanges ($) { #{{{ $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/) { push @ret, { rev => $rev, user => $user, - when => $when, message => $message, + when => $when, message => [@message], 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') { - $message.="$_
\n"; + push @message, {line => $_}, } } } @@ -519,10 +537,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; - # 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; @@ -552,7 +570,7 @@ FILE: foreach my $file (@files) { 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); } } @@ -572,7 +590,7 @@ sub gen_wrapper ($$) { #{{{ 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; @@ -580,6 +598,7 @@ sub gen_wrapper ($$) { #{{{ 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) { @@ -589,7 +608,8 @@ sub gen_wrapper ($$) { #{{{ my @envsave; push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI - CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE} if $cgi; + CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE + HTTP_COOKIE} if $cgi; my $envsave=""; foreach my $var (@envsave) { $envsave.=<<"EOF" @@ -638,34 +658,148 @@ EOF exit 0; } #}}} +sub cgi_recentchanges ($) { #{{{ + my $q=shift; + + my $template=HTML::Template->new( + filename => "$templatedir/recentchanges.tmpl"); + $template->param( + title => "RecentChanges", + indexlink => $url, + wikiname => $wikiname, + changelog => [rcs_recentchanges(100)], + ); + print $q->header, $template->output; +} #}}} + +sub cgi_signin ($$) { #{{{ + my $q=shift; + my $session=shift; + + eval q{use CGI::FormBuilder}; + my $form = CGI::FormBuilder->new( + title => "$wikiname signin", + fields => [qw(do page name password confirm_password email)], + header => 1, + method => 'POST', + validate => { + name => '/^\w+$/', + confirm_password => { + perl => q{eq $form->field("password")}, + }, + email => 'EMAIL', + }, + required => 'NONE', + javascript => 0, + params => $q, + action => $q->request_uri, + 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); + 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 ($form->submitted) { + # Set required fields based on how form was submitted. + my %required=( + "Login" => [qw(name password)], + "Register" => [qw(name password confirm_password email)], + "Mail Password" => [qw(name)], + ); + foreach my $opt (@{$required{$form->submitted}}) { + $form->field(name => $opt, required => 1); + } + + # Validate password differently depending on how form was + # submitted. + if ($form->submitted eq 'Login') { + $form->field( + name => "password", + validate => sub { + # TODO get real user password + shift eq "foo"; + }, + ); + } + else { + $form->field(name => "password", validate => 'VALUE'); + } + } + else { + # Comments only shown first time. + $form->field(name => "name", comment => "use FirstnameLastName"); + $form->field(name => "confirm_password", comment => "(only needed"); + $form->field(name => "email", comment => "for registration)"); + } + + if ($form->submitted && $form->validate) { + if ($form->submitted eq 'Login') { + $session->param("name", $form->field("name")); + if (defined $form->field("do")) { + print $q->redirect( + "$cgiurl?do=".$form->field("do"). + "&page=".$form->field("page")); + } + else { + print $q->redirect($url); + } + } + 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"]);; + } + elsif ($form->submitted eq 'Mail Password') { + # TODO mail password + $form->text("Your password has been emailed to you."); + print $form->render(submit => ["Login", "Register", "Mail Password"]);; + } + } + else { + print $form->render(submit => ["Login", "Register", "Mail Password"]);; + } +} #}}} + 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') { - my $list="\n"; - - print $q->header, - $q->start_html("RecentChanges"), - $q->h1("$wikiname/ RecentChanges"), - $list, - $q->end_form, - $q->end_html; + cgi_recentchanges($q); + return; + } + + # 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" }); + + # Everything below this point needs the user to be signed in. + if ((! $anonok && ! defined $session->param("name")) || $do eq 'signin') { + cgi_signin($q, $session); return; } @@ -706,7 +840,7 @@ sub cgi () { #{{{ $q->param("do", "save"); print $q->header, $q->start_html("Creating $page"), - $q->h1("$wikiname/ Creating $page"), + $q->h1(indexlink()." Creating $page"), $q->start_form(-action => $action), $q->hidden('do'), "Select page location:", @@ -733,7 +867,7 @@ sub cgi () { #{{{ $q->param("do", "save"); print $q->header, $q->start_html("Editing $page"), - $q->h1("$wikiname/ Editing $page"), + $q->h1(indexlink()." Editing $page"), $q->start_form(-action => $action), $q->hidden('do'), $q->hidden('page'), @@ -798,14 +932,16 @@ if (grep /^-/, @ARGV) { "rebuild" => \$rebuild, "wrapper" => \$wrapper, "svn!" => \$svn, + "anonok!" => \$anonok, "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); +($templatedir) = possibly_foolish_untaint(shift); ($destdir) = possibly_foolish_untaint(shift); if ($cgi && ! length $url) {