X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki;h=7e47110593c30b9a2e1b5bd06f4f50b3b73ab8ca;hp=e590518607927001c9ccd2a541372890a867dbd5;hb=1311d67f0d430a946fc2463bd93379a1f8ca23f7;hpb=965afd875cd168713e9351d3c4c992c31f0bea0a

diff --git a/ikiwiki b/ikiwiki
index e59051860..7e4711059 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -6,13 +6,12 @@ use File::Find;
 use Memoize;
 use File::Spec;
 
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-
 BEGIN {
 	$blosxom::version="is a proper perl module too much to ask?";
 	do "/usr/bin/markdown";
 }
 
+$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 my ($srcdir, $destdir, %links, %oldlinks, %oldpagemtime, %renderedfiles,
     %pagesources);
 my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
@@ -24,13 +23,14 @@ my $default_pagetype=".mdwn";
 my $cgi=0;
 my $url="";
 my $cgiurl="";
+my $historyurl="";
 my $svn=1;
 
-sub usage {
+sub usage { #{{{
 	die "usage: ikiwiki [options] source dest\n";
-}
+} #}}}
 
-sub error ($) {
+sub error ($) { #{{{
 	if ($cgi) {
 		print "Content-type: text/html\n\n";
 		print "Error: @_\n";
@@ -39,39 +39,39 @@ sub error ($) {
 	else {
 		die @_;
 	}
-}
+} #}}}
 
-sub debug ($) {
+sub debug ($) { #{{{
 	print "@_\n" if $verbose;
-}
+} #}}}
 
-sub mtime ($) {
+sub mtime ($) { #{{{
 	my $page=shift;
 	
 	return (stat($page))[9];
-}
+} #}}}
 
-sub possibly_foolish_untaint ($) {
+sub possibly_foolish_untaint ($) { #{{{
 	my $tainted=shift;
 	my ($untainted)=$tainted=~/(.*)/;
 	return $untainted;
-}
+} #}}}
 
-sub basename {
+sub basename ($) { #{{{
 	my $file=shift;
 
 	$file=~s!.*/!!;
 	return $file;
-}
+} #}}}
 
-sub dirname {
+sub dirname ($) { #{{{
 	my $file=shift;
 
 	$file=~s!/?[^/]+$!!;
 	return $file;
-}
+} #}}}
 
-sub pagetype ($) {
+sub pagetype ($) { #{{{
 	my $page=shift;
 	
 	if ($page =~ /\.mdwn$/) {
@@ -80,24 +80,24 @@ sub pagetype ($) {
 	else {
 		return "unknown";
 	}
-}
+} #}}}
 
-sub pagename ($) {
+sub pagename ($) { #{{{
 	my $file=shift;
 
 	my $type=pagetype($file);
 	my $page=$file;
 	$page=~s/\Q$type\E*$// unless $type eq 'unknown';
 	return $page;
-}
+} #}}}
 
-sub htmlpage ($) {
+sub htmlpage ($) { #{{{
 	my $page=shift;
 
 	return $page.".html";
-}
+} #}}}
 
-sub readfile ($) {
+sub readfile ($) { #{{{
 	my $file=shift;
 
 	local $/=undef;
@@ -105,9 +105,9 @@ sub readfile ($) {
 	my $ret=<IN>;
 	close IN;
 	return $ret;
-}
+} #}}}
 
-sub writefile ($$) {
+sub writefile ($$) { #{{{
 	my $file=shift;
 	my $content=shift;
 
@@ -125,9 +125,9 @@ sub writefile ($$) {
 	open (OUT, ">$file") || error("failed to write $file: $!");
 	print OUT $content;
 	close OUT;
-}
+} #}}}
 
-sub findlinks {
+sub findlinks ($) { #{{{
 	my $content=shift;
 
 	my @links;
@@ -135,13 +135,13 @@ sub findlinks {
 		push @links, lc($1);
 	}
 	return @links;
-}
+} #}}}
 
 # Given a page and the text of a link on the page, determine which existing
 # page that link best points to. Prefers pages under a subdirectory with
 # the same name as the source page, failing that goes down the directory tree
 # to the base looking for matching pages.
-sub bestlink ($$) {
+sub bestlink ($$) { #{{{
 	my $page=shift;
 	my $link=lc(shift);
 	
@@ -159,15 +159,15 @@ sub bestlink ($$) {
 
 	#print STDERR "warning: page $page, broken link: $link\n";
 	return "";
-}
+} #}}}
 
-sub isinlinableimage ($) {
+sub isinlinableimage ($) { #{{{
 	my $file=shift;
 	
 	$file=~/\.(png|gif|jpg|jpeg)$/;
-}
+} #}}}
 
-sub htmllink {
+sub htmllink { #{{{
 	my $page=shift;
 	my $link=shift;
 	my $noimagelink=shift;
@@ -193,18 +193,18 @@ sub htmllink {
 		return "<img src=\"$bestlink\">";
 	}
 	return "<a href=\"$bestlink\">$link</a>";
-}
+} #}}}
 
-sub linkify ($$) {
+sub linkify ($$) { #{{{
 	my $content=shift;
 	my $file=shift;
 
 	$content =~ s/$wiki_link_regexp/htmllink(pagename($file), $1)/eg;
 	
 	return $content;
-}
+} #}}}
 
-sub htmlize ($$) {
+sub htmlize ($$) { #{{{
 	my $type=shift;
 	my $content=shift;
 	
@@ -214,9 +214,9 @@ sub htmlize ($$) {
 	else {
 		error("htmlization of $type not supported");
 	}
-}
+} #}}}
 
-sub linkbacks ($$) {
+sub linkbacks ($$) { #{{{
 	my $content=shift;
 	my $page=shift;
 
@@ -241,9 +241,13 @@ sub linkbacks ($$) {
 
 	$content.="<hr><p>Links: ".join(" ", sort @links)."</p>\n" if @links;
 	return $content;
-}
+} #}}}
 
-sub finalize ($$) {
+sub indexlink () { #{{{
+	return "<a href=\"$url\">$wikiname</a>/ ";
+} #}}}
+	
+sub finalize ($$) { #{{{
 	my $content=shift;
 	my $page=shift;
 
@@ -262,13 +266,18 @@ sub finalize ($$) {
 		$path.="../";
 	}
 	$path=~s/\.\.\/$/index.html/;
-	$pagelink="<a href=\"$path\">$wikiname</a>/ $pagelink";
+	$pagelink=indexlink()." $pagelink";
 	
 	my @actions;
 	if (length $cgiurl) {
 		push @actions, "<a href=\"$cgiurl?do=edit&page=$page\">Edit</a>";
 		push @actions, "<a href=\"$cgiurl?do=recentchanges\">RecentChanges</a>";
 	}
+	if (length $historyurl) {
+		my $url=$historyurl;
+		$url=~s/\[\[\]\]/$pagesources{$page}/g;
+		push @actions, "<a href=\"$url\">History</a>";
+	}
 	
 	$content="<html>\n<head><title>$title</title></head>\n<body>\n".
 	          "<h1>$pagelink</h1>\n".
@@ -277,9 +286,9 @@ sub finalize ($$) {
 	          "</body>\n</html>\n";
 	
 	return $content;
-}
+} #}}}
 
-sub render ($) {
+sub render ($) { #{{{
 	my $file=shift;
 	
 	my $type=pagetype($file);
@@ -304,10 +313,10 @@ sub render ($) {
 		$oldpagemtime{$file}=time;
 		$renderedfiles{$file}=$file;
 	}
-}
+} #}}}
 
-sub loadindex () {
-	open (IN, "$srcdir/.index") || return;
+sub loadindex () { #{{{
+	open (IN, "$srcdir/.ikiwiki/index") || return;
 	while (<IN>) {
 		$_=possibly_foolish_untaint($_);
 		chomp;
@@ -320,27 +329,30 @@ sub loadindex () {
 		$renderedfiles{$page}=$rendered;
 	}
 	close IN;
-}	
+} #}}}
 
-sub saveindex () {
-	open (OUT, ">$srcdir/.index") || error("cannot write to .index: $!");
+sub saveindex () { #{{{
+	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"
 				if $oldpagemtime{$page};
 	}
 	close OUT;
-}
+} #}}}
 
-sub rcs_update () {
+sub rcs_update () { #{{{
 	if (-d "$srcdir/.svn") {
 		if (system("svn", "update", "--quiet", $srcdir) != 0) {
 			warn("svn update failed\n");
 		}
 	}
-}
+} #}}}
 
-sub rcs_commit ($) {
+sub rcs_commit ($) { #{{{
 	my $message=shift;
 
 	if (-d "$srcdir/.svn") {
@@ -349,9 +361,9 @@ sub rcs_commit ($) {
 			warn("svn commit failed\n");
 		}
 	}
-}
+} #}}}
 
-sub rcs_add ($) {
+sub rcs_add ($) { #{{{
 	my $file=shift;
 
 	if (-d "$srcdir/.svn") {
@@ -365,9 +377,9 @@ sub rcs_add ($) {
 			warn("svn add failed\n");
 		}
 	}
-}
+} #}}}
 
-sub rcs_recentchanges ($) {
+sub rcs_recentchanges ($) { #{{{
 	my $num=shift;
 	my @ret;
 	
@@ -419,9 +431,9 @@ sub rcs_recentchanges ($) {
 	}
 
 	return @ret;
-}
+} #}}}
 
-sub prune ($) {
+sub prune ($) { #{{{
 	my $file=shift;
 
 	unlink($file);
@@ -429,9 +441,9 @@ sub prune ($) {
 	while (rmdir($dir)) {
 		$dir=dirname($dir);
 	}
-}
+} #}}}
 
-sub refresh () {
+sub refresh () { #{{{
 	# Find existing pages.
 	my %exists;
 	my @files;
@@ -552,11 +564,11 @@ FILE:		foreach my $file (@files) {
 			}
 		}
 	}
-}
+} #}}}
 
 # Generates a C wrapper program for running ikiwiki in a specific way.
 # The wrapper may be safely made suid.
-sub gen_wrapper ($$) {
+sub gen_wrapper ($$) { #{{{
 	my ($svn, $rebuild)=@_;
 
 	eval q{use Cwd 'abs_path'};
@@ -574,6 +586,7 @@ sub gen_wrapper ($$) {
 	push @params, "--cgi" if $cgi;
 	push @params, "--url=$url" if $url;
 	push @params, "--cgiurl=$cgiurl" if $cgiurl;
+	push @params, "--historyurl=$historyurl" if $historyurl;
 	my $params=join(" ", @params);
 	my $call='';
 	foreach my $p ($this, $this, @params) {
@@ -583,7 +596,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"
@@ -630,36 +644,155 @@ EOF
 	unlink("ikiwiki-wrap.c");
 	print "successfully generated ikiwiki-wrap\n";
 	exit 0;
-}
+} #}}}
 
-sub cgi () {
+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;
+} #}}}
+
+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,
+	);
+	
+	$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")) {
+				$q->redirect(
+					"$cgiurl?do=".$form->field("do").
+					"&page=".$form->field("page"));
+			}
+			else {
+				$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;
-
+	# 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') {
-		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("<a href=\"$url\">$wikiname</a>/ RecentChanges"),
-		      $list,
-		      $q->end_form,
-		      $q->end_html;
+		cgi_recentchanges($q);
+		return;
+	}
+	
+	if (! defined $session->param("name") || $do eq 'signin') {
+		cgi_signin($q, $session);
 		return;
 	}
 	
@@ -700,8 +833,7 @@ sub cgi () {
 		$q->param("do", "save");
 		print $q->header,
 		      $q->start_html("Creating $page"),
-		      $q->start_h1("<a href=\"$url\">$wikiname</a>/ Creating $page"),
-		      $q->end_hi,
+		      $q->h1(indexlink()." Creating $page"),
 		      $q->start_form(-action => $action),
 		      $q->hidden('do'),
 		      "Select page location:",
@@ -728,8 +860,7 @@ sub cgi () {
 		$q->param("do", "save");
 		print $q->header,
 		      $q->start_html("Editing $page"),
-		      $q->h1("<a href=\"$url\">$wikiname</a>/ Editing $page"),
-		      $q->end_hi,
+		      $q->h1(indexlink()." Editing $page"),
 		      $q->start_form(-action => $action),
 		      $q->hidden('do'),
 		      $q->hidden('page'),
@@ -781,8 +912,9 @@ sub cgi () {
 	else {
 		error("unknown do parameter");
 	}
-}
+} #}}}
 
+# main {{{
 my $rebuild=0;
 my $wrapper=0;
 if (grep /^-/, @ARGV) {
@@ -796,6 +928,7 @@ if (grep /^-/, @ARGV) {
 		"cgi" => \$cgi,
 		"url=s" => \$url,
 		"cgiurl=s" => \$cgiurl,
+		"historyurl=s" => \$historyurl,
 	) || usage();
 }
 usage() unless @ARGV == 2;
@@ -818,3 +951,4 @@ else {
 	refresh();
 	saveindex();
 }
+#}}}