X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9e889c39ed9971e31dc33f4dea73a91d6938b535..5738f30a2954705f7954e7fb99205f5a08d35ccb:/IkiWiki/Plugin/comments.pm?ds=inline

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4f3b76db3..d8318d3e3 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -16,6 +16,7 @@ use constant POST_COMMENT => "Post comment";
 use constant CANCEL => "Cancel";
 
 my $postcomment;
+my %commentstate;
 
 sub import {
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
@@ -152,7 +153,6 @@ sub preprocess {
 	my $commentauthor;
 	my $commentauthorurl;
 	my $commentopenid;
-
 	if (defined $params{username}) {
 		$commentuser = $params{username};
 
@@ -181,11 +181,11 @@ sub preprocess {
 		$commentauthor = gettext("Anonymous");
 	}
 
-	$pagestate{$page}{comments}{commentuser} = $commentuser;
-	$pagestate{$page}{comments}{commentopenid} = $commentopenid;
-	$pagestate{$page}{comments}{commentip} = $commentip;
-	$pagestate{$page}{comments}{commentauthor} = $commentauthor;
-	$pagestate{$page}{comments}{commentauthorurl} = $commentauthorurl;
+	$commentstate{$page}{commentuser} = $commentuser;
+	$commentstate{$page}{commentopenid} = $commentopenid;
+	$commentstate{$page}{commentip} = $commentip;
+	$commentstate{$page}{commentauthor} = $commentauthor;
+	$commentstate{$page}{commentauthorurl} = $commentauthorurl;
 	if (! defined $pagestate{$page}{meta}{author}) {
 		$pagestate{$page}{meta}{author} = $commentauthor;
 	}
@@ -198,8 +198,17 @@ sub preprocess {
 			$pagestate{$page}{meta}{author} = $params{claimedauthor};
 		}
 
-		if (defined $params{url} and safeurl($params{url})) {
-			$pagestate{$page}{meta}{authorurl} = $params{url};
+		if (defined $params{url}) {
+			my $url=$params{url};
+
+			eval q{use URI::Heuristic}; 
+		  	if (! $@) {
+				$url=URI::Heuristic::uf_uristr($url);
+			}
+
+			if (safeurl($url)) {
+				$pagestate{$page}{meta}{authorurl} = $url;
+			}
 		}
 	}
 	else {
@@ -432,8 +441,8 @@ sub sessioncgi ($$) {
 
 	if ($form->submitted eq PREVIEW) {
 		my $preview = IkiWiki::htmlize($location, $page, '_comment',
-				IkiWiki::linkify($page, $page,
-					IkiWiki::preprocess($page, $page,
+				IkiWiki::linkify($location, $page,
+					IkiWiki::preprocess($location, $page,
 						IkiWiki::filter($location,
 							$page, $content),
 						0, 1)));
@@ -447,6 +456,12 @@ sub sessioncgi ($$) {
 		$template->param(title => $form->field('subject'));
 		$template->param(ctime => displaytime(time));
 
+		IkiWiki::run_hooks(pagetemplate => sub {
+			shift->(page => $location,
+				destpage => $page,
+				template => $template);
+		});
+
 		$form->tmpl_param(page_preview => $template->output);
 	}
 	else {
@@ -525,6 +540,8 @@ sub pagetemplate (@) {
 	my $page = $params{page};
 	my $template = $params{template};
 	my $shown = ($template->query(name => 'commentslink') ||
+	             $template->query(name => 'commentsurl') ||
+	             $template->query(name => 'atomcommentsurl') ||
 	             $template->query(name => 'comments')) &&
 	            commentsshown($page);
 
@@ -554,6 +571,22 @@ sub pagetemplate (@) {
 		}
 	}
 
+	if ($template->query(name => 'commentsurl')) {
+		if ($shown) {
+			$template->param(commentsurl =>
+				urlto($page, undef, 1).'#comments');
+		}
+	}
+
+	if ($template->query(name => 'atomcommentsurl') && $config{usedirs}) {
+		if ($shown) {
+			# This will 404 until there are some comments, but I
+			# think that's probably OK...
+			$template->param(atomcommentsurl =>
+				urlto($page, undef, 1).'comments.atom');
+		}
+	}
+
 	if ($template->query(name => 'commentslink')) {
 		# XXX Would be nice to say how many comments there are in
 		# the link. But, to update the number, blog pages
@@ -570,27 +603,27 @@ sub pagetemplate (@) {
 
 	if ($template->query(name => 'commentuser')) {
 		$template->param(commentuser =>
-			$pagestate{$page}{comments}{commentuser});
+			$commentstate{$page}{commentuser});
 	}
 
 	if ($template->query(name => 'commentopenid')) {
 		$template->param(commentopenid =>
-			$pagestate{$page}{comments}{commentopenid});
+			$commentstate{$page}{commentopenid});
 	}
 
 	if ($template->query(name => 'commentip')) {
 		$template->param(commentip =>
-			$pagestate{$page}{comments}{commentip});
+			$commentstate{$page}{commentip});
 	}
 
 	if ($template->query(name => 'commentauthor')) {
 		$template->param(commentauthor =>
-			$pagestate{$page}{comments}{commentauthor});
+			$commentstate{$page}{commentauthor});
 	}
 
 	if ($template->query(name => 'commentauthorurl')) {
 		$template->param(commentauthorurl =>
-			$pagestate{$page}{comments}{commentauthorurl});
+			$commentstate{$page}{commentauthorurl});
 	}
 }