X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8b31c53366bbee51b36501443eafd0f712ee6a4c..f32369f66924e0c008370c29462af57fd218267a:/IkiWiki/Plugin/recentchanges.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index f5982604b..8383fb72a 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -8,7 +8,9 @@ use IkiWiki 2.00;
 sub import { #{{{
 	hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
+	hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
 	hook(type => "htmlize", id => "_change", call => \&htmlize);
+	hook(type => "cgi", id => "recentchanges", call => \&cgi);
 } #}}}
 
 sub checkconfig () { #{{{
@@ -26,18 +28,65 @@ sub refresh ($) { #{{{
 	
 	# delete old and excess changes
 	foreach my $page (keys %pagesources) {
-		if ($page=~/^\Q$config{recentchangespage}\E\/change_/ && ! $seen{$page}) {
+		if ($pagesources{$page} =~ /\._change$/ && ! $seen{$page}) {
 			unlink($config{srcdir}.'/'.$pagesources{$page});
 		}
 	}
 } #}}}
 
+# Enable the recentchanges link on wiki pages.
+sub pagetemplate (@) { #{{{
+	my %params=@_;
+	my $template=$params{template};
+	my $page=$params{page};
+
+	if (defined $config{recentchangespage} && $config{rcs} &&
+	    $page ne $config{recentchangespage} &&
+	    $template->query(name => "recentchangesurl")) {
+		$template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
+		$template->param(have_actions => 1);
+	}
+} #}}}
+
 # Pages with extension _change have plain html markup, pass through.
 sub htmlize (@) { #{{{
 	my %params=@_;
 	return $params{content};
 } #}}}
 
+sub cgi ($) { #{{{
+	my $cgi=shift;
+	if (defined $cgi->param('do') && $cgi->param('do') eq "recentchanges_link") {
+		# This is a link from a change page to some
+		# other page. Since the change pages are only generated
+		# once, statically, links on them won't be updated if the
+		# page they link to is deleted, or newly created, or
+		# changes for whatever reason. So this CGI handles that
+		# dynamic linking stuff.
+		my $page=$cgi->param("page");
+		if (!defined $page) {
+			error("missing page parameter");
+		}
+
+		IkiWiki::loadindex();
+
+		my $link=bestlink("", $page);
+		if (! length $link) {
+			print "Content-type: text/html\n\n";
+			print IkiWiki::misctemplate(gettext(gettext("missing page")),
+				"<p>".
+				sprintf(gettext("The page %s does not exist."),
+					htmllink("", "", $page)).
+				"</p>");
+		}
+		else {
+			IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".htmlpage($link)));
+		}
+
+		exit;
+	}
+}
+
 sub store ($$$) { #{{{
 	my $change=shift;
 
@@ -52,32 +101,41 @@ sub store ($$$) { #{{{
 	delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
 	$change->{pages} = [
 		map {
-			if (length $config{url}) {
-				$_->{link} = "<a href=\"$config{url}/".
-					urlto($_->{page},"")."\">".
-					IkiWiki::pagetitle($_->{page})."</a>";
+			if (length $config{cgiurl}) {
+				$_->{link} = "<a href=\"".
+					IkiWiki::cgiurl(
+						do => "recentchanges_link",
+						page => $_->{page}
+					).
+					"\">".
+					IkiWiki::pagetitle($_->{page}).
+					"</a>"
 			}
 			else {
 				$_->{link} = IkiWiki::pagetitle($_->{page});
 			}
+			$_->{baseurl}="$config{url}/" if length $config{url};
+
 			$_;
 		} @{$change->{pages}}
 	];
 	push @{$change->{pages}}, { link => '...' } if $is_excess;
 
 	# See if the committer is an openid.
-	my $oiduser=IkiWiki::openiduser($change->{user});
+	$change->{author}=$change->{user};
+	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
 	if (defined $oiduser) {
 		$change->{authorurl}=$change->{user};
 		$change->{user}=$oiduser;
 	}
-	elsif (length $config{url}) {
-		$change->{authorurl}="$config{url}/".
-			(length $config{userdir} ? "$config{userdir}/" : "").
-			$change->{user};
+	elsif (length $config{cgiurl}) {
+		$change->{authorurl} = IkiWiki::cgiurl(
+			do => "recentchanges_link",
+			page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+		);
 	}
 
-	# escape  wikilinks and preprocessor stuff in commit messages
+	# escape wikilinks and preprocessor stuff in commit messages
 	if (ref $change->{message}) {
 		foreach my $field (@{$change->{message}}) {
 			if (exists $field->{line}) {
@@ -93,9 +151,9 @@ sub store ($$$) { #{{{
 		commitdate => displaytime($change->{when}, "%X %x"),
 		wikiname => $config{wikiname},
 	);
-	$template->param(baseurl => "$config{url}/") if length $config{url};
 	IkiWiki::run_hooks(pagetemplate => sub {
-		shift->(page => $page, destpage => $page, template => $template);
+		shift->(page => $page, destpage => $page,
+			template => $template, rev => $change->{rev});
 	});
 
 	my $file=$page."._change";
@@ -105,10 +163,4 @@ sub store ($$$) { #{{{
 	return $page;
 } #}}}
 
-sub updatechanges ($$) { #{{{
-	my $subdir=shift;
-	my @changes=@{shift()};
-	
-} #}}}
-
 1