From f36080ae026d630c180e4a73709d09ca779a0c2e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 16 Oct 2008 18:20:16 -0400
Subject: aggregate: Avoid bug that caused immediate expiration of items with a
 date in the future.

---
 IkiWiki/Plugin/aggregate.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 26c5cc9ae..c18784e8b 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -625,6 +625,10 @@ sub add_page (@) { #{{{
 		# Store it in pagectime for expiry code to use also.
 		$IkiWiki::pagectime{$guid->{page}}=$mtime;
 	}
+	else {
+		# Dummy value for expiry code.
+		$IkiWiki::pagectime{$guid->{page}}=time;
+	}
 } #}}}
 
 sub htmlescape ($) { #{{{
-- 
cgit v1.2.3


From 79b376f9912891a8748fcbb4580969e4dbf7fc75 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 17 Oct 2008 20:28:18 -0400
Subject: Add an underlay for javascript, and add ikiwiki.js containing some
 utility code.

* Add an underlay for javascript, and add ikiwiki.js containing some utility
  code.
* toggle: Stop embedding the full toggle code on each page using it, and
  move it to toggle.js in the javascript underlay.
---
 IkiWiki/Plugin/attachment.pm    |  7 +++--
 IkiWiki/Plugin/toggle.pm        | 69 ++++++++---------------------------------
 debian/changelog                |  9 ++++++
 doc/plugins/write.mdwn          | 29 +++++++++++++++++
 po/ikiwiki.pot                  | 16 +++++-----
 underlays/javascript/ikiwiki.js | 37 ++++++++++++++++++++++
 underlays/javascript/toggle.js  | 29 +++++++++++++++++
 7 files changed, 129 insertions(+), 67 deletions(-)
 create mode 100644 underlays/javascript/ikiwiki.js
 create mode 100644 underlays/javascript/toggle.js

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index dcac3e820..6c1df488a 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -6,6 +6,7 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+	add_underlay("javascript");
 	hook(type => "getsetup", id => "attachment", call => \&getsetup);
 	hook(type => "checkconfig", id => "attachment", call => \&checkconfig);
 	hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
@@ -104,10 +105,10 @@ sub formbuilder_setup (@) { #{{{
 		$form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
 		$form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
 
-		# Add the javascript from the toggle plugin;
-		# the attachments interface uses it to toggle visibility.
+		# Add the toggle javascript; the attachments interface uses
+		# it to toggle visibility.
 		require IkiWiki::Plugin::toggle;
-		$form->tmpl_param("javascript" => $IkiWiki::Plugin::toggle::javascript);
+		$form->tmpl_param("javascript" => IkiWiki::Plugin::toggle::include_javascript($params{page}, 1));
 		# Start with the attachments interface toggled invisible,
 		# but if it was used, keep it open.
 		if ($form->submitted ne "Upload Attachment" &&
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 610d38e3a..657d8d3c2 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -5,61 +5,8 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-# Here's the javascript that makes this possible. A key feature is the use
-# of css to hide toggleables, to avoid any flashing on page load. The css
-# is only emitted after the javascript tests that it's going to be able to
-# show the toggleables.
-our $javascript=<<'EOF';
-<script type="text/javascript">
-<!--
-if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
-	document.write('<style type="text/css">div.toggleable { display: none; }</style>');
-	window.onload = inittoggle;
-}
-
-function inittoggle() {
-	var as = getElementsByClass('toggle');
-	for (var i = 0; i < as.length; i++) {
-		var id = as[i].href.match(/#(\w.+)/)[1];
-		if (document.getElementById(id).className == "toggleable")
-			document.getElementById(id).style.display="none";
-		as[i].onclick = function() {
-			toggle(this);
-			return false;
-		}
-	}
-}
-
-function toggle(s) {
-	var id = s.href.match(/#(\w.+)/)[1];
-	style = document.getElementById(id).style;
-	if (style.display == "none")
-		style.display = "block";
-	else
-		style.display = "none";
-}
-
-function getElementsByClass(cls, node, tag) {
-	if (document.getElementsByClass)
-		return document.getElementsByClass(cls, node, tag);
-	if (! node) node = document;
-	if (! tag) tag = '*';
-	var ret = new Array();
-	var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)");
-	var els = node.getElementsByTagName(tag);
-	for (i = 0; i < els.length; i++) {
-		if ( pattern.test(els[i].className) ) {
-			ret.push(els[i]);
-		}
-	}
-	return ret;
-}
-
-//-->
-</script>
-EOF
-
 sub import { #{{{
+	add_underlay("javascript");
 	hook(type => "getsetup", id => "toggle", call => \&getsetup);
 	hook(type => "preprocess", id => "toggle",
 		call => \&preprocess_toggle);
@@ -121,12 +68,22 @@ sub format (@) { #{{{
 
 	if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
 		$params{content}=~s/<div class="toggleableend">//g;
-		if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
+		if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
 			# no </body> tag, probably in preview mode
-			$params{content}=$javascript.$params{content};
+			$params{content}=include_javascript($params{page}, 1).$params{content};
 		}
 	}
 	return $params{content};
 } # }}}
 
+sub include_javascript ($;$) { #{{{
+	my $page=shift;
+	my $absolute=shift;
+	
+	return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+		'" type="text/javascript" charset="utf-8"></script>'."\n".
+		'<script src="'.urlto("toggle.js", $page, $absolute).
+		'" type="text/javascript" charset="utf-8"></script>';
+} #}}}
+
 1
diff --git a/debian/changelog b/debian/changelog
index b93da0aae..66d108e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (2.68) UNRELEASED; urgency=low
+
+  * Add an underlay for javascript, and add ikiwiki.js containing some utility
+    code.
+  * toggle: Stop embedding the full toggle code on each page using it, and
+    move it to toggle.js in the javascript underlay.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
+
 ikiwiki (2.67) unstable; urgency=low
 
   * remove: Avoid $_ breakage. (Stupid, stupid perl.)
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 1b78f5900..daf70c8e2 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -847,3 +847,32 @@ to a hash containing all the config items. They should also implement a
 By the way, to parse a ikiwiki setup file and populate `%config`, a
 program just needs to do something like:
 `use IkiWiki::Setup; IkiWiki::Setup::load($filename)`
+
+### Javascript
+
+Some plugins use javascript to make ikiwiki look a bit more web-2.0-ish.
+
+All javascript code should be put in `.js` files in the `javascript`
+underlay, and plugins using those files can enable use of the underlay by
+calling `add_underlay("javascript");` in their `import` function.
+
+You'll have to arrange for `<script>` tags to be added to the pages that
+use your javascript. This can be done using a `format` hook.
+
+Ikiwiki provides some utility functions in `ikiwiki.js`, for use by other
+javascript code. These include:
+
+#### `getElementsByClass(cls, node, tag)` 
+
+Returns an array of elements with the given class. The node and tag are
+optional and define what document node and element names to search.
+
+#### `hook(name, call)`
+
+The function `call` will be run as part of the hook named `name`.
+
+Note that to hook into `window.onload`, you can use the `onload' hook.
+
+#### `run_hooks(name)`
+
+Runs the hooks with the specified name.
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 87898d285..6853df153 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-17 20:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1167
 msgid "Error"
 msgstr ""
 
@@ -150,20 +150,20 @@ msgstr ""
 msgid "Failed to delete file from S3: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -926,12 +926,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1150
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1659
 msgid "yes"
 msgstr ""
 
diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki.js
new file mode 100644
index 000000000..29de7ec6f
--- /dev/null
+++ b/underlays/javascript/ikiwiki.js
@@ -0,0 +1,37 @@
+// ikiwiki's javascript utility function library
+
+var hooks = new Array;
+window.onload = run_hooks_onload;
+
+function run_hooks_onload() {
+	run_hooks("onload");
+}
+
+function run_hooks(name) {
+	for (var i = 0; i < hooks.length; i++) {
+		if (hooks[i].name == name) {
+			hooks[i].call();
+		}
+	}
+}
+
+function hook(name, call) {
+	var h={name: name, call: call};
+	hooks.push(h);
+}
+
+function getElementsByClass(cls, node, tag) {
+        if (document.getElementsByClass)
+                return document.getElementsByClass(cls, node, tag);
+        if (! node) node = document;
+        if (! tag) tag = '*';
+        var ret = new Array();
+        var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)");
+        var els = node.getElementsByTagName(tag);
+        for (i = 0; i < els.length; i++) {
+                if ( pattern.test(els[i].className) ) {
+                        ret.push(els[i]);
+                }
+        }
+        return ret;
+}
diff --git a/underlays/javascript/toggle.js b/underlays/javascript/toggle.js
new file mode 100644
index 000000000..d190b737a
--- /dev/null
+++ b/underlays/javascript/toggle.js
@@ -0,0 +1,29 @@
+// Uses CSS to hide toggleables, to avoid any flashing on page load. The
+// CSS is only emitted after it tests that it's going to be able
+// to show the toggleables.
+if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
+	document.write('<style type="text/css">div.toggleable { display: none; }</style>');
+	hook("onload", inittoggle);
+}
+
+function inittoggle() {
+	var as = getElementsByClass('toggle');
+	for (var i = 0; i < as.length; i++) {
+		var id = as[i].href.match(/#(\w.+)/)[1];
+		if (document.getElementById(id).className == "toggleable")
+			document.getElementById(id).style.display="none";
+		as[i].onclick = function() {
+			toggle(this);
+			return false;
+		}
+	}
+}
+
+function toggle(s) {
+	var id = s.href.match(/#(\w.+)/)[1];
+	style = document.getElementById(id).style;
+	if (style.display == "none")
+		style.display = "block";
+	else
+		style.display = "none";
+}
-- 
cgit v1.2.3


From 7390a7a0721d9985c88efec1fd0e3a19d0368c82 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 17 Oct 2008 20:47:32 -0400
Subject: relativedate: New javascript-alicious plugin that makes all dates
 display relative, in a very nice way, if I say so myself.

---
 IkiWiki/Plugin/inline.pm             |  2 ++
 IkiWiki/Plugin/relativedate.pm       | 41 +++++++++++++++++++++
 IkiWiki/Render.pm                    |  2 ++
 debian/changelog                     |  2 ++
 doc/plugins/ddate.mdwn               |  1 +
 doc/plugins/prettydate.mdwn          |  2 +-
 doc/plugins/relativedate.mdwn        | 16 +++++++++
 doc/plugins/type/date.mdwn           |  1 +
 po/ikiwiki.pot                       | 32 ++++++++---------
 templates/inlinepage.tmpl            |  8 ++---
 templates/page.tmpl                  | 14 ++++----
 underlays/javascript/relativedate.js | 70 ++++++++++++++++++++++++++++++++++++
 12 files changed, 163 insertions(+), 28 deletions(-)
 create mode 100644 IkiWiki/Plugin/relativedate.pm
 create mode 100644 doc/plugins/relativedate.mdwn
 create mode 100644 doc/plugins/type/date.mdwn
 create mode 100644 underlays/javascript/relativedate.js

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6d88c2f15..536d7cd02 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -316,7 +316,9 @@ sub preprocess_inline (@) { #{{{
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+				$template->param(ctime_raw => scalar localtime($pagectime{$page}));
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
+				$template->param(mtime_raw => scalar localtime($pagemtime{$page}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
 	
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
new file mode 100644
index 000000000..99265676b
--- /dev/null
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::relativedate;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub import { #{{{
+	add_underlay("javascript");
+	hook(type => "format", id => "relativedate", call => \&format);
+} # }}}
+
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
+sub format (@) { #{{{
+        my %params=@_;
+
+	if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
+		# no </body> tag, probably in preview mode
+		$params{content}=include_javascript($params{page}, 1).$params{content};
+	}
+	return $params{content};
+} # }}}
+
+sub include_javascript ($;$) { #{{{
+	my $page=shift;
+	my $absolute=shift;
+	
+	return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+		'" type="text/javascript" charset="utf-8"></script>'."\n".
+		'<script src="'.urlto("relativedate.js", $page, $absolute).
+		'" type="text/javascript" charset="utf-8"></script>';
+} #}}}
+
+1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index bc997ffb0..8385c1aff 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -109,7 +109,9 @@ sub genpage ($$) { #{{{
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
+		mtime_raw => scalar localtime($pagemtime{$page}),
 		ctime => displaytime($pagectime{$page}),
+		ctime_raw => scalar localtime($pagectime{$page}),
 		baseurl => baseurl($page),
 	);
 
diff --git a/debian/changelog b/debian/changelog
index 66d108e9e..908eb1f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     code.
   * toggle: Stop embedding the full toggle code on each page using it, and
     move it to toggle.js in the javascript underlay.
+  * relativedate: New javascript-alicious plugin that makes all dates display
+    relative, in a very nice way, if I say so myself.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/plugins/ddate.mdwn b/doc/plugins/ddate.mdwn
index e82760d88..741606a6e 100644
--- a/doc/plugins/ddate.mdwn
+++ b/doc/plugins/ddate.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=ddate author="[[Joey]]"]]
 [[!tag type/fun]]
+[[!tag type/date]]
 
 Enables use of Discordian dates. `--timeformat` can be used to change
 the date format; see `ddate(1)`.
diff --git a/doc/plugins/prettydate.mdwn b/doc/plugins/prettydate.mdwn
index 9a67f5dca..11ad4252f 100644
--- a/doc/plugins/prettydate.mdwn
+++ b/doc/plugins/prettydate.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=prettydate author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/date]]
 
 Enabling this plugin changes the dates displayed on pages in the wiki to
 a format that is nice and easy to read. Examples: "late Wednesday evening, 
diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn
new file mode 100644
index 000000000..ecbdf68bf
--- /dev/null
+++ b/doc/plugins/relativedate.mdwn
@@ -0,0 +1,16 @@
+[[!template id=plugin name=prettydate author="[[Joey]]"]]
+[[!tag type/date]]
+
+This plugin lets dates be displayed in relative form. Examples: "2 days ago", 
+"1 month and 3 days ago", "30 minutes ago". Hovering over the date will
+cause a tooltip to pop up with the absolute date.
+
+This only works in browsers with javascript enabled; other browsers will
+show the absolute date instead. Also, this plugin can be used with other
+plugins like [[prettydate]] that change how the absolute date is displayed.
+
+If this plugin is enabled, you may also add relative dates to pages in the
+wiki, by using html elements in the "date" class. For example, this will
+display as a relative date:
+
+	<span class="date">Fri Oct 17 18:36:13 EDT 2008</span>
diff --git a/doc/plugins/type/date.mdwn b/doc/plugins/type/date.mdwn
new file mode 100644
index 000000000..eae1226da
--- /dev/null
+++ b/doc/plugins/type/date.mdwn
@@ -0,0 +1 @@
+These plugins control how ikiwiki displays dates.
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 6853df153..2d213a799 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 20:11-0400\n"
+"POT-Creation-Date: 2008-10-17 20:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -172,9 +172,9 @@ msgid "automatic index generation"
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:329 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
+#: ../IkiWiki/Render.pm:151
 msgid "discussion"
 msgstr ""
 
@@ -318,11 +318,11 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:337 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:572
+#: ../IkiWiki/Plugin/inline.pm:574
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -780,59 +780,59 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:253
+#: ../IkiWiki/Render.pm:255
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:279 ../IkiWiki/Render.pm:304
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:286
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:360
+#: ../IkiWiki/Render.pm:362
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:400
+#: ../IkiWiki/Render.pm:402
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:405
+#: ../IkiWiki/Render.pm:407
 #, perl-format
 msgid "rendering %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Render.pm:428
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:449
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:488
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:498
+#: ../IkiWiki/Render.pm:500
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:522
+#: ../IkiWiki/Render.pm:524
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index ffcb897a8..3f640fcdd 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -5,9 +5,9 @@
 <TMPL_IF NAME="AUTHOR">
 <span class="author">
 <TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
@@ -28,14 +28,14 @@
 <div class="inlinefooter">
 
 <span class="pagedate">
-Posted <TMPL_VAR CTIME>
+Posted <span class="date" title="<TMPL_VAR CTIME_RAW>"><TMPL_VAR CTIME></span>
 </span>
 
 <TMPL_IF NAME="TAGS">
 <span class="tags">
 Tags:
 <TMPL_LOOP NAME="TAGS">
-<TMPL_VAR NAME=LINK>
+<TMPL_VAR LINK>
 </TMPL_LOOP>
 </span>
 </TMPL_IF>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f2f9c34cc..7456e9e41 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -22,7 +22,7 @@
 <span>
 <span class="parentlinks">
 <TMPL_LOOP NAME="PARENTLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ 
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ 
 </TMPL_LOOP>
 </span>
 <span class="title">
@@ -74,7 +74,7 @@
 <div class="tags">
 Tags:
 <TMPL_LOOP NAME="TAGS">
-<TMPL_VAR NAME=LINK>
+<TMPL_VAR LINK>
 </TMPL_LOOP>
 </div>
 </TMPL_IF>
@@ -83,13 +83,13 @@ Tags:
 <div id="backlinks">
 Links:
 <TMPL_LOOP NAME="BACKLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
 <TMPL_IF NAME="MORE_BACKLINKS">
 <span class="popup">...
 <span class="balloon">
 <TMPL_LOOP NAME="MORE_BACKLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
 </span>
 </span>
@@ -112,13 +112,13 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 
 <div class="pagedate">
-Last edited <TMPL_VAR NAME=MTIME>
-<!-- Created <TMPL_VAR NAME=CTIME> -->
+Last edited <span class="date" title="<TMPL_VAR MTIME_RAW>"><TMPL_VAR MTIME></span>
+<!-- Created <TMPL_VAR CTIME> -->
 </div>
 
 </div><!-- #pageinfo -->
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
-<!-- from <TMPL_VAR NAME=WIKINAME> -->
+<!-- from <TMPL_VAR WIKINAME> -->
 </div><!-- .pagefooter #footer -->
 
 </body>
diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/relativedate.js
new file mode 100644
index 000000000..c5e62b3cc
--- /dev/null
+++ b/underlays/javascript/relativedate.js
@@ -0,0 +1,70 @@
+// Causes html elements in the 'date' and 'pagedate' classes to be displayed
+// as relative dates. The date is parsed from the title attribute, or from
+// the element content.
+
+var dateElements;
+
+hook("onload", getDates);
+
+function getDates() {
+	dateElements = getElementsByClass('date');
+	for (var i = 0; i < dateElements.length; i++) {
+		var elt = dateElements[i];
+		var title = elt.attributes.title;
+		var d = new Date(title ? title.value : elt.innerHTML);
+		if (! isNaN(d)) {
+			dateElements[i].date=d;
+			elt.title=elt.innerHTML;
+		}
+	}
+
+	showDates();
+}
+
+function showDates() {
+	for (var i = 0; i < dateElements.length; i++) {
+		var elt = dateElements[i];
+		var d = elt.date;
+		if (! isNaN(d)) {
+			elt.innerHTML=relativeDate(d);
+		}
+	}
+	setTimeout(showDates,30000); // keep updating every 30s
+}
+
+var timeUnits = new Array;
+timeUnits['minute'] = 60;
+timeUnits['hour'] = timeUnits['minute'] * 60;
+timeUnits['day'] = timeUnits['hour'] * 24;
+timeUnits['month'] = timeUnits['day'] * 30;
+timeUnits['year'] = timeUnits['day'] * 364;
+var timeUnitOrder = ['year', 'month', 'day', 'hour', 'minute'];
+
+function relativeDate(date) {
+	var now = new Date();
+	var offset = date.getTime() - now.getTime();
+	var seconds = Math.round(Math.abs(offset) / 1000);
+
+	var ret = "";
+	var shown = 0;
+	for (i = 0; i < timeUnitOrder.length; i++) {
+		var unit = timeUnitOrder[i];
+		if (seconds >= timeUnits[unit]) {
+			var num = Math.floor(seconds / timeUnits[unit]);
+			seconds -= num * timeUnits[unit];
+			if (ret)
+				ret += "and ";
+			ret += num + " " + unit + (num > 1 ? "s" : "") + " ";
+
+			if (++shown == 2)
+				break;
+		}
+		else if (shown)
+			break;
+	}
+
+	if (! ret)
+		ret = "less than a minute "
+
+	return ret + (offset < 0 ? "ago" : "from now");
+}
-- 
cgit v1.2.3


From 02ec92c6cb0cfb86fb9a0b65addbd8c0934869c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 17 Oct 2008 21:21:07 -0400
Subject: make relativedate work for the dates on the recentchanges page

Having a always current relative date on recentchanges is very, very nice.
---
 IkiWiki/Plugin/recentchanges.pm | 1 +
 templates/change.tmpl           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index eb23b184b..d25c7abff 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -173,6 +173,7 @@ sub store ($$$) { #{{{
 	$template->param(
 		%$change,
 		commitdate => displaytime($change->{when}, "%X %x"),
+		commitdate_raw => scalar localtime($change->{when}),
 		wikiname => $config{wikiname},
 	);
 	IkiWiki::run_hooks(pagetemplate => sub {
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 4a99cf5ff..3a1086cf0 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -24,7 +24,7 @@
 <span class="desc"><br />Commit type:</span>
 <span class="committype"><TMPL_VAR COMMITTYPE></span>
 <span class="desc"><br />Date:</span>
-<span class="changedate"><TMPL_VAR COMMITDATE></span>
+<span class="changedate"><span class="date" title="<TMPL_VAR COMMITDATE_RAW>"><TMPL_VAR COMMITDATE></span></span>
 </div>
 <div class=changelog>
 <TMPL_LOOP NAME="MESSAGE">
-- 
cgit v1.2.3


From 745dc1c62f46bacda60d01283145b5baa0adfea1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 17 Oct 2008 21:29:05 -0400
Subject: add missing getsetup hook

---
 IkiWiki/Plugin/relativedate.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 99265676b..2895f6d57 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -7,6 +7,7 @@ use IkiWiki 2.00;
 
 sub import { #{{{
 	add_underlay("javascript");
+	hook(type => "getsetup", id => "relativedate", call => \&getsetup);
 	hook(type => "format", id => "relativedate", call => \&format);
 } # }}}
 
-- 
cgit v1.2.3


From fdb5da46b0122d9cb4b2611526c6c955478a80cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 17 Oct 2008 21:49:55 -0400
Subject: Patch for anchor-based change permalinks in recent changes feed

from JasonBlevins
---
 IkiWiki/Plugin/recentchanges.pm | 3 +++
 templates/change.tmpl           | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index d25c7abff..d0e4176ff 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -115,6 +115,8 @@ sub store ($$$) { #{{{
 	my $change=shift;
 
 	my $page="$config{recentchangespage}/change_".titlepage($change->{rev});
+	my $baseurl = IkiWiki::baseurl();
+	my $permalink="$baseurl$config{recentchangespage}/#change-".titlepage($change->{rev});
 
 	# Optimisation to avoid re-writing pages. Assumes commits never
 	# change (or that any changes are not important).
@@ -175,6 +177,7 @@ sub store ($$$) { #{{{
 		commitdate => displaytime($change->{when}, "%X %x"),
 		commitdate_raw => scalar localtime($change->{when}),
 		wikiname => $config{wikiname},
+		permalink => $permalink,
 	);
 	IkiWiki::run_hooks(pagetemplate => sub {
 		shift->(page => $page, destpage => $page,
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 3a1086cf0..6647dfbca 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -3,6 +3,8 @@
 [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
 [[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+[[!meta permalink="<TMPL_VAR PERMALINK>"]]
+<div id="change-<TMPL_VAR REV>" class="metadata">
 <div class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
-- 
cgit v1.2.3


From 35c56622ea56c7d97299faba5e72b5a67fa25c66 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 17 Oct 2008 21:54:42 -0400
Subject: tweak recentchanges permalink code

Need to handle the case where url is not set.
---
 IkiWiki/Plugin/recentchanges.pm        | 7 ++++---
 debian/changelog                       | 2 ++
 doc/bugs/recentchanges_feed_links.mdwn | 2 ++
 templates/change.tmpl                  | 2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index d0e4176ff..e124a4540 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -115,8 +115,6 @@ sub store ($$$) { #{{{
 	my $change=shift;
 
 	my $page="$config{recentchangespage}/change_".titlepage($change->{rev});
-	my $baseurl = IkiWiki::baseurl();
-	my $permalink="$baseurl$config{recentchangespage}/#change-".titlepage($change->{rev});
 
 	# Optimisation to avoid re-writing pages. Assumes commits never
 	# change (or that any changes are not important).
@@ -177,8 +175,11 @@ sub store ($$$) { #{{{
 		commitdate => displaytime($change->{when}, "%X %x"),
 		commitdate_raw => scalar localtime($change->{when}),
 		wikiname => $config{wikiname},
-		permalink => $permalink,
 	);
+	
+	$template->param(permalink => $config{url}."$config{recentchangespage}/#change-".titlepage($change->{rev}))
+		if exists $config{url};
+	
 	IkiWiki::run_hooks(pagetemplate => sub {
 		shift->(page => $page, destpage => $page,
 			template => $template, rev => $change->{rev});
diff --git a/debian/changelog b/debian/changelog
index 908eb1f53..113a8a504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     move it to toggle.js in the javascript underlay.
   * relativedate: New javascript-alicious plugin that makes all dates display
     relative, in a very nice way, if I say so myself.
+  * recentchanges: Make feed links point back to anchors on the recentchanges
+    page. (JasonBlevins)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/bugs/recentchanges_feed_links.mdwn b/doc/bugs/recentchanges_feed_links.mdwn
index 9b2828901..e3557a6cb 100644
--- a/doc/bugs/recentchanges_feed_links.mdwn
+++ b/doc/bugs/recentchanges_feed_links.mdwn
@@ -96,3 +96,5 @@ to turn on? --Chapman Flack
 >>>>>> Here's my attempt at a [[patch]] for anchor-based change permalinks:
 >>>>>> <http://pastie.org/295016>.
 >>>>>> --[[JasonBlevins]], 2008-10-17
+
+[[done]]
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 6647dfbca..c9e1a60d6 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -3,7 +3,9 @@
 [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
 [[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+<TMPL_IF PERMALINK>
 [[!meta permalink="<TMPL_VAR PERMALINK>"]]
+</TMPL_IF>
 <div id="change-<TMPL_VAR REV>" class="metadata">
 <div class="metadata">
 <span class="desc"><br />Changed pages:</span>
-- 
cgit v1.2.3


From cb9a695443abb64b2bcce1316ccea5842adab9e7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 17 Oct 2008 22:04:43 -0400
Subject: fix url

---
 IkiWiki/Plugin/recentchanges.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index e124a4540..781e29723 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -177,7 +177,7 @@ sub store ($$$) { #{{{
 		wikiname => $config{wikiname},
 	);
 	
-	$template->param(permalink => $config{url}."$config{recentchangespage}/#change-".titlepage($change->{rev}))
+	$template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
 		if exists $config{url};
 	
 	IkiWiki::run_hooks(pagetemplate => sub {
-- 
cgit v1.2.3


From 2321906cd7792925981e1e516dd5a0d4d625641f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 19 Oct 2008 15:17:00 -0400
Subject: mark up date so relativedate will work

---
 IkiWiki/Plugin/aggregate.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c18784e8b..8ef5ca541 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -460,8 +460,10 @@ sub aggregate (@) { #{{{
 	foreach my $feed (@_) {
 		$feed->{lastupdate}=time;
 		$feed->{newposts}=0;
-		$feed->{message}=sprintf(gettext("processed ok at %s"),
-			displaytime($feed->{lastupdate}));
+		$feed->{message}=sprintf(gettext("last checked %s"),
+			'<span class="date" title="'.
+			localtime($feed->{lastupdate}).'">'.
+			displaytime($feed->{lastupdate}).'</span>');
 		$feed->{error}=0;
 
 		debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));
-- 
cgit v1.2.3


From 2b569f99d9e7f1d4d30c7f3adde9729ff4d868cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 19 Oct 2008 19:13:40 -0400
Subject: fix relativedate timezone inclusion

The machine parseable date needs to include a timezone.

Also, simplified the interface for date display.
---
 IkiWiki.pm                                |  6 ++++
 IkiWiki/Plugin/aggregate.pm               |  4 +--
 IkiWiki/Plugin/attachment.pm              |  1 -
 IkiWiki/Plugin/ddate.pm                   |  2 +-
 IkiWiki/Plugin/inline.pm                  |  2 --
 IkiWiki/Plugin/prettydate.pm              |  2 +-
 IkiWiki/Plugin/recentchanges.pm           |  1 -
 IkiWiki/Plugin/relativedate.pm            | 16 +++++++++++
 IkiWiki/Render.pm                         |  2 --
 debian/changelog                          |  3 ++
 doc/bugs/relative_date_weird_results.mdwn |  3 ++
 po/bg.po                                  | 23 ++++++++-------
 po/cs.po                                  | 23 ++++++++-------
 po/da.po                                  | 23 ++++++++-------
 po/de.po                                  | 23 ++++++++-------
 po/es.po                                  | 23 ++++++++-------
 po/fr.po                                  | 48 +++++++++++++++++++------------
 po/gu.po                                  | 23 ++++++++-------
 po/ikiwiki.pot                            | 40 +++++++++++++-------------
 po/pl.po                                  | 23 ++++++++-------
 po/sv.po                                  | 23 ++++++++-------
 po/vi.po                                  | 23 ++++++++-------
 templates/change.tmpl                     |  2 +-
 templates/inlinepage.tmpl                 |  2 +-
 templates/page.tmpl                       |  2 +-
 25 files changed, 201 insertions(+), 142 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index edee8aacb..1f4d40d41 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -898,6 +898,12 @@ sub abs2rel ($$) { #{{{
 } #}}}
 
 sub displaytime ($;$) { #{{{
+	# Plugins can override this function to mark up the time for
+	# display.
+	return formattime(@_);
+} #}}}
+
+sub formattime ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 8ef5ca541..2e4c86f24 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -461,9 +461,7 @@ sub aggregate (@) { #{{{
 		$feed->{lastupdate}=time;
 		$feed->{newposts}=0;
 		$feed->{message}=sprintf(gettext("last checked %s"),
-			'<span class="date" title="'.
-			localtime($feed->{lastupdate}).'">'.
-			displaytime($feed->{lastupdate}).'</span>');
+			displaytime($feed->{lastupdate}));
 		$feed->{error}=0;
 
 		debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 6c1df488a..44781165c 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -280,7 +280,6 @@ sub attachment_list ($) { #{{{
 				link => htmllink($page, $page, $f, noimageinline => 1),
 				size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]),
 				mtime => displaytime($IkiWiki::pagemtime{$f}),
-				mtime_raw => $IkiWiki::pagemtime{$f},
 			};
 		}
 	}
diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 6c36de0a6..c73317b2f 100644
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -17,7 +17,7 @@ sub getsetup { #{{{
 		},
 } #}}}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 536d7cd02..6d88c2f15 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -316,9 +316,7 @@ sub preprocess_inline (@) { #{{{
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
-				$template->param(ctime_raw => scalar localtime($pagectime{$page}));
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
-				$template->param(mtime_raw => scalar localtime($pagemtime{$page}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
 	
diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index e997be3ce..0f02142b0 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -84,7 +84,7 @@ sub checkconfig () { #{{{
 	}
 } #}}}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 781e29723..a73ff37b9 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -173,7 +173,6 @@ sub store ($$$) { #{{{
 	$template->param(
 		%$change,
 		commitdate => displaytime($change->{when}, "%X %x"),
-		commitdate_raw => scalar localtime($change->{when}),
 		wikiname => $config{wikiname},
 	);
 	
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 2895f6d57..a918889d2 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -2,8 +2,11 @@
 package IkiWiki::Plugin::relativedate;
 
 use warnings;
+no warnings 'redefine';
 use strict;
 use IkiWiki 2.00;
+use POSIX;
+use Encode;
 
 sub import { #{{{
 	add_underlay("javascript");
@@ -39,4 +42,17 @@ sub include_javascript ($;$) { #{{{
 		'" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
+sub IkiWiki::displaytime ($;$) { #{{{
+	my $time=shift;
+	my $format=shift;
+
+	# This needs to be in a form that can be parsed by javascript.
+	# Being fairly human readable is also nice, as it will be exposed as the title
+	# if javascript is not available.
+	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", gmtime($time)));
+
+	return '<span class="date" title="'.$gmtime.'">'.
+		IkiWiki::formattime($time, $format).'</span>';
+} #}}}
+
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8385c1aff..bc997ffb0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -109,9 +109,7 @@ sub genpage ($$) { #{{{
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
-		mtime_raw => scalar localtime($pagemtime{$page}),
 		ctime => displaytime($pagectime{$page}),
-		ctime_raw => scalar localtime($pagectime{$page}),
 		baseurl => baseurl($page),
 	);
 
diff --git a/debian/changelog b/debian/changelog
index e42255d08..1f47f614e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * recentchanges: Make feed links point back to anchors on the recentchanges
     page. (JasonBlevins)
   * Updated French translation. Closes: #502694
+  * Plugins that used to override displaytime should instead override
+    formattime. displaytime will call that, and may wrap markup around the
+    formatted time.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/bugs/relative_date_weird_results.mdwn b/doc/bugs/relative_date_weird_results.mdwn
index ee5d1ad04..9f35e47f7 100644
--- a/doc/bugs/relative_date_weird_results.mdwn
+++ b/doc/bugs/relative_date_weird_results.mdwn
@@ -1 +1,4 @@
 I just submitted a new bug, and... after clicking "save", my brand new bug page displays, at the bottom: "Last edited 6 hours and 3 minutes ago". Timezone issue, I guess? (Hint: I'm in France) -- [[intrigeri]]
+
+> Yep, it wasn't including a timezone in the machine parseable time.
+> [[done]] --[[Joey]]
diff --git a/po/bg.po b/po/bg.po
index 7be834a87..9167079fa 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -49,7 +49,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Грешка"
 
@@ -90,8 +90,8 @@ msgstr "премахване на „%s”"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "е обработен нормално от %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -154,20 +154,20 @@ msgstr "Грешка при изпращане на поща"
 msgid "Failed to delete file from S3: "
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -964,12 +964,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -993,6 +993,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "е обработен нормално от %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Паролата ви е изпратена по пощата."
 
diff --git a/po/cs.po b/po/cs.po
index c2fdedd72..80d8bf999 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -47,7 +47,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Chyba"
 
@@ -88,8 +88,8 @@ msgstr "expiruji %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "zpracováno ok %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -151,20 +151,20 @@ msgstr "Nepodařilo se odeslat email."
 msgid "Failed to delete file from S3: "
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -943,12 +943,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -972,6 +972,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "zpracováno ok %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Vaše heslo vám bylo zasláno."
 
diff --git a/po/da.po b/po/da.po
index 86185a2f0..830e91da2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2008-08-11 01:04+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -51,7 +51,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Fejl"
 
@@ -92,8 +92,8 @@ msgstr "udløber %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "korrekt dannet ved %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -153,20 +153,20 @@ msgstr "Arkivering af fil i S3 mislykkedes: "
 msgid "Failed to delete file from S3: "
 msgstr "Sletning af fil fra S3 mislykkedes: "
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "der er allerede en side ved navn %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr "forhindret af allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
@@ -935,12 +935,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr "ja"
 
@@ -963,3 +963,6 @@ msgstr ""
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
+
+#~ msgid "processed ok at %s"
+#~ msgstr "korrekt dannet ved %s"
diff --git a/po/de.po b/po/de.po
index 8c2e4477c..b76ddeac9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2008-03-03 21:22+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -47,7 +47,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Fehler"
 
@@ -88,8 +88,8 @@ msgstr "%s läuft aus"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "normal verarbeitet um %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -151,20 +151,20 @@ msgstr "Es konnte keine E-Mail versandt werden"
 msgid "Failed to delete file from S3: "
 msgstr "konnte kein Bild aus dem Code erzeugen"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -940,12 +940,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife %s auf Seite %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -969,6 +969,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "normal verarbeitet um %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Ihr Passwort wurde Ihnen via E-Mail zugesandt."
 
diff --git a/po/es.po b/po/es.po
index 7c3209f81..b0632e865 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2008-10-07 12:44+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Error"
 
@@ -90,8 +90,8 @@ msgstr "%s caducada"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "proceso completado con éxito a %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -151,20 +151,20 @@ msgstr "No puedo guardar el archivo en S3: "
 msgid "Failed to delete file from S3: "
 msgstr "No puedo borrar archivo en S3: "
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "ya existe una página de nombre %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr "prohibido por la claúsula allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr "nombre de archivo adjunto erróneo"
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
@@ -948,14 +948,14 @@ msgstr "no puedo emplear varios complementos rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr "si"
 
@@ -981,6 +981,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "processed ok at %s"
+#~ msgstr "proceso completado con éxito a %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Se le ha enviado su contraseña por correo electrónico."
 
diff --git a/po/fr.po b/po/fr.po
index 9bc9f601d..04145eeb7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-05 19:11-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2008-10-11 10:34+0200\n"
 "Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Erreur"
 
@@ -92,8 +92,8 @@ msgstr "Fin de validité de %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "A été correctement traité à %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -157,30 +157,30 @@ msgstr "Échec lors de la création du fichier sur S3 :"
 msgid "Failed to delete file from S3: "
 msgstr "Échec lors de la suppression du fichier sur S3 :"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "il existe déjà une page nommée %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 #, fuzzy
 msgid "prohibited by allowed_attachments"
 msgstr "action interdite par allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr "Mauvais nom de la pièce jointe"
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr "envoi de la pièce jointe"
 
-#: ../IkiWiki/Plugin/autoindex.pm:103
+#: ../IkiWiki/Plugin/autoindex.pm:105
 msgid "automatic index generation"
 msgstr "génération de l'index automatique"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:326 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
@@ -254,6 +254,15 @@ msgstr "Échec du traitement"
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
+#: ../IkiWiki/Plugin/google.pm:27
+#, fuzzy, perl-format
+msgid "Must specify %s when using the google search plugin"
+msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »."
+
+#: ../IkiWiki/Plugin/google.pm:31
+msgid "Failed to parse url, cannot determine domain name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/googlecalendar.pm:32
 msgid "failed to find url in html"
 msgstr "Échec dans la recherche d'une URL dans le Code HTML"
@@ -321,11 +330,11 @@ msgstr "Ajouter un nouvel article dont le titre est :"
 msgid "nonexistant template %s"
 msgstr "Le modèle (« template ») %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:334 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki/Plugin/inline.pm:571
+#: ../IkiWiki/Plugin/inline.pm:572
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -333,7 +342,7 @@ msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 msgid "failed to run dot"
 msgstr "Échec du lancement de dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60
+#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s est verrouillé et ne peut être modifié"
@@ -574,16 +583,16 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé"
 msgid "%s is not a file"
 msgstr "%s n'est pas un fichier"
 
-#: ../IkiWiki/Plugin/remove.pm:113
+#: ../IkiWiki/Plugin/remove.pm:115
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "Suppression de %s confirmée"
 
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:152
 msgid "Please select the attachments to remove."
 msgstr "Veuillez choisir la pièce jointe à supprimer"
 
-#: ../IkiWiki/Plugin/remove.pm:190
+#: ../IkiWiki/Plugin/remove.pm:192
 msgid "removed"
 msgstr "supprimé"
 
@@ -950,12 +959,12 @@ msgstr "impossible d'utiliser plusieurs systèmes de contrôle des versions"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "une boucle de pré traitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr "oui"
 
@@ -979,6 +988,9 @@ msgstr "Identifiant de l'administrateur (utilisateur ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "processed ok at %s"
+#~ msgstr "A été correctement traité à %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Votre mot de passe vous a été envoyé par courriel."
 
diff --git a/po/gu.po b/po/gu.po
index c15e881dc..82ecfad22 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -48,7 +48,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -89,8 +89,8 @@ msgstr "જુનું કરે છે %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "આના પર બરાબર છે %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -152,20 +152,20 @@ msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 msgid "Failed to delete file from S3: "
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -943,12 +943,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -972,6 +972,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "આના પર બરાબર છે %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "તમારો પાસવર્ડ તમને ઇમેઇલ કરવામાં આવ્યો છે."
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 4dc12b20d..89cca9ff4 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 21:55-0400\n"
+"POT-Creation-Date: 2008-10-19 19:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1167
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
@@ -172,9 +172,9 @@ msgid "automatic index generation"
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:329 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:151
+#: ../IkiWiki/Render.pm:149
 msgid "discussion"
 msgstr ""
 
@@ -318,11 +318,11 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:337 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:574
+#: ../IkiWiki/Plugin/inline.pm:572
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -780,59 +780,59 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:255
+#: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:279 ../IkiWiki/Render.pm:304
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:286
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:362
+#: ../IkiWiki/Render.pm:360
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:402
+#: ../IkiWiki/Render.pm:400
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:407
+#: ../IkiWiki/Render.pm:405
 #, perl-format
 msgid "rendering %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:449
+#: ../IkiWiki/Render.pm:447
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:488
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:498
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:524
+#: ../IkiWiki/Render.pm:522
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""
@@ -926,12 +926,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1150
+#: ../IkiWiki.pm:1156
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1659
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index e7cad78eb..4a216123d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Błąd"
 
@@ -92,8 +92,8 @@ msgstr "wygasający wpis %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "kanał RSS przetworzony w dniu %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -156,20 +156,20 @@ msgstr "Awaria w trakcie wysyłania wiadomości"
 msgid "Failed to delete file from S3: "
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -970,12 +970,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -999,6 +999,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "kanał RSS przetworzony w dniu %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Wiadomość z hasłem została wysłana."
 
diff --git a/po/sv.po b/po/sv.po
index 5058820bf..cdb02559f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -48,7 +48,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Fel"
 
@@ -89,8 +89,8 @@ msgstr "låter %s gå ut"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "behandlad ok på %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -153,20 +153,20 @@ msgstr "Misslyckades med att skicka e-post"
 msgid "Failed to delete file from S3: "
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -957,12 +957,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -986,6 +986,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "behandlad ok på %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Ditt lösenord har skickats till dig via e-post."
 
diff --git a/po/vi.po b/po/vi.po
index 2b5a313f3..5b19ab48b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -49,7 +49,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Lỗi"
 
@@ -90,8 +90,8 @@ msgstr "đang mãn hạn %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "đã xử lý được ở %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -154,20 +154,20 @@ msgstr "Lỗi gửi thư"
 msgid "Failed to delete file from S3: "
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -958,12 +958,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -987,6 +987,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "đã xử lý được ở %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Mật khẩu đã được gửi đính kèm thư cho bạn."
 
diff --git a/templates/change.tmpl b/templates/change.tmpl
index dfdd5ff95..61a54fded 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -27,7 +27,7 @@
 <span class="desc"><br />Commit type:</span>
 <span class="committype"><TMPL_VAR COMMITTYPE></span>
 <span class="desc"><br />Date:</span>
-<span class="changedate"><span class="date" title="<TMPL_VAR COMMITDATE_RAW>"><TMPL_VAR COMMITDATE></span></span>
+<span class="changedate"><TMPL_VAR COMMITDATE>
 </div>
 <div class=changelog>
 <TMPL_LOOP NAME="MESSAGE">
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 3f640fcdd..984d33cef 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -28,7 +28,7 @@
 <div class="inlinefooter">
 
 <span class="pagedate">
-Posted <span class="date" title="<TMPL_VAR CTIME_RAW>"><TMPL_VAR CTIME></span>
+Posted <TMPL_VAR CTIME>
 </span>
 
 <TMPL_IF NAME="TAGS">
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 7456e9e41..8c2ca668f 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -112,7 +112,7 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 
 <div class="pagedate">
-Last edited <span class="date" title="<TMPL_VAR MTIME_RAW>"><TMPL_VAR MTIME></span>
+Last edited <TMPL_VAR MTIME>
 <!-- Created <TMPL_VAR CTIME> -->
 </div>
 
-- 
cgit v1.2.3


From db146d9f1e70b69b13b02b7484027b288de5decf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 19 Oct 2008 19:39:32 -0400
Subject: need to use localtime, fix width

---
 IkiWiki/Plugin/relativedate.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index a918889d2..0c9426dda 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -47,9 +47,10 @@ sub IkiWiki::displaytime ($;$) { #{{{
 	my $format=shift;
 
 	# This needs to be in a form that can be parsed by javascript.
-	# Being fairly human readable is also nice, as it will be exposed as the title
-	# if javascript is not available.
-	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", gmtime($time)));
+	# Being fairly human readable is also nice, as it will be exposed
+	# as the title if javascript is not available.
+	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
+			localtime($time)));
 
 	return '<span class="date" title="'.$gmtime.'">'.
 		IkiWiki::formattime($time, $format).'</span>';
-- 
cgit v1.2.3


From fd9393ef8575ad4a8966ae7f5310aab688dedf48 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 19 Oct 2008 20:12:37 -0400
Subject: add displaytime hook

Need to use a hook because an exported function cannot be reliably
overridden. The replacement verstion was actually only affecting plugins
loaded after it.

formattime doesn't need a hook, since there's no reason to export it.
---
 IkiWiki.pm                     | 17 ++++++++++++++---
 IkiWiki/Plugin/relativedate.pm |  3 ++-
 doc/plugins/write.mdwn         |  8 +++++++-
 po/ikiwiki.pot                 |  8 ++++----
 4 files changed, 27 insertions(+), 9 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1f4d40d41..207ca87fb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -898,12 +898,23 @@ sub abs2rel ($$) { #{{{
 } #}}}
 
 sub displaytime ($;$) { #{{{
-	# Plugins can override this function to mark up the time for
-	# display.
-	return formattime(@_);
+	my $time=shift;
+	my $format=shift;
+	if (exists $hooks{displaytime}) {
+		my $ret;
+		run_hooks(displaytime => sub {
+			$ret=shift->($time, $format)
+		});
+		return $ret;
+	}
+	else {
+		return formattime($time, $format);
+	}
 } #}}}
 
 sub formattime ($;$) { #{{{
+	# Plugins can override this function to mark up the time for
+	# display.
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 0c9426dda..d9d8f7776 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -12,6 +12,7 @@ sub import { #{{{
 	add_underlay("javascript");
 	hook(type => "getsetup", id => "relativedate", call => \&getsetup);
 	hook(type => "format", id => "relativedate", call => \&format);
+	hook(type => "displaytime", id => "relativedate", call => \&display);
 } # }}}
 
 sub getsetup () { #{{{
@@ -42,7 +43,7 @@ sub include_javascript ($;$) { #{{{
 		'" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub display ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index daf70c8e2..856b34ba1 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -196,7 +196,6 @@ generating the page.
 
 	hook(type => "pagetemplate", id => "foo", call => \&pagetemplate);
 
-
 [[Templates|wikitemplates]] are filled out for many different things in
 ikiwiki, like generating a page, or part of a blog page, or an rss feed, or
 a cgi. This hook allows modifying the variables available on those
@@ -361,6 +360,13 @@ This hook is called whenever ikiwiki normally saves its state, just before
 the state is saved. The function can save other state, modify values before
 they're saved, etc.
 
+### displaytime
+
+	hook(type => "displaytime", id => "foo", call => \&display);
+
+This hook can be registered to override the regular `displaytime` function.
+Only the last displaytime hook will be used.
+
 ### renamepage
 
 	hook(type => "renamepage", id => "foo", call => \&renamepage);
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 89cca9ff4..335575f02 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:13-0400\n"
+"POT-Creation-Date: 2008-10-19 20:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr ""
 
@@ -926,12 +926,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1674
 msgid "yes"
 msgstr ""
 
-- 
cgit v1.2.3


From 5e52bfb2e743138fb365cb6a63c98d836883f287 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 15:25:45 -0400
Subject: inline: Only the last feed link was put on the page, fix this to
 include all feed links. So rss will be included along with atom, and pages
 with multiple feeds will get links added for all feeds.

---
 IkiWiki/Plugin/inline.pm | 4 ++--
 debian/changelog         | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6d88c2f15..1b1ca2ce2 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -376,7 +376,7 @@ sub preprocess_inline (@) { #{{{
 					genfeed("rss",
 						$config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
-				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="$desc (RSS)" href="$rssurl" />};
+				$feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/rss+xml" title="$desc (RSS)" href="$rssurl" />};
 			}
 		}
 		if ($atom) {
@@ -386,7 +386,7 @@ sub preprocess_inline (@) { #{{{
 				writefile($atomp, $config{destdir},
 					genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
-				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="$desc (Atom)" href="$atomurl" />};
+				$feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/atom+xml" title="$desc (Atom)" href="$atomurl" />};
 			}
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index e53799306..42c8a52e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Use the pure perl Data::Dumper when generating setup files to ensure that
     utf-8 characters are written out as such, and not as the encoded perl
     strings the C Data::Dumper produces.
+  * inline: Only the last feed link was put on the page, fix this to include
+    all feed links. So rss will be included along with atom, and pages with
+    multiple feeds will get links added for all feeds.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
-- 
cgit v1.2.3


From a2839de9362187b67b0e3a564461e272e64fd9b4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 18:17:03 -0400
Subject: tag: When tagpage is set, force the links created by tagging to point
 at the toplevel tagpage, and not closer subpages.

The html links already went there, but internally the links were not
recorded as absolute, which could cause confusing backlinks etc.

For example, with tagbase=tags, if blog/tags/bar existed and blog/foo was
tagged bar, it would link to /tags/bar. But, the link would be recorded
simply as a link to tags/bar, and so later blog/tags/bar would appear to
have the backlink.
---
 IkiWiki/Plugin/tag.pm | 2 +-
 debian/changelog      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 158657507..c4a175677 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -43,7 +43,7 @@ sub tagpage ($) { #{{{
 			
 	if ($tag !~ m{^\.?/} &&
 	    defined $config{tagbase}) {
-		$tag=$config{tagbase}."/".$tag;
+		$tag="/".$config{tagbase}."/".$tag;
 	}
 
 	return $tag;
diff --git a/debian/changelog b/debian/changelog
index 42c8a52e9..928cd8666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * inline: Only the last feed link was put on the page, fix this to include
     all feed links. So rss will be included along with atom, and pages with
     multiple feeds will get links added for all feeds.
+  * tag: When tagpage is set, force the links created by tagging to point at
+    the toplevel tagpage, and not closer subpages. The html links already went
+    there, but internally the links were not recorded as absolute, which could
+    cause confusing backlinks etc.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
-- 
cgit v1.2.3


From ee1ccfa863b9d56cf7ec987f7fee89c98c484b0b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 19:22:22 -0400
Subject: use relativedate as the css class for dates that should display
 relative

---
 IkiWiki/Plugin/relativedate.pm       | 2 +-
 doc/plugins/relativedate.mdwn        | 6 +++---
 underlays/javascript/relativedate.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index d9d8f7776..f4dba61a4 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -53,7 +53,7 @@ sub display ($;$) { #{{{
 	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
 			localtime($time)));
 
-	return '<span class="date" title="'.$gmtime.'">'.
+	return '<span class="relativedate" title="'.$gmtime.'">'.
 		IkiWiki::formattime($time, $format).'</span>';
 } #}}}
 
diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn
index 121bce477..32f8c798b 100644
--- a/doc/plugins/relativedate.mdwn
+++ b/doc/plugins/relativedate.mdwn
@@ -10,7 +10,7 @@ show the absolute date instead. Also, this plugin can be used with other
 plugins like [[prettydate]] that change how the absolute date is displayed.
 
 If this plugin is enabled, you may also add relative dates to pages in the
-wiki, by using html elements in the "date" class. For example, this will
-display as a relative date:
+wiki, by using html elements in the "relativedate" class. For example, this
+will display as a relative date:
 
-	<span class="date">Fri Oct 17 18:36:13 EDT 2008</span>
+	<span class="relativedate">Fri Oct 17 18:36:13 EDT 2008</span>
diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/relativedate.js
index c5e62b3cc..8e05d4065 100644
--- a/underlays/javascript/relativedate.js
+++ b/underlays/javascript/relativedate.js
@@ -1,4 +1,4 @@
-// Causes html elements in the 'date' and 'pagedate' classes to be displayed
+// Causes html elements in the 'relativedate' class to be displayed
 // as relative dates. The date is parsed from the title attribute, or from
 // the element content.
 
@@ -7,7 +7,7 @@ var dateElements;
 hook("onload", getDates);
 
 function getDates() {
-	dateElements = getElementsByClass('date');
+	dateElements = getElementsByClass('relativedate');
 	for (var i = 0; i < dateElements.length; i++) {
 		var elt = dateElements[i];
 		var title = elt.attributes.title;
-- 
cgit v1.2.3


From 327adadf0443db5d240253f375e72657b6a88cfa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 21 Oct 2008 17:03:08 -0400
Subject: disable warnings when redefining functions

---
 IkiWiki/Plugin/external.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index ba6c7d8b9..287e118f1 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -202,7 +202,9 @@ sub inject ($@) { #{{{
 	my $sub = sub {
 		IkiWiki::Plugin::external::rpc_call($plugin, $params{call}, @_)
 	};
+	no warnings;
 	eval qq{*$params{name}=\$sub};
+	use warnings;
 	memoize($params{name}) if $params{memoize};
 	return 1;
 } #}}}
-- 
cgit v1.2.3


From e75818572fff5256d16221a2b065b214d8cb9f5d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 21 Oct 2008 17:57:19 -0400
Subject: function injection overhaul

Add an inject function, that can be used by plugins that want to replace
one of ikiwiki's functions with their own version. (This is a scary thing
that grubs through the symbol table, and replaces all exported occurances
of a function with the injected version.)

external: RPC functions can be injected to replace exported functions.

Removed the stupid displaytime hook, and use injection instead.
---
 IkiWiki.pm                     | 46 +++++++++++++++++++++++++-------------
 IkiWiki/Plugin/external.pm     |  8 ++++++-
 IkiWiki/Plugin/relativedate.pm |  4 ++--
 debian/changelog               |  5 +++++
 doc/plugins/contrib/po.mdwn    |  5 +++++
 doc/plugins/write.mdwn         | 50 ++++++++++++++++++++++++++++++++++++++++++
 plugins/externaldemo           | 10 ++++-----
 po/ikiwiki.pot                 | 14 ++++++------
 8 files changed, 111 insertions(+), 31 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 207ca87fb..e0454963d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -21,6 +21,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
                  displaytime will_render gettext urlto targetpage
 		 add_underlay pagetitle titlepage linkpage newpagefile
+		 inject
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
@@ -898,23 +899,13 @@ sub abs2rel ($$) { #{{{
 } #}}}
 
 sub displaytime ($;$) { #{{{
-	my $time=shift;
-	my $format=shift;
-	if (exists $hooks{displaytime}) {
-		my $ret;
-		run_hooks(displaytime => sub {
-			$ret=shift->($time, $format)
-		});
-		return $ret;
-	}
-	else {
-		return formattime($time, $format);
-	}
+	# Plugins can override this function to mark up the time to
+	# display.
+	return '<span class="date">'.formattime(@_).'</span>';
 } #}}}
 
 sub formattime ($;$) { #{{{
-	# Plugins can override this function to mark up the time for
-	# display.
+	# Plugins can override this function to format the time.
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
@@ -1676,6 +1667,31 @@ sub yesno ($) { #{{{
 	return (defined $val && lc($val) eq gettext("yes"));
 } #}}}
 
+sub inject { #{{{
+	# Injects a new function into the symbol table to replace an
+	# exported function.
+	my %params=@_;
+
+	# This is deep ugly perl foo, beware.
+	no strict;
+	no warnings;
+	if (! defined $params{parent}) {
+		$params{parent}='::';
+		$params{old}=\&{$params{name}};
+		$params{name}=~s/.*:://;
+	}
+	my $parent=$params{parent};
+	foreach my $ns (grep /^\w+::/, keys %{$parent}) {
+		$ns = $params{parent} . $ns;
+		inject(%params, parent => $ns) unless $ns eq '::main::';
+		*{$ns . $params{name}} = $params{call}
+			if exists ${$ns}{$params{name}} &&
+			   \&{${$ns}{$params{name}}} == $params{old};
+	}
+	use strict;
+	use warnings;
+} #}}}
+
 sub pagespec_merge ($$) { #{{{
 	my $a=shift;
 	my $b=shift;
@@ -1770,7 +1786,7 @@ sub pagespec_valid ($) { #{{{
 	my $sub=pagespec_translate($spec);
 	return ! $@;
 } #}}}
-	
+
 sub glob2re ($) { #{{{
 	my $re=quotemeta(shift);
 	$re=~s/\\\*/.*/g;
diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 287e118f1..4ce9c8bab 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -202,10 +202,16 @@ sub inject ($@) { #{{{
 	my $sub = sub {
 		IkiWiki::Plugin::external::rpc_call($plugin, $params{call}, @_)
 	};
+	$sub=memoize($sub) if $params{memoize};
+
+	# This will add it to the symbol table even if not present.
 	no warnings;
 	eval qq{*$params{name}=\$sub};
 	use warnings;
-	memoize($params{name}) if $params{memoize};
+
+	# This will ensure that everywhere it was exported to sees
+	# the injected version.
+	IkiWiki::inject(name => $params{name}, call => $sub);
 	return 1;
 } #}}}
 
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index f4dba61a4..dc8f7d538 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -12,7 +12,7 @@ sub import { #{{{
 	add_underlay("javascript");
 	hook(type => "getsetup", id => "relativedate", call => \&getsetup);
 	hook(type => "format", id => "relativedate", call => \&format);
-	hook(type => "displaytime", id => "relativedate", call => \&display);
+	inject(name => "IkiWiki::displaytime", call => \&mydisplaytime);
 } # }}}
 
 sub getsetup () { #{{{
@@ -43,7 +43,7 @@ sub include_javascript ($;$) { #{{{
 		'" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
-sub display ($;$) { #{{{
+sub mydisplaytime ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 
diff --git a/debian/changelog b/debian/changelog
index 928cd8666..e1baea8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,11 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     the toplevel tagpage, and not closer subpages. The html links already went
     there, but internally the links were not recorded as absolute, which could
     cause confusing backlinks etc.
+  * Add an inject function, that can be used by plugins that want to
+    replace one of ikiwiki's functions with their own version.
+    (This is a scary thing that grubs through the symbol table, and replaces
+    all exported occurances of a function with the injected version.)
+  * external: RPC functions can be injected to replace exported functions.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 30ede95a6..c4b7f9ee9 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -47,6 +47,11 @@ Any thoughts on this?
 >>> `targetpage`, `bestlink`, and `beautify_urlpath`. But, I noticed
 >>> the other day that such wrappers around exported functions are only visible by
 >>> plugins loaded after the plugin that defines them.
+>>> 
+>>> Update: Take a look at the new "Function overriding" section of
+>>> [[plugins/write]]. I think you can just inject wrappers about a few ikiwiki
+>>> functions, rather than adding hooks. The `inject` function is pretty
+>>> insane^Wlow level, but seems to work great. --[[Joey]]
 >>
 >> The Discussion pages issue is something I am not sure about yet. But I will
 >> probably decide that "slave" pages, being only translations, don't deserve
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 856b34ba1..2e11e6234 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -854,6 +854,56 @@ By the way, to parse a ikiwiki setup file and populate `%config`, a
 program just needs to do something like:
 `use IkiWiki::Setup; IkiWiki::Setup::load($filename)`
 
+### Function overriding
+
+Sometimes using ikiwiki's pre-defined hooks is not enough. Your plugin
+may need to replace one of ikiwiki's own functions with a modified version,
+or wrap one of the functions.
+
+For example, your plugin might want to override `displaytime`, to change
+the html markup used when displaying a date. Or it might want to override
+`IkiWiki::formattime`, to change how a date is formatted. Or perhaps you
+want to override `bestlink` and change how ikiwiki deals with WikiLinks.
+
+By venturing into this territory, your plugin is becoming tightly tied to
+ikiwiki's internals. And it might break if those internals change. But
+don't let that stop you, if you're brave.
+
+Ikiwiki provides an `inject()` function, that is a powerful way to replace
+any function with one of your own. This even allows you to inject a
+replacement for an exported function, like `bestlink`. Everything that
+imports that function will get your version instead. Pass it the name of
+the function to replace, and a new function to call. 
+
+For example, here's how to replace `displaytime` with a version using HTML 5
+markup:
+
+	inject(name => 'IkiWiki::displaytime', call => sub {
+		return "<time>".formattime(@_)."</time>";
+	});
+
+Here's how to wrap `bestlink` with a version that tries to handle
+plural words:
+
+	my $origbestlink=\&bestlink;
+	inject(name => 'IkiWiki::bestlink', call => \&mybestlink);
+
+	sub deplural ($) {
+		my $word=shift;
+		$word =~ s/e?s$//; # just an example :-)
+		return $word;
+	}
+
+	sub mybestlink ($$) {
+		my $page=shift;
+		my $link=shift;
+		my $ret=$origbestlink->($page, $link);
+		if (! length $ret) {
+			$ret=$origbestlink->($page, deplural($link));
+		}
+		return $ret;
+	}
+
 ### Javascript
 
 Some plugins use javascript to make ikiwiki look a bit more web-2.0-ish.
diff --git a/plugins/externaldemo b/plugins/externaldemo
index 4d13f2444..be7aba8b9 100755
--- a/plugins/externaldemo
+++ b/plugins/externaldemo
@@ -106,9 +106,8 @@ sub import {
 		rpc_call("getvar", "config", "url")."\n";
 
 	# Here's an example of how to inject an arbitrary function into
-	# ikiwiki, replacing a core function.
-	# Note use of automatic memoization.
-	rpc_call("inject", name => "IkiWiki::formattime",
+	# ikiwiki. Note use of automatic memoization.
+	rpc_call("inject", name => "IkiWiki::bob",
 		call => "formattime", memoize => 1);
 
 	print STDERR "externaldemo plugin successfully imported\n";
@@ -126,9 +125,8 @@ sub preprocess {
 	return "externaldemo plugin preprocessing on $title!";
 }
 
-sub formattime {
-	print STDERR "externaldemo plugin's formattime called via RPC";
-	return scalar "formatted time: ".localtime(shift);
+sub bob {
+	print STDERR "externaldemo plugin's bob called via RPC";
 }
 
 # Now all that's left to do is loop and handle each incoming RPC request.
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 335575f02..4452ea8dc 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 20:06-0400\n"
+"POT-Creation-Date: 2008-10-21 17:51-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1175
 msgid "Error"
 msgstr ""
 
@@ -913,25 +913,25 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:459
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:505
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:534
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1165
+#: ../IkiWiki.pm:1158
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1674
+#: ../IkiWiki.pm:1667
 msgid "yes"
 msgstr ""
 
-- 
cgit v1.2.3


From 094af3d113f375f7faf2abf283615582a9977a65 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 22 Oct 2008 20:52:34 -0400
Subject: initial support for git repos with untrusted committers

Still need to wire up the calls to check_* , but it's cold out here and my
hands are going numb, so enough for now.
---
 IkiWiki.pm             |  11 +++++
 IkiWiki/Plugin/git.pm  | 115 ++++++++++++++++++++++++++++++++++++++++++++-----
 doc/plugins/write.mdwn |   9 ++++
 doc/rcs/details.mdwn   |   3 ++
 doc/rcs/git.mdwn       |  27 ++++++++++++
 ikiwiki.in             |   3 ++
 6 files changed, 158 insertions(+), 10 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e0454963d..245eaafba 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -382,6 +382,13 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
+	test_receive => {
+		type => "internal",
+		default => 0,
+		description => "running in receive test mode",
+		safe => 0,
+		rebuild => 0,
+	},
 	getctime => {
 		type => "internal",
 		default => 0,
@@ -1575,6 +1582,10 @@ sub rcs_getctime ($) { #{{{
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
 } #}}}
 
+sub rcs_test_receive ($) { #{{{
+	$hooks{rcs}{rcs_test_receive}{call}->(@_);
+} #}}}
+
 sub globlist_to_pagespec ($) { #{{{
 	my @globlist=split(' ', shift);
 
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 14b0ab285..1facb14c0 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -23,6 +23,7 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_test_receive", call => \&rcs_test_receive);
 } #}}}
 
 sub checkconfig () { #{{{
@@ -32,12 +33,21 @@ sub checkconfig () { #{{{
 	if (! defined $config{gitmaster_branch}) {
 		$config{gitmaster_branch}="master";
 	}
-	if (defined $config{git_wrapper} && length $config{git_wrapper}) {
+	if (defined $config{git_wrapper} &&
+	    length $config{git_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{git_wrapper},
 			wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
 		};
 	}
+	if (defined $config{git_test_receive_wrapper} &&
+	    length $config{git_test_receive_wrapper}) {
+		push @{$config{wrappers}}, {
+			test_receive => 1,
+			wrapper => $config{git_test_receive_wrapper},
+			wrappermode => "0755",
+		};
+	}
 } #}}}
 
 sub getsetup () { #{{{
@@ -60,6 +70,20 @@ sub getsetup () { #{{{
 			safe => 0,
 			rebuild => 0,
 		},
+		git_test_receive_wrapper => {
+			type => "string",
+			example => "/git/wiki.git/hooks/pre-receive",
+			description => "git pre-receive hook to generate",
+			safe => 0, # file
+			rebuild => 0,
+		},
+		git_untrusted_committers => {
+			type => "string",
+			example => [],
+			description => "unix users whose commits should be checked by the pre-receive hook",
+			safe => 0,
+			rebuild => 0,
+		},
 		historyurl => {
 			type => "string",
 			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
@@ -320,6 +344,9 @@ sub parse_diff_tree ($@) { #{{{
 					'file'      => decode("utf8", $file),
 					'sha1_from' => $sha1_from[0],
 					'sha1_to'   => $sha1_to,
+					'mode_from' => $mode_from[0],
+					'mode_to'   => $mode_to,
+					'status'    => $status,
 				};
 			}
 			next;
@@ -331,14 +358,12 @@ sub parse_diff_tree ($@) { #{{{
 } #}}}
 
 sub git_commit_info ($;$) { #{{{
-	# Return an array of commit info hashes of num commits (default: 1)
+	# Return an array of commit info hashes of num commits
 	# starting from the given sha1sum.
-
 	my ($sha1, $num) = @_;
 
-	$num ||= 1;
-
-	my @raw_lines = run_or_die('git', 'log', "--max-count=$num", 
+	my @raw_lines = run_or_die('git', 'log',
+		(defined $num ? "--max-count=$num" : ""), 
 		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
 		'-r', $sha1, '--', '.');
 	my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
@@ -355,7 +380,6 @@ sub git_commit_info ($;$) { #{{{
 
 sub git_sha1 (;$) { #{{{
 	# Return head sha1sum (of given file).
-
 	my $file = shift || q{--};
 
 	# Ignore error since a non-existing file might be given.
@@ -378,7 +402,6 @@ sub rcs_update () { #{{{
 sub rcs_prepedit ($) { #{{{
 	# Return the commit sha1sum of the file when editing begins.
 	# This will be later used in rcs_commit if a merge is required.
-
 	my ($file) = @_;
 
 	return git_sha1($file);
@@ -475,7 +498,7 @@ sub rcs_recentchanges ($) { #{{{
 	error($@) if $@;
 
 	my @rets;
-	foreach my $ci (git_commit_info('HEAD', $num)) {
+	foreach my $ci (git_commit_info('HEAD', $num || 1)) {
 		# Skip redundant commits.
 		next if ($ci->{'comment'} && @{$ci->{'comment'}}[0] eq $dummy_commit_msg);
 
@@ -558,11 +581,83 @@ sub rcs_getctime ($) { #{{{
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
 	my $sha1  = git_sha1($file);
-	my $ci    = git_commit_info($sha1);
+	my $ci    = git_commit_info($sha1, 1);
 	my $ctime = $ci->{'author_epoch'};
 	debug("ctime for '$file': ". localtime($ctime));
 
 	return $ctime;
 } #}}}
 
+sub rcs_test_receive () { #{{{
+	# quick success if the user is trusted
+	my $committer=(getpwuid($<))[0];
+	if (! defined $committer) {
+		error("cannot determine username for $<");
+	}
+	exit 0 if ! ref $config{git_untrusted_committers} ||
+	          ! grep { $_ eq $committer } @{$config{git_untrusted_committers}};
+
+	# The wiki may not be the only thing in the git repo.
+	# Determine if it is in a subdirectory by examining the srcdir,
+	# and its parents, looking for the .git directory.
+	my $subdir="";
+	my $dir=$config{srcdir};
+	while (! -d "$dir/.git") {
+		$subdir=IkiWiki::basename($dir)."/".$subdir;
+		$dir=IkiWiki::dirname($dir);
+		if (! length $dir) {
+			error("cannot determine root of git repo");
+		}
+	}
+
+	my @errors;
+	while (<>) {
+		chomp;
+		my ($oldrev, $newrev, $refname) = split(' ', $_, 3);
+
+		# only allow changes to gitmaster_branch
+		if ($refname !~ /^refs\/heads\/\Q$config{gitmaster_branch}\E$/) {
+			push @errors, sprintf(gettext("you are not allowed to change %s"), $refname);
+		}
+
+		foreach my $ci (git_commit_info($oldrev."..".$newrev)) {
+			foreach my $detail (@{ $ci->{'details'} }) {
+				my $file = $detail->{'file'};
+
+				# check that all changed files are in the subdir
+				if (length $subdir &&
+				    ! ($file =~ s/^\Q$subdir\E//)) {
+					push @errors, sprintf(gettext("you are not allowed to change %s"), $file);
+					next;
+				}
+
+				if ($detail->{'mode_from'} ne $detail->{'mode_to'}) {
+					push @errors, gettext("you are not allowed to change file modes");
+				}
+
+				if ($detail->{'status'} =~ /^D+\d*/) {
+					# TODO check_canremove
+				}
+				elsif ($detail->{'status'} !~ /^[MA]+\d*$/) {
+					push @errors, "unknown status ".$detail->{'status'};
+				}
+				else {
+					# TODO check_canedit
+					# TODO check_canattach
+				}
+			}
+		}
+	}
+
+	if (@errors) {
+		# TODO clean up objects from failed push
+
+		print STDERR "$_\n" foreach @errors;
+		exit 1;
+	}
+	else {
+		exit 0;
+	}
+} #}}}
+
 1
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 0d244e1f5..5a5db6be0 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -820,6 +820,15 @@ it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
+#### `rcs_test_receive()`
+
+This is used to test if changes pushed into the RCS should be accepted.
+Ikiwiki will be running as a pre-receive hook (or equivilant) and should
+examine the incoming changes, decide if they are allowed, and communicate
+that to the RCS.
+
+This is optional, and doesn't make sense for all RCSs.
+
 ### PageSpec plugins
 
 It's also possible to write plugins that add new functions to
diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index e62f3ef49..089221cab 100644
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -280,6 +280,9 @@ Here is a how a commit from a remote repository works:
 
 * git-commit in the remote repository
 * git-push, pushes the commit to the master repo on the server
+* (Optionally, the master repo's pre-receive hook runs, and checks that the
+  update only modifies files that the pushing user is allowed to update. 
+  If not, it aborts the receive.)
 * the master repo's post-update hook notices this update, and runs ikiwiki
 * ikiwiki notices the modifies page source, and compiles it
 
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index b210af825..2a6feecf5 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -100,6 +100,33 @@ repository, should only be writable by the wiki's admin, and *not* by the
 group. Take care that ikiwiki uses a umask that does not cause files in
 the srcdir to become group writable. (umask 022 will work.)
 
+## git repository with untrusted committers
+
+By default, anyone who can commit to the git repository can modify any file
+on the wiki however they like. A `pre-receive` hook can be set up to limit
+incoming commits from untrusted users. Then the same limits that are placed
+on edits via the web will be in effect for commits to git for the users.
+They will not be allowed to edit locked pages, they will only be able to
+delete pages that the [[plugins/remove]] configuration allows them to
+remove, and they will only be allowed to add non-page attachments that the
+[[plugins/attachment]] configuration allows.
+
+To enable this, you need to set up the git repository to have multiple
+committers. Trusted committers, including the user that ikiwiki runs as, 
+will not have their commits checked by the `pre-receive` hook. Untrusted
+committers will have their commits checked. The configuration settings to
+enable are `git_test_receive_wrapper`, which enables generation of a
+`pre-receive` hook, and `git_untrusted_committers`, which is a list of
+usernames of the untrusted committers.
+
+Note that when the `pre-receive` hook is checking incoming changes, it
+ignores the git authorship information, and uses the username of the unix
+user who made the commit. Then tests including the `locked_pages` [[PageSpec]]
+are checked to see if that user can edit the pages in the commit.
+
+You can even set up an anonymous user, to allow anyone to push
+changes in via git rather than using the web interface.
+
 ## Optionally using a local wiki to preview changes
 
 When working on the "working clones" to add content to your wiki,
diff --git a/ikiwiki.in b/ikiwiki.in
index 4f24cfc2e..873bde0df 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -183,6 +183,9 @@ sub main () { #{{{
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
 		# do nothing
 	}
+	elsif ($config{test_receive}) {
+		rcs_test_receive();
+	}
 	else {
 		if ($config{rebuild}) {
 			debug(gettext("rebuilding wiki.."));
-- 
cgit v1.2.3


From 4669eab596c8d90de0cf9f9d359ad8dd8f48edb5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 16:29:50 -0400
Subject: more work on untrusted committers

Wired up check_canedit and check_canremove, still need to deal with
check_canattach, and test.
---
 IkiWiki.pm                 |   4 +-
 IkiWiki/Plugin/editpage.pm |   2 +-
 IkiWiki/Plugin/git.pm      |  70 ++++++++++++++++---------------
 IkiWiki/Plugin/remove.pm   |   2 +-
 IkiWiki/Receive.pm         | 101 +++++++++++++++++++++++++++++++++++++++++++++
 doc/plugins/write.mdwn     |  24 ++++++++---
 doc/rcs/git.mdwn           |   2 +-
 ikiwiki.in                 |  10 ++++-
 8 files changed, 168 insertions(+), 47 deletions(-)
 create mode 100644 IkiWiki/Receive.pm

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 245eaafba..698244187 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1582,8 +1582,8 @@ sub rcs_getctime ($) { #{{{
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
 } #}}}
 
-sub rcs_test_receive ($) { #{{{
-	$hooks{rcs}{rcs_test_receive}{call}->(@_);
+sub rcs_receive ($) { #{{{
+	$hooks{rcs}{rcs_receive}{call}->(@_);
 } #}}}
 
 sub globlist_to_pagespec ($) { #{{{
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 30c93df20..fe2864bac 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -122,7 +122,7 @@ sub cgi_editpage ($$) { #{{{
 	my $absolute=($page =~ s#^/+##);
 	if (! defined $page || ! length $page ||
 	    file_pruned($page, $config{srcdir})) {
-		error("bad page name");
+		error(gettext("bad page name"));
 	}
 
 	my $baseurl = urlto($page, undef, 1);
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 1facb14c0..234e7af2e 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -23,7 +23,7 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
-	hook(type => "rcs", id => "rcs_test_receive", call => \&rcs_test_receive);
+	hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive);
 } #}}}
 
 sub checkconfig () { #{{{
@@ -77,7 +77,7 @@ sub getsetup () { #{{{
 			safe => 0, # file
 			rebuild => 0,
 		},
-		git_untrusted_committers => {
+		untrusted_committers => {
 			type => "string",
 			example => [],
 			description => "unix users whose commits should be checked by the pre-receive hook",
@@ -588,15 +588,7 @@ sub rcs_getctime ($) { #{{{
 	return $ctime;
 } #}}}
 
-sub rcs_test_receive () { #{{{
-	# quick success if the user is trusted
-	my $committer=(getpwuid($<))[0];
-	if (! defined $committer) {
-		error("cannot determine username for $<");
-	}
-	exit 0 if ! ref $config{git_untrusted_committers} ||
-	          ! grep { $_ eq $committer } @{$config{git_untrusted_committers}};
-
+sub rcs_receive () { #{{{
 	# The wiki may not be the only thing in the git repo.
 	# Determine if it is in a subdirectory by examining the srcdir,
 	# and its parents, looking for the .git directory.
@@ -610,54 +602,64 @@ sub rcs_test_receive () { #{{{
 		}
 	}
 
-	my @errors;
+	my @rets;
 	while (<>) {
 		chomp;
 		my ($oldrev, $newrev, $refname) = split(' ', $_, 3);
 
 		# only allow changes to gitmaster_branch
 		if ($refname !~ /^refs\/heads\/\Q$config{gitmaster_branch}\E$/) {
-			push @errors, sprintf(gettext("you are not allowed to change %s"), $refname);
+			error sprintf(gettext("you are not allowed to change %s"), $refname);
 		}
 
 		foreach my $ci (git_commit_info($oldrev."..".$newrev)) {
 			foreach my $detail (@{ $ci->{'details'} }) {
 				my $file = $detail->{'file'};
 
-				# check that all changed files are in the subdir
+				# check that all changed files are in the
+				# subdir
 				if (length $subdir &&
 				    ! ($file =~ s/^\Q$subdir\E//)) {
-					push @errors, sprintf(gettext("you are not allowed to change %s"), $file);
-					next;
+					error sprintf(gettext("you are not allowed to change %s"), $file);
 				}
 
-				if ($detail->{'mode_from'} ne $detail->{'mode_to'}) {
-					push @errors, gettext("you are not allowed to change file modes");
+				my $action;
+				my $mode;			
+				if ($detail->{'status'} =~ /^[M]+\d*$/) {
+					$action="change";
+					$mode=$detail->{'mode_to'};
 				}
-
-				if ($detail->{'status'} =~ /^D+\d*/) {
-					# TODO check_canremove
+				elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
+					$action="add";
+					$mode=$detail->{'mode_to'};
 				}
-				elsif ($detail->{'status'} !~ /^[MA]+\d*$/) {
-					push @errors, "unknown status ".$detail->{'status'};
+				elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
+					$action="remove";
+					$mode=$detail->{'mode_from'};
 				}
 				else {
-					# TODO check_canedit
-					# TODO check_canattach
+					error "unknown status ".$detail->{'status'};
 				}
+				
+				# test that the file mode is ok
+				if ($mode !~ /^100[64][64][64]$/) {
+					error sprintf(gettext("you cannot act on a file with mode %s"), $mode);
+				}
+				if ($action eq "change") {
+					if ($detail->{'mode_from'} ne $detail->{'mode_to'}) {
+						error gettext("you are not allowed to change file modes");
+					}
+				}
+
+				push @rets, {
+					file => $file,
+					action => $action,
+				};
 			}
 		}
 	}
 
-	if (@errors) {
-		# TODO clean up objects from failed push
-
-		print STDERR "$_\n" foreach @errors;
-		exit 1;
-	}
-	else {
-		exit 0;
-	}
+	return @rets;
 } #}}}
 
 1
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 68bf9d1ee..c512b3b97 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -41,7 +41,7 @@ sub check_canremove ($$$) { #{{{
 		error(sprintf(gettext("%s is not a file"), $file));
 	}
 	
-	# Must be editiable.
+	# Must be editable.
 	IkiWiki::check_canedit($page, $q, $session);
 
 	# If a user can't upload an attachment, don't let them delete it.
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
new file mode 100644
index 000000000..63944bb81
--- /dev/null
+++ b/IkiWiki/Receive.pm
@@ -0,0 +1,101 @@
+#!/usr/bin/perl
+
+package IkiWiki::Receive;
+
+use warnings;
+use strict;
+use IkiWiki;
+
+sub getuser () { #{{{
+	my $user=(getpwuid($<))[0];
+	if (! defined $user) {
+		error("cannot determine username for $<");
+	}
+	return $user;
+} #}}}
+
+sub trusted () { #{{{
+	my $user=getuser();
+	return ! ref $config{untrusted_committers} ||
+		! grep { $_ eq $user } @{$config{untrusted_committers}};
+} #}}}
+
+sub test () { #{{{
+	exit 0 if trusted();
+	IkiWiki::rcs_test_receive();
+	
+	# Dummy up a cgi environment to use when calling check_canedit
+	# and friends.
+	eval q{use CGI};
+	error($@) if $@;
+	my $cgi=CGI->new;
+	require IkiWiki::CGI;
+	my $session=IkiWiki::cgi_getsession($cgi);
+	my $user=getuser();
+	$session->param("name", $user);
+	$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
+
+	lockwiki();
+	loadindex();
+
+	my %newfiles;
+
+	foreach my $change (IkiWiki::rcs_receive()) {
+		# This untaint is safe because we check file_pruned and
+		# wiki_file_regexp.
+		my $file=$change->{file}=~/$config{wiki_file_regexp}/;
+		$file=possibly_foolish_untaint($file);
+		if (! defined $file || ! length $file ||
+		    IkiWiki::file_pruned($file, $config{srcdir})) {
+			error(gettext("bad file name"));
+		}
+
+		my $type=pagetype($file);
+		my $page=pagename($file) if defined $type;
+		
+		if ($change->{action} eq 'add') {
+			$newfiles{$file}=1;
+		}
+
+		if ($change->{action} eq 'change' ||
+		    $change->{action} eq 'add') {
+			if (defined $page) {
+				if (IkiWiki->can("check_canedit") &&
+				    IkiWiki::check_canedit($page, $cgi, $session)) {
+				    	next;
+				}
+			}
+			else {
+				# TODO
+				#if (IkiWiki::Plugin::attachment->can("check_canattach") &&
+				#    IkiWiki::Plugin::attachment::check_canattach($session, $file, $path)) {
+				#    	next;
+				#}
+			}
+		}
+		elsif ($change->{action} eq 'remove') {
+			# check_canremove tests to see if the file is present
+			# on disk. This will fail is a single commit adds a
+			# file and then removes it again. Avoid the problem
+			# by not testing the removal in such pairs of changes.
+			# (The add is still tested, just to make sure that
+			# no data is added to the repo that a web edit
+			# could add.)
+			next if $newfiles{$file};
+
+			if (IkiWiki::Plugin::remove->can("check_canremove") &&
+			    IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session)) {
+				next;
+			}
+		}
+		else {
+			error "unknown action ".$change->{action};
+		}
+				
+		error sprintf(gettext("you are not allowed to change %s"), $file);
+	}
+
+	exit 0;
+} #}}}
+
+1
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5a5db6be0..9f096e4f7 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -820,14 +820,26 @@ it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
-#### `rcs_test_receive()`
+#### `rcs_receive()`
 
-This is used to test if changes pushed into the RCS should be accepted.
-Ikiwiki will be running as a pre-receive hook (or equivilant) and should
-examine the incoming changes, decide if they are allowed, and communicate
-that to the RCS.
+This is called when ikiwiki is running as a pre-receive hook (or
+equivilant), and is testing if changes pushed into the RCS from an
+untrusted user should be accepted. This is optional, and doesn't make
+sense to implement for all RCSs.
 
-This is optional, and doesn't make sense for all RCSs.
+It should examine the incoming changes, and do any sanity 
+checks that are appropriate for the RCS to limit changes to safe file adds,
+removes, and renames. If something bad is found, it should exit
+nonzero, to abort the push. Otherwise, it should return a list of
+files that were changed, in the form:
+
+	{
+		file => # name of file that was changed
+		action => # either "add", "change", or "remove"
+	}
+
+The list will then be checked to make sure that each change is one that
+is allowed to be made via the web interface.
 
 ### PageSpec plugins
 
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 2a6feecf5..6ba0da894 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -116,7 +116,7 @@ committers. Trusted committers, including the user that ikiwiki runs as,
 will not have their commits checked by the `pre-receive` hook. Untrusted
 committers will have their commits checked. The configuration settings to
 enable are `git_test_receive_wrapper`, which enables generation of a
-`pre-receive` hook, and `git_untrusted_committers`, which is a list of
+`pre-receive` hook, and `untrusted_committers`, which is a list of
 usernames of the untrusted committers.
 
 Note that when the `pre-receive` hook is checking incoming changes, it
diff --git a/ikiwiki.in b/ikiwiki.in
index 22addb463..60663bc89 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -119,10 +119,15 @@ sub getconfig () { #{{{
 		}
 		delete $ENV{WRAPPED_OPTIONS};
 
-		# optimisation for no-op post_commit 
 		if ($config{post_commit} && ! commit_hook_enabled()) {
+			# optimisation for no-op post_commit 
 			exit 0;
 		}
+		elsif ($config{test_receive}) {
+			# quick success if the user is trusted
+			require IkiWiki::Receive;
+			exit 0 if IkiWiki::Receive::trusted();
+		}
 
 		loadplugins();
 		checkconfig();
@@ -190,7 +195,8 @@ sub main () { #{{{
 		# do nothing
 	}
 	elsif ($config{test_receive}) {
-		rcs_test_receive();
+		require IkiWiki::Receive;
+		IkiWiki::Receive::test();
 	}
 	else {
 		if ($config{rebuild}) {
-- 
cgit v1.2.3


From ad9e443f22a139c71f0cd05885cda3e418f27567 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 16:56:40 -0400
Subject: check_canattach hooked up

---
 IkiWiki/Plugin/git.pm  | 33 ++++++++++++++++++++++++++-------
 IkiWiki/Receive.pm     |  9 ++++-----
 doc/plugins/write.mdwn |  5 ++++-
 3 files changed, 34 insertions(+), 13 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 234e7af2e..bdac6f7a1 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -9,6 +9,7 @@ use open qw{:utf8 :std};
 
 my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
+my $no_chdir=0;
 
 sub import { #{{{
 	hook(type => "checkconfig", id => "git", call => \&checkconfig);
@@ -127,8 +128,10 @@ sub safe_git (&@) { #{{{
 	if (!$pid) {
 		# In child.
 		# Git commands want to be in wc.
-		chdir $config{srcdir}
-		    or error("Cannot chdir to $config{srcdir}: $!");
+		if (! $no_chdir) {
+			chdir $config{srcdir}
+			    or error("Cannot chdir to $config{srcdir}: $!");
+		}
 		exec @cmdline or error("Cannot exec '@cmdline': $!");
 	}
 	# In parent.
@@ -606,13 +609,20 @@ sub rcs_receive () { #{{{
 	while (<>) {
 		chomp;
 		my ($oldrev, $newrev, $refname) = split(' ', $_, 3);
-
+		
 		# only allow changes to gitmaster_branch
 		if ($refname !~ /^refs\/heads\/\Q$config{gitmaster_branch}\E$/) {
 			error sprintf(gettext("you are not allowed to change %s"), $refname);
 		}
-
-		foreach my $ci (git_commit_info($oldrev."..".$newrev)) {
+		
+		# Avoid chdir when running git here, because the changes
+		# are in the master git repo, not the srcdir repo.
+		# The pre-recieve hook already puts us in the right place.
+		$no_chdir=1;
+		my @changes=git_commit_info($oldrev."..".$newrev);
+		$no_chdir=0;
+
+		foreach my $ci (@changes) {
 			foreach my $detail (@{ $ci->{'details'} }) {
 				my $file = $detail->{'file'};
 
@@ -623,8 +633,7 @@ sub rcs_receive () { #{{{
 					error sprintf(gettext("you are not allowed to change %s"), $file);
 				}
 
-				my $action;
-				my $mode;			
+				my ($action, $mode, $path);
 				if ($detail->{'status'} =~ /^[M]+\d*$/) {
 					$action="change";
 					$mode=$detail->{'mode_to'};
@@ -632,6 +641,15 @@ sub rcs_receive () { #{{{
 				elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
 					$action="add";
 					$mode=$detail->{'mode_to'};
+					if (! pagetype($file)) {
+						eval q{use File::Temp};
+						die $@ if $@;
+						my $fh;
+						($fh, $path)=tempfile("XXXXXXXXXX", UNLINK => 1);
+						if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
+							error("failed writing temp file");
+						}
+					}
 				}
 				elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
 					$action="remove";
@@ -654,6 +672,7 @@ sub rcs_receive () { #{{{
 				push @rets, {
 					file => $file,
 					action => $action,
+					path => $path,
 				};
 			}
 		}
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 63944bb81..4d437cf78 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -66,11 +66,10 @@ sub test () { #{{{
 				}
 			}
 			else {
-				# TODO
-				#if (IkiWiki::Plugin::attachment->can("check_canattach") &&
-				#    IkiWiki::Plugin::attachment::check_canattach($session, $file, $path)) {
-				#    	next;
-				#}
+				if (IkiWiki::Plugin::attachment->can("check_canattach") &&
+				    IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path})) {
+				    	next;
+				}
 			}
 		}
 		elsif ($change->{action} eq 'remove') {
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 9f096e4f7..7fbe4bd57 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -829,13 +829,16 @@ sense to implement for all RCSs.
 
 It should examine the incoming changes, and do any sanity 
 checks that are appropriate for the RCS to limit changes to safe file adds,
-removes, and renames. If something bad is found, it should exit
+removes, and changes. If something bad is found, it should exit
 nonzero, to abort the push. Otherwise, it should return a list of
 files that were changed, in the form:
 
 	{
 		file => # name of file that was changed
 		action => # either "add", "change", or "remove"
+		path => # temp file containing the new file content, only
+			# needed for "add", and only if the file is an
+			# attachment, not a page
 	}
 
 The list will then be checked to make sure that each change is one that
-- 
cgit v1.2.3


From 85f4b99710fa94b9b67cee061c37eaf49be36b25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 18:05:57 -0400
Subject: untrusted committers code seems to be fully working

Still need to investigate possible races, and test some more.
---
 IkiWiki.pm            |  4 ++--
 IkiWiki/Plugin/git.pm | 10 ++++++----
 debian/changelog      |  2 ++
 ikiwiki.in            |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 698244187..1a55945a8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1582,8 +1582,8 @@ sub rcs_getctime ($) { #{{{
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
 } #}}}
 
-sub rcs_receive ($) { #{{{
-	$hooks{rcs}{rcs_receive}{call}->(@_);
+sub rcs_receive () { #{{{
+	$hooks{rcs}{rcs_receive}{call}->();
 } #}}}
 
 sub globlist_to_pagespec ($) { #{{{
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index bdac6f7a1..e565f6369 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -365,8 +365,10 @@ sub git_commit_info ($;$) { #{{{
 	# starting from the given sha1sum.
 	my ($sha1, $num) = @_;
 
-	my @raw_lines = run_or_die('git', 'log',
-		(defined $num ? "--max-count=$num" : ""), 
+	my @opts;
+	push @opts, "--max-count=$num" if defined $num;
+
+	my @raw_lines = run_or_die('git', 'log', @opts,
 		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
 		'-r', $sha1, '--', '.');
 	my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
@@ -645,7 +647,7 @@ sub rcs_receive () { #{{{
 						eval q{use File::Temp};
 						die $@ if $@;
 						my $fh;
-						($fh, $path)=tempfile("XXXXXXXXXX", UNLINK => 1);
+						($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
 						if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
 							error("failed writing temp file");
 						}
@@ -678,7 +680,7 @@ sub rcs_receive () { #{{{
 		}
 	}
 
-	return @rets;
+	return reverse @rets;
 } #}}}
 
 1
diff --git a/debian/changelog b/debian/changelog
index 49bd85447..d8e26e4c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Updated Danish translation from Jonas Smedegaard. Closes: #503117
   * Optimise the no-op post-commit hook in the web edit case by skipping
     loading plugins. (Particularly a win when using external plugins.)
+  * Add support for checking pushes from untrusted git committers. This can be
+    used to set up anonymous git pushes, and other similar things.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/ikiwiki.in b/ikiwiki.in
index 60663bc89..d601d2739 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -156,7 +156,8 @@ sub main () { #{{{
 					if exists $config{setupsyslog};
 				delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
 				checkconfig();
-				if (! $config{cgi} && ! $config{post_commit}) {
+				if (! $config{cgi} && ! $config{post_commit} &&
+				    ! $config{test_receive}) {
 					$config{post_commit}=1;
 				}
 				gen_wrapper();
-- 
cgit v1.2.3


From 0196e1f9fcfebbf904e59c029e494cb2186793e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 13:29:41 -0400
Subject: updates

---
 IkiWiki/Plugin/git.pm         | 2 +-
 doc/plugins/pingee.mdwn       | 2 +-
 doc/users/xma/discussion.mdwn | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index e565f6369..3a8476e7d 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -619,7 +619,7 @@ sub rcs_receive () { #{{{
 		
 		# Avoid chdir when running git here, because the changes
 		# are in the master git repo, not the srcdir repo.
-		# The pre-recieve hook already puts us in the right place.
+		# The pre-receive hook already puts us in the right place.
 		$no_chdir=1;
 		my @changes=git_commit_info($oldrev."..".$newrev);
 		$no_chdir=0;
diff --git a/doc/plugins/pingee.mdwn b/doc/plugins/pingee.mdwn
index d012004f9..6156c235f 100644
--- a/doc/plugins/pingee.mdwn
+++ b/doc/plugins/pingee.mdwn
@@ -3,7 +3,7 @@
 
 This plugin causes ikiwiki to listen for pings, typically delivered from
 another ikiwiki instance using the [[pinger]] plugin. When a ping is
-recieved, ikiwiki will update the wiki, the same as if `ikiwiki --refresh`
+received, ikiwiki will update the wiki, the same as if `ikiwiki --refresh`
 were ran at the command line.
 
 An url such as the following is used to trigger a ping:
diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn
index c2bb62062..34adbf821 100644
--- a/doc/users/xma/discussion.mdwn
+++ b/doc/users/xma/discussion.mdwn
@@ -14,3 +14,5 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there
 > for ikiwiki. --[[Joey]]
 
 > > I'll think about it. It may solve some of my offline-being issues. --[[intrigeri]]
+
+>>>> Now developed! --[[Joey]]
-- 
cgit v1.2.3


From 1a883b3c504a543c8f4a5b5bb9687e7770f28a4f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 13:44:03 -0400
Subject: include temp file for attachment change too

---
 IkiWiki/Plugin/git.pm  | 23 +++++++++++++----------
 IkiWiki/Receive.pm     |  2 +-
 doc/plugins/write.mdwn |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 3a8476e7d..84df56181 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -619,7 +619,7 @@ sub rcs_receive () { #{{{
 		
 		# Avoid chdir when running git here, because the changes
 		# are in the master git repo, not the srcdir repo.
-		# The pre-receive hook already puts us in the right place.
+		# The pre-recieve hook already puts us in the right place.
 		$no_chdir=1;
 		my @changes=git_commit_info($oldrev."..".$newrev);
 		$no_chdir=0;
@@ -643,15 +643,6 @@ sub rcs_receive () { #{{{
 				elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
 					$action="add";
 					$mode=$detail->{'mode_to'};
-					if (! pagetype($file)) {
-						eval q{use File::Temp};
-						die $@ if $@;
-						my $fh;
-						($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
-						if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
-							error("failed writing temp file");
-						}
-					}
 				}
 				elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
 					$action="remove";
@@ -670,6 +661,18 @@ sub rcs_receive () { #{{{
 						error gettext("you are not allowed to change file modes");
 					}
 				}
+				
+				# extract attachment to temp file
+				if (($action eq 'add' || $action eq 'change') &&
+				     ! pagetype($file)) {
+					eval q{use File::Temp};
+					die $@ if $@;
+					my $fh;
+					($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
+					if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
+						error("failed writing temp file");
+					}
+				}
 
 				push @rets, {
 					file => $file,
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index c69911a7c..9a672abc9 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -45,7 +45,7 @@ sub test () { #{{{
 		$file=IkiWiki::possibly_foolish_untaint($file);
 		if (! defined $file || ! length $file ||
 		    IkiWiki::file_pruned($file, $config{srcdir})) {
-			error(gettext("bad file name"));
+			error(gettext("bad file name %s"), $file);
 		}
 
 		my $type=pagetype($file);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5ee4acb53..abcabbdc3 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -837,8 +837,8 @@ files that were changed, in the form:
 		file => # name of file that was changed
 		action => # either "add", "change", or "remove"
 		path => # temp file containing the new file content, only
-			# needed for "add", and only if the file is an
-			# attachment, not a page
+			# needed for "add"/"change", and only if the file
+			# is an attachment, not a page
 	}
 
 The list will then be checked to make sure that each change is one that
-- 
cgit v1.2.3


From 146192d5b01329bd8e5dfbf4045efded467151e0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 15:47:42 -0400
Subject: the pre-receive wrapper needs to be suid after all

It needs to write to the user db.
---
 IkiWiki/Plugin/git.pm |  2 +-
 IkiWiki/Receive.pm    | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 84df56181..5bef92856 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -46,7 +46,7 @@ sub checkconfig () { #{{{
 		push @{$config{wrappers}}, {
 			test_receive => 1,
 			wrapper => $config{git_test_receive_wrapper},
-			wrappermode => "0755",
+			wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
 		};
 	}
 } #}}}
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 81b67d9b4..451a3fe8e 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -7,7 +7,8 @@ use strict;
 use IkiWiki;
 
 sub getuser () { #{{{
-	my $user=(getpwuid($<))[0];
+	# CALLER_UID is set by the suid wrapper, to the original uid
+	my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
 	if (! defined $user) {
 		error("cannot determine username for $<");
 	}
@@ -23,20 +24,31 @@ sub trusted () { #{{{
 sub test () { #{{{
 	exit 0 if trusted();
 	
+	IkiWiki::lockwiki();
+	IkiWiki::loadindex();
+	
 	# Dummy up a cgi environment to use when calling check_canedit
 	# and friends.
 	eval q{use CGI};
 	error($@) if $@;
 	my $cgi=CGI->new;
+	$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
+
+	# And dummy up a session object.
 	require IkiWiki::CGI;
 	my $session=IkiWiki::cgi_getsession($cgi);
 	$session->param("name", getuser());
-	$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
-
-	# Wiki is not locked because we lack permission to do so.
-	# So, relying on atomic index file updates to avoid trouble.
-	IkiWiki::loadindex();
-
+	# Make sure whatever user was authed is in the
+	# userinfo db.
+	require IkiWiki::UserInfo;
+	if (! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+		IkiWiki::userinfo_setall($session->param("name"), {
+			email => "",
+			password => "",
+			regdate => time,
+		}) || error("failed adding user");
+	}
+	
 	my %newfiles;
 
 	foreach my $change (IkiWiki::rcs_receive()) {
-- 
cgit v1.2.3


From 8530e827b01a6eed8b8c933e758e152a1dc32035 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 27 Oct 2008 14:45:54 -0400
Subject: git: Allow [[sha1_commit]] to be used in the diffurl, to support
 cgit.

---
 IkiWiki/Plugin/git.pm                      | 3 ++-
 debian/changelog                           | 1 +
 doc/todo/provide_sha1_for_git_diffurl.mdwn | 4 +++-
 po/ikiwiki.pot                             | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 5bef92856..1a39d87e5 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -95,7 +95,7 @@ sub getsetup () { #{{{
 		diffurl => {
 			type => "string",
 			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-			description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)",
+			description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], [[sha1_commit]] and [[file]] substituted)",
 			safe => 1,
 			rebuild => 1,
 		},
@@ -521,6 +521,7 @@ sub rcs_recentchanges ($) { #{{{
 			$diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
 			$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
 			$diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
+			$diffurl =~ s/\[\[sha1_commit\]\]/$sha1/go;
 
 			push @pages, {
 				page => pagename($file),
diff --git a/debian/changelog b/debian/changelog
index 63556c941..299cf1af2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     of a second.
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
+  * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/todo/provide_sha1_for_git_diffurl.mdwn b/doc/todo/provide_sha1_for_git_diffurl.mdwn
index af785c3e6..dfd848058 100644
--- a/doc/todo/provide_sha1_for_git_diffurl.mdwn
+++ b/doc/todo/provide_sha1_for_git_diffurl.mdwn
@@ -18,4 +18,6 @@ diffurls of the following form:
      			$diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
      			$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
      			$diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
-     
+
+> [[done]], but I called it `sha1_commit` since I think that's what it's
+> actually a sha1 of. --[[Joey]]
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index cbae46752..7a2891ea5 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-26 20:44-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3


From 33a0e84ddbb9fe9c068cb40641ccec8554514151 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 29 Oct 2008 14:20:31 -0400
Subject: fix preview of shortcuts

Move shortcut processing back to checkconfig, and avoid it failing if the
srcdir is not defined.
---
 IkiWiki/Plugin/shortcut.pm             | 18 ++++++++++--------
 debian/changelog                       |  1 +
 doc/bugs/cannot_preview_shortcuts.mdwn |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 7bfce586f..77131edb0 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -7,7 +7,7 @@ use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "shortcut", call => \&getsetup);
-	hook(type => "refresh", id => "shortcut", call => \&refresh);
+	hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
 	hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
 } #}}}
 
@@ -19,14 +19,16 @@ sub getsetup () { #{{{
 		},
 } #}}}
 
-sub refresh () { #{{{
-	# Preprocess the shortcuts page to get all the available shortcuts
-	# defined before other pages are rendered.
-	my $srcfile=srcfile("shortcuts.mdwn", 1);
-	if (! defined $srcfile) {
-		error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+sub checkconfig () { #{{{
+	if (defined $config{srcdir}) {
+		# Preprocess the shortcuts page to get all the available shortcuts
+		# defined before other pages are rendered.
+		my $srcfile=srcfile("shortcuts.mdwn", 1);
+		if (! defined $srcfile) {
+			error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+		}
+		IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 	}
-	IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 } # }}}
 
 sub preprocess_shortcut (@) { #{{{
diff --git a/debian/changelog b/debian/changelog
index 299cf1af2..4547cda3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
   * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
+  * shortcut: Fix display of shortcuts while previewing.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
index a2fd3533a..2e7ef13b7 100644
--- a/doc/bugs/cannot_preview_shortcuts.mdwn
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -1,2 +1,4 @@
 Shortcuts such as \[[!google foo]] do not work when previewing pages.
 --[[JasonBlevins]]
+
+> Broken during the setup dumping changes, now fixed. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 354d22e27b4d9cb8207e038de4f342545435d2c6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 30 Oct 2008 13:41:19 -0400
Subject: don't rely on plugin load order when determining generated directives

Instead, shortcuts will explicitly be marked as such when registered, and
listdirectives can filter them out.
---
 IkiWiki/Plugin/listdirectives.pm       | 9 ++++-----
 IkiWiki/Plugin/shortcut.pm             | 1 +
 doc/bugs/cannot_preview_shortcuts.mdwn | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index fc8927ccb..2ab3e4665 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -30,7 +30,7 @@ sub getsetup () { #{{{
 } #}}}
 
 my @fulllist;
-my @earlylist;
+my @shortlist;
 my $pluginstring;
 
 sub checkconfig () { #{{{
@@ -40,15 +40,14 @@ sub checkconfig () { #{{{
 	else {
 		$config{directive_description_dir} =~ s/\/+$//;
 	}
-
-	@earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
 } #}}}
 
 sub needsbuild (@) { #{{{
 	my $needsbuild=shift;
 
 	@fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
-	$pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
+	@shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
+	$pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{listdirectives}{shown}) {
@@ -77,7 +76,7 @@ sub preprocess (@) { #{{{
 		@pluginlist = @fulllist;
 	}
 	else {
-		@pluginlist = @earlylist;
+		@pluginlist = @shortlist;
 	}
 	
 	my $result = '<ul class="listdirectives">';
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 77131edb0..dec8afdb5 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -39,6 +39,7 @@ sub preprocess_shortcut (@) { #{{{
 	}
 
 	hook(type => "preprocess", no_override => 1, id => $params{name},
+		shortcut => 1,
 		call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
 
 	#translators: This is used to display what shortcuts are defined.
diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
index 7c830898d..d7045b2dc 100644
--- a/doc/bugs/cannot_preview_shortcuts.mdwn
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -8,3 +8,10 @@ Shortcuts such as \[[!google foo]] do not work when previewing pages.
 >> still works, but it relies on the fact that the `listdirectives` `checkconfig`
 >> hook is called before the `shortcut` `checkconfig` hook.
 >> -- [[Will]]
+
+>> The order plugins are loaded is effectively random. (`keys %hooks`).
+>> So I've made shortcuts pass a 'shortcut' parameter when registering
+>> them, which listdirectives can grep out of the full list of directives.
+>> That may not be the best name to give it, especially if other plugins
+>> generate directives too. Seemed better than forcing shortcut's
+>> checkconfig hook to run last tho. --[[Joey]]
-- 
cgit v1.2.3


From bb841f94f47d865e4c78bd4f27c5f9cc04dc1557 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 31 Oct 2008 16:42:20 -0400
Subject: format: New plugin, allows embedding differntly formatted text inside
 a page (ie, otl inside a mdwn page, or syntax highlighted code inside a
 page).

---
 IkiWiki/Plugin/format.pm          | 29 +++++++++++++++++++++++++++++
 debian/changelog                  |  3 +++
 doc/ikiwiki/directive/format.mdwn | 21 +++++++++++++++++++++
 doc/plugins/format.mdwn           |  9 +++++++++
 doc/todo/syntax_highlighting.mdwn |  4 ++--
 po/bg.po                          | 29 +++++++++++++++++++----------
 po/cs.po                          | 29 +++++++++++++++++++----------
 po/da.po                          | 29 +++++++++++++++++++----------
 po/de.po                          | 29 +++++++++++++++++++----------
 po/es.po                          | 29 +++++++++++++++++++----------
 po/fr.po                          | 29 +++++++++++++++++++----------
 po/gu.po                          | 29 +++++++++++++++++++----------
 po/ikiwiki.pot                    | 13 +++++++++++--
 po/pl.po                          | 29 +++++++++++++++++++----------
 po/sv.po                          | 29 +++++++++++++++++++----------
 po/vi.po                          | 29 +++++++++++++++++++----------
 16 files changed, 265 insertions(+), 104 deletions(-)
 create mode 100644 IkiWiki/Plugin/format.pm
 create mode 100644 doc/ikiwiki/directive/format.mdwn
 create mode 100644 doc/plugins/format.mdwn

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
new file mode 100644
index 000000000..a219190e8
--- /dev/null
+++ b/IkiWiki/Plugin/format.pm
@@ -0,0 +1,29 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::format;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub import { #{{{
+	hook(type => "preprocess", id => "format", call => \&preprocess);
+} #}}}
+
+sub preprocess (@) { #{{{
+	my $format=$_[0];
+	shift; shift;
+	my $text=$_[0];
+	shift; shift;
+	my %params=@_;
+
+	if (! defined $format || ! defined $text) {
+		error(gettext("must specify format and text"));
+	}
+	elsif (! exists $IkiWiki::hooks{htmlize}{$format}) {
+		error(sprintf(gettext("unsupported page format %s"), $format));
+	}
+
+	return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text);
+} #}}}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 0c3fded41..ca0433d10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * shortcut: Fix display of shortcuts while previewing.
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
   * Several fixes to --render mode.
+  * format: New plugin, allows embedding differntly formatted text inside a
+    page (ie, otl inside a mdwn page, or syntax highlighted code inside a
+    page).
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/ikiwiki/directive/format.mdwn b/doc/ikiwiki/directive/format.mdwn
new file mode 100644
index 000000000..94cf1b04f
--- /dev/null
+++ b/doc/ikiwiki/directive/format.mdwn
@@ -0,0 +1,21 @@
+The `format` directive is supplied by the [[!iki plugins/format desc=format]]
+plugin.
+
+The directive allows formatting a chunk of text using any available page
+format. It takes two parameters. First is the type of format to use,
+ie the extension that would be used for a standalone file of this type.
+Second is the text to format.
+
+For example, this will embed an otl outline inside a page using mdwn or
+some other format:
+
+	\[[!format otl """
+	foo
+		1
+		2
+	bar
+		3
+		4
+	"""]]
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/format.mdwn b/doc/plugins/format.mdwn
new file mode 100644
index 000000000..91e707fcf
--- /dev/null
+++ b/doc/plugins/format.mdwn
@@ -0,0 +1,9 @@
+[[!template id=plugin name=format core=0 author="[[Joey]]"]]
+[[!tag type/format]]
+
+This plugin allows mixing different page formats together, by embedding
+text formatted one way inside a page formatted another way. This is done
+using the [[ikiwiki/directive/format]] [[ikiwiki/directive]].
+
+For example, it could be used to embed an [[otl]] outline inside a page
+that is formatted as [[mdwn]].
diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 43878437f..bb1c84f02 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -73,8 +73,8 @@ That would run the text through the pl htmlizer, from the syntax hightligh
 plugin. OTOH, if "rst" were given, it would run the text through the rst
 htmlizer. So, more generic, allows mixing different types of markup on one
 page, as well as syntax highlighting. Does require specifying the type of
-format, instead of allows it to be guessed (which some syntax highlighters
-can do).
+format, instead of allowing it to be guessed (which some syntax highlighters
+can do). (This directive is now implemented..)
 
 Hmm, this would also allow comments inside source files to have mdwn
 embedded in them, without making the use of mdwn a special case, or needing
diff --git a/po/bg.po b/po/bg.po
index 471e03119..19b0fff50 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -131,7 +131,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "готово"
 
@@ -253,22 +253,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "грешка при обработване на шаблона"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -686,11 +695,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "препратката няма указани параметрите „name” или „url”"
@@ -698,7 +707,7 @@ msgstr "препратката няма указани параметрите 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "препратката „%s” сочи към „%s”"
@@ -970,11 +979,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
diff --git a/po/cs.po b/po/cs.po
index ece992c47..6cbb0c596 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -128,7 +128,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "hotovo"
 
@@ -250,22 +250,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "nepodařilo se zpracovat:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "fortune selhal"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -674,18 +683,18 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "chybí parametr jméno nebo url"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "zkratka %s odkazuje na <i>%s</i>"
@@ -951,11 +960,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "znovu vytvářím wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
diff --git a/po/da.po b/po/da.po
index 3d0deca8a..6c3ed3e53 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-10-22 19:13+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -132,7 +132,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "færdig"
 
@@ -250,22 +250,31 @@ msgstr "redigeringsskabelon %s registreret for %s"
 msgid "failed to process"
 msgstr "dannelsen mislykkedes"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, fuzzy, perl-format
+msgid "unsupported page format %s"
+msgstr "revisionskontrolsystem %s ikke understøttet"
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, fuzzy, perl-format
 msgid "you are not allowed to change %s"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 #, fuzzy
 msgid "you are not allowed to change file modes"
 msgstr "du er ikke logget på som en administrator"
@@ -669,18 +678,18 @@ msgstr "behøver Digest::SHA1 til indeks %s"
 msgid "search"
 msgstr "søg"
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "genvejsudvidelsen vil ikke fungere uden en shortcuts.mdwn"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "manglende navn eller url parameter"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "genvej %s viser til <i>%s</i>"
@@ -949,11 +958,11 @@ msgstr "brug: --set var=værdi"
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
diff --git a/po/de.po b/po/de.po
index bef54ad89..022fbfef1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-03-03 21:22+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -128,7 +128,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "fertig"
 
@@ -247,22 +247,31 @@ msgstr "»edittemplate« %s registriert für %s"
 msgid "failed to process"
 msgstr "Bearbeitung fehlgeschlagen"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "»fortune« fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -671,18 +680,18 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "das »shortcut«-Plugin funktioniert nicht ohne eine »shortcuts.mdwn«"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "fehlender Name oder URL-Parameter"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "Shortcut %s zeigt auf <i>%s</i>"
@@ -946,11 +955,11 @@ msgstr "Benutzung: --set Variable=Wert"
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
diff --git a/po/es.po b/po/es.po
index 7afb45c14..8dce2940f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-10-22 13:54+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -130,7 +130,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "completado"
 
@@ -248,22 +248,31 @@ msgstr "plantilla de edición %s registrada para %s"
 msgid "failed to process"
 msgstr "fallo en el proceso"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, fuzzy, perl-format
+msgid "unsupported page format %s"
+msgstr "el sistema de control de versiones %s no está soportado"
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, fuzzy, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 #, fuzzy
 msgid "you are not allowed to change file modes"
 msgstr "No está registrado como un administrador"
@@ -676,18 +685,18 @@ msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
 msgid "search"
 msgstr "buscar"
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "el complemento shortcut no funciona sin una página shortcuts.mdwn"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "El atajo %s apunta a <i>%s</i>"
@@ -959,11 +968,11 @@ msgstr "uso: --set variable=valor"
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
diff --git a/po/fr.po b/po/fr.po
index c0c96c476..53095c5e1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-10-11 10:34+0200\n"
 "Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -133,7 +133,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "suppression du compartiment (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "Terminé"
 
@@ -255,22 +255,31 @@ msgstr "edittemplate %s enregistré pour %s"
 msgid "failed to process"
 msgstr "Échec du traitement"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, fuzzy, perl-format
+msgid "unsupported page format %s"
+msgstr "Système de contrôle de version non reconnu"
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, fuzzy, perl-format
 msgid "you are not allowed to change %s"
 msgstr "vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 #, fuzzy
 msgid "you are not allowed to change file modes"
 msgstr "vous n'êtes pas authentifié comme administrateur"
@@ -683,18 +692,18 @@ msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 msgid "search"
 msgstr "recherche"
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "Le greffon « shortcut » ne fonctionnera pas sans shortcuts.mdwn"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "Il manque le paramètre nom ou URL."
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "Le raccourci %s pointe vers <i>%s</i>"
@@ -967,11 +976,11 @@ msgstr "Syntaxe : -- set var=valeur"
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
diff --git a/po/gu.po b/po/gu.po
index c48985eb5..13c68afc9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -129,7 +129,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -251,22 +251,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -675,18 +684,18 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિકલ્પ"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "ટુંકોરસ્તો %s એ <i>%s</i> નો નિર્દેશ કરે છે"
@@ -951,11 +960,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index ab28f956c..f3eb0eb55 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-29 17:42-0400\n"
+"POT-Creation-Date: 2008-10-31 16:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -246,6 +246,15 @@ msgstr ""
 msgid "failed to process"
 msgstr ""
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr ""
@@ -671,7 +680,7 @@ msgstr ""
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:47
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 6f262a2be..6f582c71f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -133,7 +133,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "gotowe"
 
@@ -255,22 +255,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "awaria w trakcie przetwarzania:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -691,11 +700,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "brakujący parametr name lub url"
@@ -703,7 +712,7 @@ msgstr "brakujący parametr name lub url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "skrót %s wskazuje na adres <i>%s</i>"
@@ -976,11 +985,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
diff --git a/po/sv.po b/po/sv.po
index cc83869cf..6d3e263ee 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -130,7 +130,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "klar"
 
@@ -252,22 +252,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "misslyckades med att behandla mall:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -681,11 +690,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "genväg saknar parameter för namn eller url"
@@ -693,7 +702,7 @@ msgstr "genväg saknar parameter för namn eller url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "genvägen %s pekar på %s"
@@ -965,11 +974,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
diff --git a/po/vi.po b/po/vi.po
index 13d695880..4cc16e1d8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -131,7 +131,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "xong"
 
@@ -253,22 +253,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "mẫu không xử lý được:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -682,11 +691,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "lối tắt thiếu tên hay tham số url"
@@ -694,7 +703,7 @@ msgstr "lối tắt thiếu tên hay tham số url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "lối tắt %s chỉ tới %s"
@@ -966,11 +975,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-- 
cgit v1.2.3


From d71caffb7b249bded2ab1902953fa321dc90011c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 2 Nov 2008 12:21:15 -0500
Subject: preprocess text before htmlizing it

---
 IkiWiki/Plugin/format.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index a219190e8..1e21a0bdc 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -23,7 +23,8 @@ sub preprocess (@) { #{{{
 		error(sprintf(gettext("unsupported page format %s"), $format));
 	}
 
-	return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text);
+	return IkiWiki::htmlize($params{page}, $params{destpage}, $format,
+		IkiWiki::preprocess($params{page}, $params{destpage}, $text));
 } #}}}
 
 1
-- 
cgit v1.2.3


From 42b4abee1d14fe1c571b2324f86e283d3db4d7e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 5 Nov 2008 01:38:36 -0500
Subject: use error for two messages

---
 IkiWiki/Plugin/inline.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 1b1ca2ce2..7fe5a4dcf 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -201,7 +201,7 @@ sub preprocess_inline (@) { #{{{
 		@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
 	}
 	else {
-		return sprintf(gettext("unknown sort type %s"), $params{sort});
+		error sprintf(gettext("unknown sort type %s"), $params{sort});
 	}
 
 	if (yesno($params{reverse})) {
@@ -298,7 +298,7 @@ sub preprocess_inline (@) { #{{{
 		require HTML::Template;
 		my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
 		if (! @params) {
-			return sprintf(gettext("nonexistant template %s"), $params{template});
+			error sprintf(gettext("nonexistant template %s"), $params{template});
 		}
 		my $template=HTML::Template->new(@params) unless $raw;
 	
-- 
cgit v1.2.3


From ecf2399f4fd2a515f4f5d6f0040024097a284343 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 6 Nov 2008 16:05:10 -0500
Subject: aggregate: Try to query XML::Feed for the base url when
 derelevatising links. Since this needs the just released XML::Feed 0.3, as
 well  as a not yet released XML::RSS, it will fall back to the old method if
 no xml:base info is available.

---
 IkiWiki/Plugin/aggregate.pm | 12 +++++++-----
 debian/changelog            |  9 +++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 2e4c86f24..c9c2880c5 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -520,10 +520,10 @@ sub aggregate (@) { #{{{
 		}
 
 		foreach my $entry ($f->entries) {
-			my $content=$content=$entry->content->body;
+			my $c=$entry->content;
 			# atom feeds may have no content, only a summary
-			if (! defined $content && ref $entry->summary) {
-				$content=$entry->summary->body;
+			if (! defined $c && ref $entry->summary) {
+				$c=$entry->summary;
 			}
 
 			add_page(
@@ -531,9 +531,10 @@ sub aggregate (@) { #{{{
 				copyright => $f->copyright,
 				title => defined $entry->title ? decode_entities($entry->title) : "untitled",
 				link => $entry->link,
-				content => defined $content ? $content : "",
+				content => defined $c ? $c->body : "",
 				guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
 				ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
+				base => (defined $c && $c->can("base")) ? $c->base : undef,
 			);
 		}
 	}
@@ -605,7 +606,8 @@ sub add_page (@) { #{{{
 	my $template=template($feed->{template}, blind_cache => 1);
 	$template->param(title => $params{title})
 		if defined $params{title} && length($params{title});
-	$template->param(content => htmlescape(htmlabs($params{content}, $feed->{feedurl})));
+	$template->param(content => htmlescape(htmlabs($params{content},
+		defined $params{base} ? $params{base} : $feed->{feedurl})));
 	$template->param(name => $feed->{name});
 	$template->param(url => $feed->{url});
 	$template->param(copyright => $params{copyright})
diff --git a/debian/changelog b/debian/changelog
index d04e5ee25..cd8ecba7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (2.69) UNRELEASED; urgency=low
+
+  * aggregate: Try to query XML::Feed for the base url when derelevatising
+    links. Since this needs the just released XML::Feed 0.3, as well 
+    as a not yet released XML::RSS, it will fall back to the old method
+    if no xml:base info is available.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
+
 ikiwiki (2.68) unstable; urgency=low
 
   * Add support for checking pushes from untrusted git committers. This can be
-- 
cgit v1.2.3


From db5ea4d4f01d7706c5397101ec860f8a471c1c55 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 6 Nov 2008 16:08:11 -0500
Subject: meta: Plugin is now enabled by default since the basewiki uses it.

---
 IkiWiki.pm                                                              | 2 +-
 IkiWiki/Plugin/goodstuff.pm                                             | 1 -
 debian/changelog                                                        | 1 +
 ...asewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn | 2 ++
 doc/plugins/goodstuff.mdwn                                              | 1 -
 doc/plugins/meta.mdwn                                                   | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bab7b707a..91d2e6082 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -120,7 +120,7 @@ sub getsetup () { #{{{
 	},
 	default_plugins => {
 		type => "internal",
-		default => [qw{mdwn link inline htmlscrubber passwordauth
+		default => [qw{mdwn link inline meta htmlscrubber passwordauth
 				openid signinedit lockedit conditional
 				recentchanges parentlinks editpage}],
 		description => "plugins to enable by default",
diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index ed1f4ddfc..a18e626d4 100644
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -10,7 +10,6 @@ my @bundle=qw{
 	brokenlinks
 	img
 	map
-	meta
 	more
 	orphans
 	pagecount
diff --git a/debian/changelog b/debian/changelog
index cd8ecba7c..a197369cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (2.69) UNRELEASED; urgency=low
     links. Since this needs the just released XML::Feed 0.3, as well 
     as a not yet released XML::RSS, it will fall back to the old method
     if no xml:base info is available.
+  * meta: Plugin is now enabled by default since the basewiki uses it.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
 
diff --git a/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn b/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn
index a90227b7a..62931d8bc 100644
--- a/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn
+++ b/doc/bugs/basewiki_uses_meta_directives_but_meta_is_not_enabled_by_default.mdwn
@@ -1,3 +1,5 @@
 [[plugins/meta]] is not enabled by default, yet some pages in the default basewiki include [[the_meta_directive|ikiwiki/directive/meta]], notably the [[ikiwiki]] heirarchy.
 
 This means that the default output of "ikiwiki src dest", for two empty directories src and dest, result in the meta directive being displayed inline with the page text.
+
+> [[done]], meta now enabled by default.
diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
index 83b60f4fa..ed57c0f01 100644
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@@ -12,7 +12,6 @@ Currently included:
 * [[brokenlinks]]
 * [[img]]
 * [[map]]
-* [[meta]]
 * [[more]]
 * [[orphans]]
 * [[pagecount]]
diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index afd554993..e49bdcc50 100644
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -1,4 +1,4 @@
-[[!template id=plugin name=meta author="[[Joey]]"]]
+[[!template id=plugin name=meta core=1 author="[[Joey]]"]]
 [[!tag type/meta]]
 
 This plugin provides the [[ikiwiki/directive/meta]] [[ikiwiki/directive]],
-- 
cgit v1.2.3


From 11d377af816b30eba336fae2993a79362443c293 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 6 Nov 2008 20:49:18 -0500
Subject: txt: Do not encode quotes when filtering the txt, as that broke later
 parsing of any directives on the page.

---
 IkiWiki/Plugin/txt.pm                                         | 2 +-
 debian/changelog                                              | 2 ++
 doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn | 2 ++
 docwiki.setup                                                 | 2 +-
 po/ikiwiki.pot                                                | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index e4c9e5d6a..e157bf07e 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -39,7 +39,7 @@ sub filter (@) {
 	my $content = $params{content};
 
 	if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) {
-		encode_entities($content);
+		encode_entities($content, "<>&");
 		if ($findurl) {
 			my $finder = URI::Find->new(sub {
 				my ($uri, $orig_uri) = @_;
diff --git a/debian/changelog b/debian/changelog
index a197369cc..424c99ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (2.69) UNRELEASED; urgency=low
     as a not yet released XML::RSS, it will fall back to the old method
     if no xml:base info is available.
   * meta: Plugin is now enabled by default since the basewiki uses it.
+  * txt: Do not encode quotes when filtering the txt, as that broke
+    later parsing of any directives on the page.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
 
diff --git a/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
index d2d5a46ed..22224483e 100644
--- a/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
+++ b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
@@ -15,3 +15,5 @@ Here is the header:
     [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
 
 --[[tschwinge]]
+
+> [[done]], made it less zealous about encoding html entities. --[[Joey]]
diff --git a/docwiki.setup b/docwiki.setup
index 6d732fd6b..bb9616d04 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -15,5 +15,5 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
-	add_plugins => [qw{goodstuff version haiku polygen fortune}],
+	add_plugins => [qw{goodstuff version haiku polygen fortune txt}],
 }
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 5db0c51af..6894dd2f6 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-03 16:31-0500\n"
+"POT-Creation-Date: 2008-11-06 20:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "feed crashed XML::Feed!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:590
+#: ../IkiWiki/Plugin/aggregate.pm:591
 #, perl-format
 msgid "creating new page %s"
 msgstr ""
-- 
cgit v1.2.3


From f0e58faefab108482e88f62db64ea6d654327d25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 10 Nov 2008 18:05:30 -0500
Subject: Add rel=nofollow to recentchanges_links for the same (weak) reasons
 it was earlier added to edit links.

---
 IkiWiki/Plugin/recentchanges.pm | 2 +-
 debian/changelog                | 2 ++
 templates/change.tmpl           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index a73ff37b9..3f70664ac 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -131,7 +131,7 @@ sub store ($$$) { #{{{
 						do => "recentchanges_link",
 						page => $_->{page}
 					).
-					"\">".
+					"\" rel=\"nofollow\">".
 					pagetitle($_->{page}).
 					"</a>"
 			}
diff --git a/debian/changelog b/debian/changelog
index 6c068806c..566dd1954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (2.69) UNRELEASED; urgency=low
     later parsing of any directives on the page.
   * Fix the link() pagespec to match links that are internally recorded as
     absolute.
+  * Add rel=nofollow to recentchanges_links for the same (weak) reasons it
+    was earlier added to edit links.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
 
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 61a54fded..0aebae61e 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -19,7 +19,7 @@
 <span class="desc"><br />Changed by:</span>
 <span class="committer">
 <TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR USER></a>
+<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
 <TMPL_ELSE>
 <TMPL_VAR USER>
 </TMPL_IF>
-- 
cgit v1.2.3


From f8a09ba105e0b58ec59fe4cd8d92a1577cce14d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 10 Nov 2008 19:48:58 -0500
Subject: tag: Normalize tagbase so leading/trailing slashes in it don't break
 things.

---
 IkiWiki/Plugin/tag.pm | 1 +
 debian/changelog      | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c4a175677..7977bbcf5 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -44,6 +44,7 @@ sub tagpage ($) { #{{{
 	if ($tag !~ m{^\.?/} &&
 	    defined $config{tagbase}) {
 		$tag="/".$config{tagbase}."/".$tag;
+		$tag=~y#/#/#s; # squash dups
 	}
 
 	return $tag;
diff --git a/debian/changelog b/debian/changelog
index 566dd1954..c97647948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (2.69) UNRELEASED; urgency=low
     absolute.
   * Add rel=nofollow to recentchanges_links for the same (weak) reasons it
     was earlier added to edit links.
+  * tag: Normalize tagbase so leading/trailing slashes in it don't break
+    things.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
 
-- 
cgit v1.2.3


From 53752bcb5d17ec51901ec926208793f9450b3243 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 10 Nov 2008 21:47:29 -0500
Subject: remove redundant link munge

This is not needed now that tagpage returns a page name starting with a
slash.

(Also fixes a minor bug that the edit links started with double slashes due
to the hack.)
---
 IkiWiki/Plugin/tag.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7977bbcf5..d725ef9b3 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -56,13 +56,7 @@ sub taglink ($$$;@) { #{{{
 	my $tag=shift;
 	my %opts=@_;
 
-	my $link=tagpage($tag);
-
-	# Force tag creation links to create the tag under /tagbase,
-	# if there is a tagbase and this tag used it.
-	$link="/".$link if $tag ne $link;
-
-	return htmllink($page, $destpage, $link, %opts);
+	return htmllink($page, $destpage, tagpage($tag), %opts);
 } #}}}
 
 sub preprocess_tag (@) { #{{{
-- 
cgit v1.2.3


From 6611f3a2d9eda262a07bb506b204e8bbf0728c38 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 11 Nov 2008 13:44:39 -0500
Subject: bzr: Fix dates for recentchanges.

---
 IkiWiki/Plugin/bzr.pm                                 | 2 +-
 debian/changelog                                      | 1 +
 doc/bugs/bzr_RecentChanges_dates_start_from_1969.mdwn | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 101e91b93..1054f5b3e 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -246,7 +246,7 @@ sub rcs_recentchanges ($) { #{{{
 			rev        => $info->{"revno"},
 			user       => $user,
 			committype => "bzr",
-			when       => time - str2time($info->{"timestamp"}),
+			when       => str2time($info->{"timestamp"}),
 			message    => [@message],
 			pages      => [@pages],
 		};
diff --git a/debian/changelog b/debian/changelog
index cc277beb3..dfc5de2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (2.69) UNRELEASED; urgency=low
     was earlier added to edit links.
   * tag: Normalize tagbase so leading/trailing slashes in it don't break
     things.
+  * bzr: Fix dates for recentchanges.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
 
diff --git a/doc/bugs/bzr_RecentChanges_dates_start_from_1969.mdwn b/doc/bugs/bzr_RecentChanges_dates_start_from_1969.mdwn
index 5c3d1bbd2..fa6e45b47 100644
--- a/doc/bugs/bzr_RecentChanges_dates_start_from_1969.mdwn
+++ b/doc/bugs/bzr_RecentChanges_dates_start_from_1969.mdwn
@@ -10,3 +10,7 @@ to
 `                        when       => str2time($info->{"timestamp"}),`
 
 fixed this for me.
+
+> Weird, I wonder why it was written to return an absolute time like that
+> in the first place? Can't have ever been right. Fixed, thanks. --[[Joey]]
+> [[done]]
-- 
cgit v1.2.3


From e7a840ed9a817cf4db59c90e680afd89e146b581 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 16 Nov 2008 18:11:39 +0000
Subject: htmlbalance: new plugin that balances tags by parsing and
 re-serializing

---
 IkiWiki/Plugin/htmlbalance.pm | 57 +++++++++++++++++++++++++++++++++++++++++++
 doc/plugins/aggregate.mdwn    |  6 ++---
 doc/plugins/htmlbalance.mdwn  |  9 +++++++
 doc/plugins/htmltidy.mdwn     |  3 ++-
 t/htmlbalance.t               | 13 ++++++++++
 5 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 IkiWiki/Plugin/htmlbalance.pm
 create mode 100644 doc/plugins/htmlbalance.mdwn
 create mode 100755 t/htmlbalance.t

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
new file mode 100644
index 000000000..667d73b6c
--- /dev/null
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::htmlbalance;
+
+# htmlbalance: Parse and re-serialize HTML to ensure balanced tags
+#
+# Copyright 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+# Licensed under the GNU GPL, version 2, or any later version published by the
+# Free Software Foundation
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub import { #{{{
+	hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);
+	hook(type => "sanitize", id => "htmlbalance", call => \&sanitize);
+} # }}}
+
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
+sub sanitize (@) { #{{{
+	my %params=@_;
+	my $ret = '';
+
+	eval {
+		use HTML::TreeBuilder;
+		use XML::Atom::Util qw(encode_xml);
+	};
+
+	if ($@) {
+		error($@);
+		return $params{content};
+	}
+
+	my $tree = HTML::TreeBuilder->new_from_content($params{content});
+	my @nodes = $tree->disembowel();
+	foreach my $node (@nodes) {
+		if (ref $node) {
+			$ret .= $node->as_XML();
+			chomp $ret;
+			$node->delete();
+		}
+		else {
+			$ret .= encode_xml($node);
+		}
+	}
+	$tree->delete();
+	return $ret;
+} # }}}
+
+1
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn
index c40a6dc22..6fc87853b 100644
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@ -9,9 +9,9 @@ New users of aggregate should enable the `aggregateinternal => 1` option in the
 .setup file. If you don't do so, you will need to enable the [[html]] plugin
 as well as aggregate itself, since feed entries will be stored as HTML.
 
-The [[meta]] and [[tag]] plugins are also recommended. The
-[[htmltidy]] plugin is suggested, since feeds can easily contain html
-problems, some of which tidy can fix.
+The [[meta]] and [[tag]] plugins are also recommended. Either the
+[[htmltidy]] or [[htmlbalance]] plugin is suggested, since feeds can easily
+contain html problems, some of which these plugins can fix.
 
 You will need to run ikiwiki periodically from a cron job, passing it the
 --aggregate parameter, to make it check for new posts. Here's an example
diff --git a/doc/plugins/htmlbalance.mdwn b/doc/plugins/htmlbalance.mdwn
new file mode 100644
index 000000000..7cdb1f950
--- /dev/null
+++ b/doc/plugins/htmlbalance.mdwn
@@ -0,0 +1,9 @@
+[[!template id=plugin name=htmlbalance author="Simon McVittie"]]
+[[!tag type/html]]
+
+This plugin ensures that the HTML emitted by ikiwiki contains well-balanced
+HTML tags, by parsing it with HTML::TreeBuilder and re-serializing it. This
+acts as a lighter-weight alternative to [[plugins/htmltidy]]; it doesn't
+ensure validity, but it does at least ensure that formatting from a
+blog post pulled in by \[[![[ikiwiki/directive/inline]]]] doesn't
+leak into the rest of the page.
diff --git a/doc/plugins/htmltidy.mdwn b/doc/plugins/htmltidy.mdwn
index f675a01ae..580e56f59 100644
--- a/doc/plugins/htmltidy.mdwn
+++ b/doc/plugins/htmltidy.mdwn
@@ -7,4 +7,5 @@ emitted by ikiwiki. Besides being nicely formatted, this helps ensure that
 even if users enter suboptimal html, your wiki generates valid html.
 
 Note that since tidy is an external program, that is run each time a page
-is built, this plugin will slow ikiwiki down somewhat.
+is built, this plugin will slow ikiwiki down somewhat. [[plugins/htmlbalance]]
+might provide a faster alternative.
diff --git a/t/htmlbalance.t b/t/htmlbalance.t
new file mode 100755
index 000000000..cd124e473
--- /dev/null
+++ b/t/htmlbalance.t
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 7;
+
+BEGIN { use_ok("IkiWiki::Plugin::htmlbalance"); }
+
+is(IkiWiki::Plugin::htmlbalance::sanitize(content => "<br></br>"), "<br />");
+is(IkiWiki::Plugin::htmlbalance::sanitize(content => "<div><p b=\"c\">hello world</div>"), "<div><p b=\"c\">hello world</p></div>");
+is(IkiWiki::Plugin::htmlbalance::sanitize(content => "<a></a></a>"), "<a></a>");
+is(IkiWiki::Plugin::htmlbalance::sanitize(content => "<b>foo <a</b>"), "<b>foo </b>");
+is(IkiWiki::Plugin::htmlbalance::sanitize(content => "<b> foo <a</a></b>"), "<b> foo </b>");
+is(IkiWiki::Plugin::htmlbalance::sanitize(content => "a>"), "a&gt;");
-- 
cgit v1.2.3


From e8a945845bd0774c2280da53f8a976c48547ede4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 17 Nov 2008 14:19:15 -0500
Subject: use perl modules up front

The old code actually did the same thing, just obfuscated -- since the eval
use wasn't quoted, it used the modules on load. Thus, the error (not to
mentioned the return) was bypassed, and it just failed on load.

But that seems like the right thing to do, really, so just made it clearer
that's what happens.
---
 IkiWiki/Plugin/htmlbalance.pm | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 667d73b6c..8f43d5dac 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -10,6 +10,8 @@ package IkiWiki::Plugin::htmlbalance;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use HTML::TreeBuilder;
+use XML::Atom::Util qw(encode_xml);
 
 sub import { #{{{
 	hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);
@@ -28,16 +30,6 @@ sub sanitize (@) { #{{{
 	my %params=@_;
 	my $ret = '';
 
-	eval {
-		use HTML::TreeBuilder;
-		use XML::Atom::Util qw(encode_xml);
-	};
-
-	if ($@) {
-		error($@);
-		return $params{content};
-	}
-
 	my $tree = HTML::TreeBuilder->new_from_content($params{content});
 	my @nodes = $tree->disembowel();
 	foreach my $node (@nodes) {
-- 
cgit v1.2.3


From 181bdbe1a9a8a1eb07259466361d98bdc1378499 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 17 Nov 2008 14:27:11 -0500
Subject: use HTML::Entities

---
 IkiWiki/Plugin/htmlbalance.pm           | 4 ++--
 doc/plugins/htmlbalance/discussion.mdwn | 2 ++
 t/htmlbalance.t                         | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 8f43d5dac..3a2d62d15 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -11,7 +11,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use HTML::TreeBuilder;
-use XML::Atom::Util qw(encode_xml);
+use HTML::Entities;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);
@@ -39,7 +39,7 @@ sub sanitize (@) { #{{{
 			$node->delete();
 		}
 		else {
-			$ret .= encode_xml($node);
+			$ret .= encode_entities($node);
 		}
 	}
 	$tree->delete();
diff --git a/doc/plugins/htmlbalance/discussion.mdwn b/doc/plugins/htmlbalance/discussion.mdwn
index bad052f1c..c66528a4f 100644
--- a/doc/plugins/htmlbalance/discussion.mdwn
+++ b/doc/plugins/htmlbalance/discussion.mdwn
@@ -2,6 +2,8 @@ Would it be possible to use [[!cpan HTML::Entities]] rather than
 `XML::Atom::Util` for encoding entities? The former is already an ikiwiki
 dependency (via [[!cpan HTML::Parser]]).
 
+> Now switched to HTML::Entities --[[Joey]]
+
 I also wonder if there's any benefit to using this plugin aside from with
 aggregate. Perhaps a small one but aggregate seems like the main case..
 wondering if it would be better to just have aggregate balanace the html
diff --git a/t/htmlbalance.t b/t/htmlbalance.t
index 783ed9841..e5a5db0ee 100755
--- a/t/htmlbalance.t
+++ b/t/htmlbalance.t
@@ -5,10 +5,9 @@ use strict;
 BEGIN {
 	eval q{
 		use HTML::TreeBuilder;
-		use XML::Atom::Util qw(encode_xml);
 	};
 	if ($@) {
-		eval q{use Test::More skip_all => "HTML::TreeBuilder or XML::Atom::Util not available"};
+		eval q{use Test::More skip_all => "HTML::TreeBuilder not available"};
 	}
 	else {
 		eval q{use Test::More tests => 7};
-- 
cgit v1.2.3


From 75f262f44dc1b192644252171e77cab90cc7322c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 17 Nov 2008 15:56:15 -0500
Subject: call decode_utf8 inside eval

holger reported that decode_utf8 was crashing with perl 5.8.8. Earlier, I
thought that passing 0 to the function avoided this with old perls, but
that was apparently not enough, it still crashes. So, put it inside the
eval, so we can at least recover from it crashing.
---
 IkiWiki/Plugin/aggregate.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c9c2880c5..f256b3ac1 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -496,15 +496,19 @@ sub aggregate (@) { #{{{
 			# that contains invalid UTF-8 sequences. Convert
 			# feed to ascii to try to work around.
 			$feed->{message}.=" ".sprintf(gettext("(invalid UTF-8 stripped from feed)"));
-			$content=Encode::decode_utf8($content, 0);
-			$f=eval{XML::Feed->parse(\$content)};
+			$f=eval {
+				$content=Encode::decode_utf8($content, 0);
+				XML::Feed->parse(\$content)
+			};
 		}
 		if ($@) {
 			# Another possibility is badly escaped entities.
 			$feed->{message}.=" ".sprintf(gettext("(feed entities escaped)"));
 			$content=~s/\&(?!amp)(\w+);/&amp;$1;/g;
-			$content=Encode::decode_utf8($content, 0);
-			$f=eval{XML::Feed->parse(\$content)};
+			$f=eval {
+				$content=Encode::decode_utf8($content, 0);
+				XML::Feed->parse(\$content)
+			};
 		}
 		if ($@) {
 			$feed->{message}=gettext("feed crashed XML::Feed!")." ($@)";
-- 
cgit v1.2.3


From 15269fed646bf14692061e634969c98b614daaad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 18 Nov 2008 02:43:17 -0500
Subject: improve escaping of wikilinks and preprocessor directives

The old method failed for '[' x 3.
---
 IkiWiki/Plugin/aggregate.pm         | 8 +++-----
 IkiWiki/Plugin/recentchanges.pm     | 3 ++-
 IkiWiki/Plugin/recentchangesdiff.pm | 3 ++-
 debian/changelog                    | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index f256b3ac1..6cdbbc0e9 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -610,7 +610,7 @@ sub add_page (@) { #{{{
 	my $template=template($feed->{template}, blind_cache => 1);
 	$template->param(title => $params{title})
 		if defined $params{title} && length($params{title});
-	$template->param(content => htmlescape(htmlabs($params{content},
+	$template->param(content => wikiescape(htmlabs($params{content},
 		defined $params{base} ? $params{base} : $feed->{feedurl})));
 	$template->param(name => $feed->{name});
 	$template->param(url => $feed->{url});
@@ -637,11 +637,9 @@ sub add_page (@) { #{{{
 	}
 } #}}}
 
-sub htmlescape ($) { #{{{
+sub wikiescape ($) { #{{{
 	# escape accidental wikilinks and preprocessor stuff
-	my $html=shift;
-	$html=~s/(?<!\\)\[\[/\\\[\[/g;
-	return $html;
+	return encode_entities(shift, '\[\]');
 } #}}}
 
 sub urlabs ($$) { #{{{
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 3f70664ac..39a123ccf 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -5,6 +5,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use Encode;
+use HTML::Entities;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
@@ -163,7 +164,7 @@ sub store ($$$) { #{{{
 	if (ref $change->{message}) {
 		foreach my $field (@{$change->{message}}) {
 			if (exists $field->{line}) {
-				$field->{line} =~ s/(?<!\\)\[\[/\\\[\[/g;
+				$field->{line} = encode_entities($field->{line}, '\[\]');
 			}
 		}
 	}
diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index 36acef72e..bc793bada 100644
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -4,6 +4,7 @@ package IkiWiki::Plugin::recentchangesdiff;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use HTML::Entities;
 
 my $maxlines=200;
 
@@ -39,7 +40,7 @@ sub pagetemplate (@) { #{{{
 				$diff=join("", @lines);
 			}
 			# escape links and preprocessor stuff
-			$diff =~ s/(?<!\\)\[\[/\\\[\[/g;
+			$diff = encode_entities($diff, '\[\]');
 			$template->param(diff => $diff);
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index 294cae6dc..eeb9fe6ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * htmlbalance: New plugin contributed by Simon McVittie.
   * Change deb dependencies to list Text::Markdown before markdown (really
     this time).
+  * Improve escaping of wikilinks and preprocessor directives in content
+    produced by aggregate and recentchanges.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
-- 
cgit v1.2.3


From e307eeda3d55446f4bdeb2ac48f4fef0c24b1f3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 18 Nov 2008 02:48:24 -0500
Subject: html escaping complication

Can't escape things to entities if the template then escapes the entities.
(aggregate doesn't have this problem.)
---
 IkiWiki/Plugin/recentchanges.pm     | 4 +++-
 IkiWiki/Plugin/recentchangesdiff.pm | 2 ++
 templates/change.tmpl               | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 39a123ccf..4d7023c1c 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -160,10 +160,12 @@ sub store ($$$) { #{{{
 		);
 	}
 
-	# escape wikilinks and preprocessor stuff in commit messages
 	if (ref $change->{message}) {
 		foreach my $field (@{$change->{message}}) {
 			if (exists $field->{line}) {
+				# escape html
+				$field->{line} = encode_entities($field->{line});
+				# escape links and preprocessor stuff
 				$field->{line} = encode_entities($field->{line}, '\[\]');
 			}
 		}
diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index bc793bada..08cec3f5a 100644
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -39,6 +39,8 @@ sub pagetemplate (@) { #{{{
 			else {
 				$diff=join("", @lines);
 			}
+			# escape html
+			$diff = encode_entities($diff);
 			# escape links and preprocessor stuff
 			$diff = encode_entities($diff, '\[\]');
 			$template->param(diff => $diff);
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 0aebae61e..0e61a80f4 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -32,14 +32,14 @@
 <div class=changelog>
 <TMPL_LOOP NAME="MESSAGE">
 <TMPL_IF NAME="LINE">
-<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
+<TMPL_VAR NAME="LINE"><br />
 </TMPL_IF>
 </TMPL_LOOP>
 </div>
 <TMPL_IF NAME="DIFF">
 <div class=diff>
 <pre>
-<TMPL_VAR NAME="DIFF" ESCAPE="HTML">
+<TMPL_VAR NAME="DIFF">
 </pre>
 </div>
 </TMPL_IF>
-- 
cgit v1.2.3


From a990afd2f735381c81684c8faac011bbdafd09ee Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 18 Nov 2008 13:46:03 -0500
Subject: avoid uninitialized value warning

---
 IkiWiki/Plugin/aggregate.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 6cdbbc0e9..adaa619ab 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -535,7 +535,7 @@ sub aggregate (@) { #{{{
 				copyright => $f->copyright,
 				title => defined $entry->title ? decode_entities($entry->title) : "untitled",
 				link => $entry->link,
-				content => defined $c ? $c->body : "",
+				content => (defined $c && defined $c->body) ? $c->body : "",
 				guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
 				ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
 				base => (defined $c && $c->can("base")) ? $c->base : undef,
-- 
cgit v1.2.3


From 38f5e3ba6944ab67bff87fdbb2cc50606b806085 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 11 Dec 2008 13:50:51 -0500
Subject: move feedpages application up

I wanted this nearer to the top, but decided to put it after the
add_depends. Reasoning: It's possible with a combinaton of feedpages and
show options to make @list and @feedlist contain completly differing sets
of pages. We want to add_depends all pages in both sets. We could combine
the two lists and add_depends that, but it's slightly more efficient to
defer reducing @feedlist, and add_depends whichever list is longer.
---
 IkiWiki/Plugin/inline.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 7fe5a4dcf..0c8f50384 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -232,6 +232,10 @@ sub preprocess_inline (@) { #{{{
 	# that if they are removed or otherwise changed, the inline will be
 	# sure to be updated.
 	add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
+	
+	if ($feeds && exists $params{feedpages}) {
+		@feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
+	}
 
 	my $feednum="";
 
@@ -364,10 +368,6 @@ sub preprocess_inline (@) { #{{{
 	}
 	
 	if ($feeds) {
-		if (exists $params{feedpages}) {
-			@feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
-		}
-	
 		if ($rss) {
 			my $rssp=rsspage($params{destpage}).$feednum;
 			will_render($params{destpage}, $rssp);
-- 
cgit v1.2.3


From 63eb9d834e2f7e08535473934e169cfe7d7debe6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 11 Dec 2008 14:04:38 -0500
Subject: inline: Support emptyfeeds=no option to skip generating empty feeds.

---
 IkiWiki/Plugin/inline.pm                                | 10 ++++++++--
 debian/changelog                                        |  1 +
 doc/ikiwiki/directive/inline.mdwn                       |  4 +++-
 doc/todo/inline_plugin:_hide_feed_buttons_if_empty.mdwn |  3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 0c8f50384..5e4df95f4 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -161,6 +161,7 @@ sub preprocess_inline (@) { #{{{
 	my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
 	my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
 	my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
+	my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1;
 	my $feedonly=yesno($params{feedonly});
 	if (! exists $params{show} && ! $archive) {
 		$params{show}=10;
@@ -289,8 +290,13 @@ sub preprocess_inline (@) { #{{{
 				gettext("Add a new post titled:"));
 		}
 		$ret.=$formtemplate->output;
+	    	
+		# The post form includes the feed buttons, so
+		# emptyfeeds cannot be hidden.
+		$emptyfeeds=1;
 	}
-	elsif ($feeds && !$params{preview}) {
+	elsif ($feeds && !$params{preview} &&
+	       ! (! $emptyfeeds && ! @feedlist)) {
 		# Add feed buttons.
 		my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
 		$linktemplate->param(rssurl => $rssurl) if $rss;
@@ -367,7 +373,7 @@ sub preprocess_inline (@) { #{{{
 		}
 	}
 	
-	if ($feeds) {
+	if ($feeds && ! (! $emptyfeeds && ! @feedlist)) {
 		if ($rss) {
 			my $rssp=rsspage($params{destpage}).$feednum;
 			will_render($params{destpage}, $rssp);
diff --git a/debian/changelog b/debian/changelog
index 8d2b6661f..7f6844366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * Fix handling of wrappergroup option.
   * Correct --dumpsetup to include the srcdir in the setup file.
   * German translation update from Kai Wasserbäch. Closes: #507056
+  * inline: Support emptyfeeds=no option to skip generating empty feeds.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index 9889cda11..82b532e0c 100644
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -73,6 +73,8 @@ Here are some less often needed parameters:
   configured to `allowatom`, set to "yes" to enable.
 * `feeds` - controls generation of all types of feeds. Set to "no" to
   disable generating any feeds.
+* `emptyfeeds` - Set to "no" to disable generation of empty feeds.
+  Has no effect if `rootpage` or `postform` is set.
 * `template` - Specifies the template to fill out to display each inlined
   page. By default the `inlinepage` template is used, while
   the `archivepage` template is used for archives. Set this parameter to
@@ -97,7 +99,7 @@ Here are some less often needed parameters:
   in the blog. The format string is passed to the strftime(3) function.
 * `feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom
   feeds. The default is the same as the `pages` value above, and only pages
-  matches by that value are included, but some of those can be excluded by
+  matched by that value are included, but some of those can be excluded by
   specifying a tighter [[PageSpec]] here.
 * `guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`),
   the Atom feed will have this as its `<id>`. The default is to use the URL
diff --git a/doc/todo/inline_plugin:_hide_feed_buttons_if_empty.mdwn b/doc/todo/inline_plugin:_hide_feed_buttons_if_empty.mdwn
index f998d5654..d046c0cd0 100644
--- a/doc/todo/inline_plugin:_hide_feed_buttons_if_empty.mdwn
+++ b/doc/todo/inline_plugin:_hide_feed_buttons_if_empty.mdwn
@@ -2,3 +2,6 @@
                drop the rss/atom buttons for comments when there are none yet
 
 This seems to me like something that applies to the [[plugins/inline]] plugin in general, rather than the [[plugins/contrib/comments]] plugin specifically. --[[smcv]]
+
+>> [[done]] as emptyfeeds option, not on by default for inline, but I think
+>> it should be for comments --[[Joey]]
-- 
cgit v1.2.3


From b67632cdcdd333cf0a88d03c0f7e6e62921f32c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 11 Dec 2008 15:01:26 -0500
Subject: inline: Support feedfile option to change the filename of the feed
 generated.

---
 IkiWiki.pm                                         |  8 ++-
 IkiWiki/Plugin/inline.pm                           | 63 ++++++++++--------
 debian/changelog                                   |  2 +
 doc/ikiwiki/directive/inline.mdwn                  |  5 ++
 doc/plugins/write.mdwn                             |  6 +-
 ...line_plugin:_ability_to_override_feed_name.mdwn |  2 +
 po/de.po                                           | 74 +++++++++++-----------
 po/fr.po                                           | 71 +++++++++++----------
 po/ikiwiki.pot                                     | 52 +++++++--------
 9 files changed, 156 insertions(+), 127 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2ad2f792d..1c68c2cb3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -666,11 +666,15 @@ sub newpagefile ($$) { #{{{
 	}
 } #}}}
 
-sub targetpage ($$) { #{{{
+sub targetpage ($$;$) { #{{{
 	my $page=shift;
 	my $ext=shift;
+	my $filename=shift;
 	
-	if (! $config{usedirs} || $page eq 'index') {
+	if (defined $filename) {
+		return $page."/".$filename.".".$ext;
+	}
+	elsif (! $config{usedirs} || $page eq 'index') {
 		return $page.".".$ext;
 	}
 	else {
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5e4df95f4..17cc46e0e 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -26,8 +26,7 @@ sub import { #{{{
 	# Hook to change to do pinging since it's called late.
 	# This ensures each page only pings once and prevents slow
 	# pings interrupting page builds.
-	hook(type => "change", id => "inline", 
-		call => \&IkiWiki::pingurl);
+	hook(type => "change", id => "inline", call => \&IkiWiki::pingurl);
 } # }}}
 
 sub getopt () { #{{{
@@ -238,28 +237,46 @@ sub preprocess_inline (@) { #{{{
 		@feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
 	}
 
-	my $feednum="";
-
-	my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
-	if (exists $knownfeeds{$feedid}) {
-		$feednum=$knownfeeds{$feedid};
-	}
-	else {
-		if (exists $page_numfeeds{$params{destpage}}) {
-			if ($feeds) {
-				$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+	my ($feedbase, $feednum);
+	if ($feeds) {
+		# Ensure that multiple feeds on a page go to unique files.
+		
+		# Feedfile can lead to conflicts if usedirs is not enabled,
+		# so avoid supporting it in that case.
+		delete $params{feedfile} if ! $config{usedirs};
+		# Tight limits on legal feedfiles, to avoid security issues
+		# and conflicts.
+		if (defined $params{feedfile}) {
+			if ($params{feedfile} =~ /\// ||
+			    $params{feedfile} !~ /$config{wiki_file_regexp}/) {
+				error("illegal feedfile");
 			}
+			$params{feedfile}=possibly_foolish_untaint($params{feedfile});
+		}
+		$feedbase=targetpage($params{destpage}, "", $params{feedfile});
+
+		my $feedid=join("\0", $feedbase, map { $_."\0".$params{$_} } sort keys %params);
+		if (exists $knownfeeds{$feedid}) {
+			$feednum=$knownfeeds{$feedid};
 		}
 		else {
-			$feednum=$knownfeeds{$feedid}="";
-			if ($feeds) {
-				$page_numfeeds{$params{destpage}}=1;
+			if (exists $page_numfeeds{$params{destpage}}{$feedbase}) {
+				if ($feeds) {
+					$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}}{$feedbase};
+				}
+			}
+			else {
+				$feednum=$knownfeeds{$feedid}="";
+				if ($feeds) {
+					$page_numfeeds{$params{destpage}}{$feedbase}=1;
+				}
 			}
 		}
 	}
 
-	my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
-	my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
+	my $rssurl=basename($feedbase."rss".$feednum) if $feeds && $rss;
+	my $atomurl=basename($feedbase."atom".$feednum) if $feeds && $atom;
+
 	my $ret="";
 
 	if (length $config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
@@ -375,7 +392,7 @@ sub preprocess_inline (@) { #{{{
 	
 	if ($feeds && ! (! $emptyfeeds && ! @feedlist)) {
 		if ($rss) {
-			my $rssp=rsspage($params{destpage}).$feednum;
+			my $rssp=$feedbase."rss".$feednum;
 			will_render($params{destpage}, $rssp);
 			if (! $params{preview}) {
 				writefile($rssp, $config{destdir},
@@ -386,7 +403,7 @@ sub preprocess_inline (@) { #{{{
 			}
 		}
 		if ($atom) {
-			my $atomp=atompage($params{destpage}).$feednum;
+			my $atomp=$feedbase."atom".$feednum;
 			will_render($params{destpage}, $atomp);
 			if (! $params{preview}) {
 				writefile($atomp, $config{destdir},
@@ -475,14 +492,6 @@ sub absolute_urls ($$) { #{{{
 	return $content;
 } #}}}
 
-sub rsspage ($) { #{{{
-	return targetpage(shift, "rss");
-} #}}}
-
-sub atompage ($) { #{{{
-	return targetpage(shift, "atom");
-} #}}}
-
 sub genfeed ($$$$$@) { #{{{
 	my $feedtype=shift;
 	my $feedurl=shift;
diff --git a/debian/changelog b/debian/changelog
index 7f6844366..1ff78d749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * Correct --dumpsetup to include the srcdir in the setup file.
   * German translation update from Kai Wasserbäch. Closes: #507056
   * inline: Support emptyfeeds=no option to skip generating empty feeds.
+  * inline: Support feedfile option to change the filename of the feed
+    generated.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index 82b532e0c..40670e1e7 100644
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -104,6 +104,11 @@ Here are some less often needed parameters:
 * `guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`),
   the Atom feed will have this as its `<id>`. The default is to use the URL
   of the page containing the `inline` directive.
+* `feedfile` - Can be used to change the name of the file generated for the
+  feed. This is particularly useful if a page contains multiple feeds.
+  For example, set "feedfile=feed" to cause it to generate `page/feed.atom`
+  and/or `page/feed.rss`. This option is not supported if the wiki is
+  configured not to use `usedirs`.
 
 [[!meta robots="noindex, follow"]]
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index abcabbdc3..b6fa96f91 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -696,11 +696,15 @@ This can be called when creating a new page, to determine what filename
 to save the page to. It's passed a page name, and its type, and returns
 the name of the file to create, relative to the srcdir.
 
-#### `targetpage($$)`
+#### `targetpage($$;$)`
 
 Passed a page and an extension, returns the filename that page will be
 rendered to.
 
+Optionally, a third parameter can be passed, to specify the preferred
+filename of the page. For example, `targetpage("foo", "rss", "feed")`
+will yield something like `foo/feed.rss`.
+
 ## Miscellaneous
 
 ### Internal use pages
diff --git a/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn b/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn
index 71bc3bdd6..df5bf9194 100644
--- a/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn
+++ b/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn
@@ -25,3 +25,5 @@ could perhaps change it to `/sandbox-comments.atom` or
 > Particularly for the non-usedirs case, where a page `sandbox/comments`
 > would produce the same feed as sandbox with `feedname=comments`.
 > --[[Joey]]
+
+> [[done]] as feedfile option --[[Joey]]
diff --git a/po/de.po b/po/de.po
index 55234a909..d49d0c6ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.70\n"
-"Report-Msgid-Bugs-To: ikiwiki@packages.debian.org\n"
-"POT-Creation-Date: 2008-10-31 16:37-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-12-11 14:46-0500\n"
 "PO-Revision-Date: 2008-11-20 19:58+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -47,7 +47,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Fehler"
 
@@ -110,16 +110,16 @@ msgstr "Feed nicht gefunden"
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(ungültiges UTF-8-Zeichen wurde aus dem Feed entfernt)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:506
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(Feed-Entitäten maskiert)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:510
+#: ../IkiWiki/Plugin/aggregate.pm:514
 msgid "feed crashed XML::Feed!"
 msgstr "Feed führte zum Absturz von XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:590
+#: ../IkiWiki/Plugin/aggregate.pm:595
 #, perl-format
 msgid "creating new page %s"
 msgstr "erstelle neue Seite %s"
@@ -128,7 +128,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "Lösche Bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:208
 msgid "done"
 msgstr "fertig"
 
@@ -171,7 +171,7 @@ msgid "automatic index generation"
 msgstr "automatische Index-Erstellung"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:344 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
@@ -245,11 +245,11 @@ msgstr "»edittemplate« %s registriert für %s"
 msgid "failed to process"
 msgstr "Bearbeitung fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/format.pm:22
+#: ../IkiWiki/Plugin/format.pm:20
 msgid "must specify format and text"
 msgstr "Format und Text muss spezifiziert werden"
 
-#: ../IkiWiki/Plugin/format.pm:25
+#: ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nicht unterstütztes Seitenformat %s"
@@ -276,7 +276,8 @@ msgstr "Es ist Ihnen nicht erlaubt, Dateizugriffsrechte zu ändern"
 #: ../IkiWiki/Plugin/google.pm:27
 #, perl-format
 msgid "Must specify %s when using the google search plugin"
-msgstr "%s muss angegeben werden, wenn die Google-Sucherweiterung verwandt wird"
+msgstr ""
+"%s muss angegeben werden, wenn die Google-Sucherweiterung verwandt wird"
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
@@ -320,17 +321,17 @@ msgstr "Größenänderung fehlgeschlagen: %s"
 msgid "failed to determine size of image %s"
 msgstr "Größe des Bildes %s konnte nicht festgestellt werden."
 
-#: ../IkiWiki/Plugin/inline.pm:93
+#: ../IkiWiki/Plugin/inline.pm:92
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Die URL zum Wiki muss mit --url angegeben werden, wenn --rss oder --atom "
 "genutzt wird"
 
-#: ../IkiWiki/Plugin/inline.pm:139
+#: ../IkiWiki/Plugin/inline.pm:138
 msgid "page editing not allowed"
 msgstr "Seitenbearbeitungen sind nicht erlaubt"
 
-#: ../IkiWiki/Plugin/inline.pm:156
+#: ../IkiWiki/Plugin/inline.pm:155
 msgid "missing pages parameter"
 msgstr "Fehlender Seitenparameter"
 
@@ -339,20 +340,20 @@ msgstr "Fehlender Seitenparameter"
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki/Plugin/inline.pm:285
+#: ../IkiWiki/Plugin/inline.pm:297
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:301
+#: ../IkiWiki/Plugin/inline.pm:318
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:352 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki/Plugin/inline.pm:572
+#: ../IkiWiki/Plugin/inline.pm:577
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
@@ -568,20 +569,18 @@ msgstr "Unzulässiger Prozentwert (%s)"
 
 #: ../IkiWiki/Plugin/progress.pm:59
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
-msgstr ""
-"Benötige entweder »percent«- oder »totalpages«- und "
-"»donepages«-Parameter"
+msgstr "Benötige entweder »percent«- oder »totalpages«- und »donepages«-Parameter"
 
-#: ../IkiWiki/Plugin/recentchanges.pm:100
+#: ../IkiWiki/Plugin/recentchanges.pm:101
 msgid "missing page"
 msgstr "fehlende Seite"
 
-#: ../IkiWiki/Plugin/recentchanges.pm:102
+#: ../IkiWiki/Plugin/recentchanges.pm:103
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Die Seite %s existiert nicht."
 
-#: ../IkiWiki/Plugin/recentchangesdiff.pm:36
+#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
 msgstr "(Diff beschnitten)"
 
@@ -593,7 +592,8 @@ msgstr "%s existiert nicht"
 #: ../IkiWiki/Plugin/remove.pm:38
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
-msgstr "%s ist nicht im Quellverzeichnis und kann deshalb nicht gelöscht werden"
+msgstr ""
+"%s ist nicht im Quellverzeichnis und kann deshalb nicht gelöscht werden"
 
 #: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
 #, perl-format
@@ -928,19 +928,19 @@ msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:79
+#: ../IkiWiki/Wrapper.pm:97
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "Schreiben von %s fehlgeschlagen: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:135
+#: ../IkiWiki/Wrapper.pm:154
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:155
+#: ../IkiWiki/Wrapper.pm:174
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -953,43 +953,43 @@ msgstr "Benutzung: ikiwiki [Optionen] Quelle Ziel"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup Konfigurationsdatei "
 
-#: ../ikiwiki.in:90
+#: ../ikiwiki.in:91
 msgid "usage: --set var=value"
 msgstr "Benutzung: --set Variable=Wert"
 
-#: ../ikiwiki.in:138
+#: ../ikiwiki.in:139
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper..."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:197
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:200
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki..."
 
-#: ../IkiWiki.pm:466
+#: ../IkiWiki.pm:480
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:512
+#: ../IkiWiki.pm:526
 msgid "cannot use multiple rcs plugins"
 msgstr "Kann nicht mehrere Versionskontrollsystem-Erweiterungen verwenden"
 
-#: ../IkiWiki.pm:541
+#: ../IkiWiki.pm:555
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1165
+#: ../IkiWiki.pm:1187
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1678
+#: ../IkiWiki.pm:1688
 msgid "yes"
 msgstr "ja"
 
diff --git a/po/fr.po b/po/fr.po
index b8e84f930..ebc21fd9a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.70 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-31 16:37-0400\n"
+"POT-Creation-Date: 2008-12-11 14:46-0500\n"
 "PO-Revision-Date: 2008-11-19 21:53+0100\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -49,7 +49,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Erreur"
 
@@ -112,16 +112,16 @@ msgstr "Flux introuvable "
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(chaîne UTF-8 non valable supprimée du flux)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:506
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(échappement des entités de flux)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:510
+#: ../IkiWiki/Plugin/aggregate.pm:514
 msgid "feed crashed XML::Feed!"
 msgstr "Plantage du flux XML::Feed !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:590
+#: ../IkiWiki/Plugin/aggregate.pm:595
 #, perl-format
 msgid "creating new page %s"
 msgstr "Création de la nouvelle page %s"
@@ -130,7 +130,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:208
 msgid "done"
 msgstr "Terminé"
 
@@ -173,7 +173,7 @@ msgid "automatic index generation"
 msgstr "génération de l'index automatique"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:344 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
@@ -247,11 +247,11 @@ msgstr "edittemplate %s enregistré pour %s"
 msgid "failed to process"
 msgstr "Échec du traitement"
 
-#: ../IkiWiki/Plugin/format.pm:22
+#: ../IkiWiki/Plugin/format.pm:20
 msgid "must specify format and text"
 msgstr "le format et le texte doivent être indiqués"
 
-#: ../IkiWiki/Plugin/format.pm:25
+#: ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "format de page non reconnu %s"
@@ -321,17 +321,17 @@ msgstr "Échec du redimensionnement : %s"
 msgid "failed to determine size of image %s"
 msgstr "Échec de la détermination de la taille de l'image : %s"
 
-#: ../IkiWiki/Plugin/inline.pm:93
+#: ../IkiWiki/Plugin/inline.pm:92
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss "
 "ou --atom"
 
-#: ../IkiWiki/Plugin/inline.pm:139
+#: ../IkiWiki/Plugin/inline.pm:138
 msgid "page editing not allowed"
 msgstr "Modification de page interdite"
 
-#: ../IkiWiki/Plugin/inline.pm:156
+#: ../IkiWiki/Plugin/inline.pm:155
 msgid "missing pages parameter"
 msgstr "paramètre « pages » manquant"
 
@@ -340,20 +340,20 @@ msgstr "paramètre « pages » manquant"
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki/Plugin/inline.pm:285
+#: ../IkiWiki/Plugin/inline.pm:297
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:301
+#: ../IkiWiki/Plugin/inline.pm:318
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "Le modèle de page %s n'existe pas"
 
-#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:352 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki/Plugin/inline.pm:572
+#: ../IkiWiki/Plugin/inline.pm:577
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -573,16 +573,16 @@ msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 "L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
 
-#: ../IkiWiki/Plugin/recentchanges.pm:100
+#: ../IkiWiki/Plugin/recentchanges.pm:101
 msgid "missing page"
 msgstr "Page manquante"
 
-#: ../IkiWiki/Plugin/recentchanges.pm:102
+#: ../IkiWiki/Plugin/recentchanges.pm:103
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
 
-#: ../IkiWiki/Plugin/recentchangesdiff.pm:36
+#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
 msgstr "(fichier de différences tronqué)"
 
@@ -820,12 +820,14 @@ msgstr ""
 #: ../IkiWiki/Plugin/websetup.pm:433
 #, perl-format
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
-msgstr "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero (%s)"
+msgstr ""
+"<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero (%s)"
 
 #: ../IkiWiki/Receive.pm:35
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
-msgstr "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)"
+msgstr ""
+"Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)"
 
 #: ../IkiWiki/Receive.pm:85
 #, perl-format
@@ -929,19 +931,19 @@ msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:79
+#: ../IkiWiki/Wrapper.pm:97
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "Échec de l'écriture de %s : %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:135
+#: ../IkiWiki/Wrapper.pm:154
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:155
+#: ../IkiWiki/Wrapper.pm:174
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -954,41 +956,42 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup fichier de configuration"
 
-#: ../ikiwiki.in:90
+#: ../ikiwiki.in:91
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:138
+#: ../ikiwiki.in:139
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:197
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:200
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:466
+#: ../IkiWiki.pm:480
 msgid "Must specify url to wiki with --url when using --cgi"
-msgstr "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
+msgstr ""
+"Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:512
+#: ../IkiWiki.pm:526
 msgid "cannot use multiple rcs plugins"
 msgstr "impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:541
+#: ../IkiWiki.pm:555
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1165
+#: ../IkiWiki.pm:1187
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "une boucle de pré traitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1678
+#: ../IkiWiki.pm:1688
 msgid "yes"
 msgstr "oui"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index feb36c742..11c865363 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 20:48-0500\n"
+"POT-Creation-Date: 2008-12-11 14:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1189
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr ""
 
@@ -111,16 +111,16 @@ msgstr ""
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:506
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:510
+#: ../IkiWiki/Plugin/aggregate.pm:514
 msgid "feed crashed XML::Feed!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:591
+#: ../IkiWiki/Plugin/aggregate.pm:595
 #, perl-format
 msgid "creating new page %s"
 msgstr ""
@@ -129,7 +129,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:208
 msgid "done"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgid "automatic index generation"
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:344 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
@@ -320,15 +320,15 @@ msgstr ""
 msgid "failed to determine size of image %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:93
+#: ../IkiWiki/Plugin/inline.pm:92
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:139
+#: ../IkiWiki/Plugin/inline.pm:138
 msgid "page editing not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:156
+#: ../IkiWiki/Plugin/inline.pm:155
 msgid "missing pages parameter"
 msgstr ""
 
@@ -337,20 +337,20 @@ msgstr ""
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:285
+#: ../IkiWiki/Plugin/inline.pm:297
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:301
+#: ../IkiWiki/Plugin/inline.pm:318
 #, perl-format
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:352 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:572
+#: ../IkiWiki/Plugin/inline.pm:577
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -563,16 +563,16 @@ msgstr ""
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
-#: ../IkiWiki/Plugin/recentchanges.pm:100
+#: ../IkiWiki/Plugin/recentchanges.pm:101
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/recentchanges.pm:102
+#: ../IkiWiki/Plugin/recentchanges.pm:103
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/recentchangesdiff.pm:36
+#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
 msgstr ""
 
@@ -935,41 +935,41 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:90
+#: ../ikiwiki.in:91
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:138
+#: ../ikiwiki.in:139
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:195
+#: ../ikiwiki.in:197
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:198
+#: ../ikiwiki.in:200
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:473
+#: ../IkiWiki.pm:480
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:519
+#: ../IkiWiki.pm:526
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:548
+#: ../IkiWiki.pm:555
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1172
+#: ../IkiWiki.pm:1187
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1673
+#: ../IkiWiki.pm:1688
 msgid "yes"
 msgstr ""
 
-- 
cgit v1.2.3


From f77f7a02a6f235e02c4729f6f56e7c43bd8a33fb Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Sep 2008 19:33:45 +0100
Subject: Add initial version of a postcomment plugin (temporarily namespaced
 as smcvpostcomment)

---
 IkiWiki/Plugin/smcvpostcomment.pm      | 299 +++++++++++++++++++++++++++++++++
 templates/smcvpostcomment_comment.tmpl |  10 ++
 templates/smcvpostcomment_display.tmpl |  24 +++
 templates/smcvpostcomment_embed.tmpl   |  11 ++
 templates/smcvpostcomment_form.tmpl    |  20 +++
 5 files changed, 364 insertions(+)
 create mode 100644 IkiWiki/Plugin/smcvpostcomment.pm
 create mode 100644 templates/smcvpostcomment_comment.tmpl
 create mode 100644 templates/smcvpostcomment_display.tmpl
 create mode 100644 templates/smcvpostcomment_embed.tmpl
 create mode 100644 templates/smcvpostcomment_form.tmpl

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
new file mode 100644
index 000000000..cb55ff94f
--- /dev/null
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -0,0 +1,299 @@
+#!/usr/bin/perl
+# Copyright © 2006-2008 Joey Hess <joey@ikiwiki.info>
+# Copyright © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+# Licensed under the GNU GPL, version 2, or any later version published by the
+# Free Software Foundation
+package IkiWiki::Plugin::smcvpostcomment;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+use IkiWiki::Plugin::mdwn;
+use CGI 'escapeHTML';
+
+use constant PLUGIN => "smcvpostcomment";
+use constant PREVIEW => "Preview";
+use constant POST_COMMENT => "Post comment";
+use constant CANCEL => "Cancel";
+
+sub import { #{{{
+	hook(type => "getsetup", id => PLUGIN,  call => \&getsetup);
+	hook(type => "preprocess", id => PLUGIN, call => \&preprocess);
+	hook(type => "sessioncgi", id => PLUGIN, call => \&sessioncgi);
+	hook(type => "htmlize", id => "_".PLUGIN,
+		call => \&IkiWiki::Plugin::mdwn::htmlize);
+	IkiWiki::loadplugin("inline");
+} # }}}
+
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
+# Somewhat based on IkiWiki::Plugin::inline blog posting support
+sub preprocess (@) { #{{{
+	my %params=@_;
+
+	unless (length $config{cgiurl}) {
+		error("this plugin makes no sense if you have no CGI");
+	}
+
+	my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
+		blind_cache => 1);
+	$formtemplate->param(cgiurl => $config{cgiurl});
+	$formtemplate->param(page => $params{page});
+
+	if ($params{preview}) {
+		$formtemplate->param("disabled" =>
+			'not available during Preview');
+	}
+
+	debug("page $params{page} => destpage $params{page}");
+
+	# I'm reasonably sure that this counts as abuse of [[!inline]]
+	return $formtemplate->output . "\n" .
+		IkiWiki::preprocess_inline(
+			pages => "internal(/$params{page}/comment_*)",
+			template => PLUGIN . "_display",
+			show => 0,
+			reverse => "yes",
+			page => $params{page},
+			destpage => $params{destpage},
+			preview => $params{preview});
+} # }}}
+
+# FIXME: logic taken from editpage, should be common code?
+sub getcgiuser ($) { # {{{
+	my $session = shift;
+	my $user = $session->param('name');
+	$user = $ENV{REMOTE_ADDR} unless defined $user;
+	debug("getcgiuser() -> $user");
+	return $user;
+} # }}}
+
+# FIXME: logic adapted from recentchanges, should be common code?
+sub linkuser ($) { # {{{
+	my $user = shift;
+	my $oiduser = eval { IkiWiki::openiduser($user) };
+
+	if (defined $oiduser) {
+		return ($user, $oiduser);
+	}
+	else {
+		my $page = bestlink('', (length $config{userdir}
+				? "$config{userdir}/"
+				: "").$user);
+		return (urlto($page, undef, 1), $user);
+	}
+} # }}}
+
+# FIXME: taken from IkiWiki::Plugin::editpage, should be common?
+sub checksessionexpiry ($$) { # {{{
+	my $session = shift;
+	my $sid = shift;
+
+	if (defined $session->param("name")) {
+		if (! defined $sid || $sid ne $session->id) {
+			error(gettext("Your login session has expired."));
+		}
+	}
+} # }}}
+
+# Mostly cargo-culted from IkiWiki::plugin::editpage
+sub sessioncgi ($$) { #{{{
+	my $cgi=shift;
+	my $session=shift;
+
+	my $do = $cgi->param('do');
+	return unless $do eq PLUGIN;
+
+	# These are theoretically configurable, but currently hard-coded
+	my $allow_wikilinks = 0;
+	my $allow_directives = 0;
+	my $commit_comments = 1;
+
+	IkiWiki::decode_cgi_utf8($cgi);
+
+	eval q{use CGI::FormBuilder};
+	error($@) if $@;
+
+	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
+	my $form = CGI::FormBuilder->new(
+		fields => [qw{do sid page subject body}],
+		charset => 'utf-8',
+		method => 'POST',
+		required => [qw{body}],
+		javascript => 0,
+		params => $cgi,
+		action => $config{cgiurl},
+		header => 0,
+		table => 0,
+		template => scalar IkiWiki::template_params(PLUGIN . '_form.tmpl'),
+		# wtf does this do in editpage?
+		wikiname => $config{wikiname},
+	);
+
+	IkiWiki::decode_form_utf8($form);
+	IkiWiki::run_hooks(formbuilder_setup => sub {
+			shift->(title => PLUGIN, form => $form, cgi => $cgi,
+				session => $session, buttons => \@buttons);
+		});
+	IkiWiki::decode_form_utf8($form);
+
+	$form->field(name => 'do', type => 'hidden');
+	$form->field(name => 'sid', type => 'hidden', value => $session->id,
+		force => 1);
+	$form->field(name => 'page', type => 'hidden');
+	$form->field(name => 'subject', type => 'text', size => 80);
+	$form->field(name => 'body', type => 'textarea', rows => 5,
+		cols => 80);
+
+	# The untaint is OK (as in editpage) because we're about to pass
+	# it to file_pruned anyway
+	my $page = $form->field('page');
+	$page = IkiWiki::possibly_foolish_untaint($page);
+	if (!defined $page || !length $page ||
+		IkiWiki::file_pruned($page, $config{srcdir})) {
+		error ("bad page name");
+	}
+
+	# FIXME: is this right? Or should we be using the candidate subpage
+	# (whatever that might mean) as the base URL?
+	my $baseurl = urlto($page, undef, 1);
+
+	$form->title(sprintf(gettext("commenting on %s"),
+			IkiWiki::pagetitle($page)));
+
+	$form->tmpl_param('helponformattinglink',
+		htmllink($page, $page, 'ikiwiki/formatting',
+			noimageinline => 1,
+			linktext => 'FormattingHelp'));
+
+	if (not exists $pagesources{$page}) {
+		error ("page '$page' doesn't exist, so you can't comment");
+	}
+
+	if ($form->submitted eq CANCEL) {
+		# bounce back to the page they wanted to comment on, and exit.
+		# CANCEL need not be considered in future
+		IkiWiki::redirect($cgi, urlto($page, undef, 1));
+		exit;
+	}
+
+	my ($authorurl, $author) = linkuser(getcgiuser($session));
+
+	my $body = $form->field('body');
+	$body =~ s/\r\n/\n/g;
+	$body =~ s/\r/\n/g;
+	$body .= "\n" if $body !~ /\n$/;
+
+	$body =~ s/\[\[([^!])/&#91;&#91;$1/g unless $allow_wikilinks;
+	$body =~ s/\[\[!/&#91;&#91;!/g unless $allow_directives;
+
+	# In this template, the [[!meta]] directives should stay at the end,
+	# so that they will override anything the user specifies. (For
+	# instance, [[!meta author="I can fake the author"]]...)
+	my $content_tmpl = template(PLUGIN . '_comment.tmpl');
+	$content_tmpl->param(author => $author);
+	$content_tmpl->param(authorurl => $authorurl);
+	$content_tmpl->param(subject => $form->field('subject'));
+	$content_tmpl->param(body => $body);
+
+	my $content = $content_tmpl->output;
+
+	# This is essentially a simplified version of editpage:
+	# - the user does not control the page that's created, only the parent
+	# - it's always a create operation, never an edit
+	# - this means that conflicts should never happen
+	# - this means that if they do, rocks fall and everyone dies
+
+	if ($form->submitted eq PREVIEW) {
+		my $fake = "$page/_" . PLUGIN . "hypothetical";
+		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
+				IkiWiki::linkify($page, $page,
+					IkiWiki::preprocess($page, $page,
+						IkiWiki::filter($fake, $page,
+							$content),
+						0, 1)));
+		IkiWiki::run_hooks(format => sub {
+				$preview = shift->(page => $page,
+					content => $preview);
+			});
+
+		my $template = template(PLUGIN . "_display.tmpl");
+		$template->param(content => $preview);
+		$template->param(title => $form->field('subject'));
+		$template->param(ctime => displaytime(time));
+		$template->param(author => $author);
+		$template->param(authorurl => $authorurl);
+
+		$form->tmpl_param(page_preview => $template->output);
+	}
+	else {
+		$form->tmpl_param(page_preview => "");
+	}
+
+	if ($form->submitted eq POST_COMMENT && $form->validate) {
+		# Let's get posting. We don't check_canedit here because
+		# that somewhat defeats the point of this plugin.
+
+		checksessionexpiry($session, $cgi->param('sid'));
+
+		# FIXME: check that the wiki is locked right now, because
+		# if it's not, there are mad race conditions!
+
+		# FIXME: rather a simplistic way to make the comments...
+		my $i = 0;
+		my $file;
+		do {
+			$i++;
+			$file = "$page/comment_${i}._" . PLUGIN;
+		} while (-e "$config{srcdir}/$file");
+
+		# FIXME: could probably do some sort of graceful retry
+		# if I could be bothered
+		writefile($file, $config{srcdir}, $content);
+
+		my $conflict;
+
+		if ($config{rcs} and $commit_comments) {
+			my $message = "Added a comment";
+			if (defined $form->field('subject') &&
+				length $form->field('subject')) {
+				$message = "Added a comment: " .
+					$form->field('subject');
+			}
+
+			IkiWiki::rcs_add($file);
+			IkiWiki::disable_commit_hook();
+			$conflict = IkiWiki::rcs_commit_staged($message,
+				$session->param('name'), $ENV{REMOTE_ADDR});
+			IkiWiki::enable_commit_hook();
+			IkiWiki::rcs_update();
+		}
+
+		# Now we need a refresh
+		require IkiWiki::Render;
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
+
+		# this should never happen, unless a committer deliberately
+		# breaks it or something
+		error($conflict) if defined $conflict;
+
+		# Bounce back to where we were, but defeat broken caches
+		my $anticache = "?updated=$page/comment_$i";
+		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
+	}
+	else {
+		IkiWiki::showform ($form, \@buttons, $session, $cgi,
+			forcebaseurl => $baseurl);
+	}
+
+	exit;
+} #}}}
+
+1
diff --git a/templates/smcvpostcomment_comment.tmpl b/templates/smcvpostcomment_comment.tmpl
new file mode 100644
index 000000000..8c89458f3
--- /dev/null
+++ b/templates/smcvpostcomment_comment.tmpl
@@ -0,0 +1,10 @@
+<TMPL_VAR BODY>
+<TMPL_IF NAME="SUBJECT">
+[[!meta title="<TMPL_VAR NAME="SUBJECT" ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF NAME="AUTHOR">
+[[!meta author="<TMPL_VAR NAME="AUTHOR" ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF NAME="AUTHORURL">
+[[!meta authorurl="<TMPL_VAR NAME="AUTHORURL" ESCAPE=HTML>"]]
+</TMPL_IF>
diff --git a/templates/smcvpostcomment_display.tmpl b/templates/smcvpostcomment_display.tmpl
new file mode 100644
index 000000000..32618d94d
--- /dev/null
+++ b/templates/smcvpostcomment_display.tmpl
@@ -0,0 +1,24 @@
+<div class="smcvpostcomment-page">
+
+<div class="smcvpostcomment-header">
+Posted by
+<TMPL_IF NAME="AUTHOR">
+<span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR NAME=AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+
+(<TMPL_VAR CTIME>)
+</div>
+
+<div class="smcvpostcomment-subject"><TMPL_VAR TITLE></div>
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+</div><!--.inlinepage-->
diff --git a/templates/smcvpostcomment_embed.tmpl b/templates/smcvpostcomment_embed.tmpl
new file mode 100644
index 000000000..2db055d51
--- /dev/null
+++ b/templates/smcvpostcomment_embed.tmpl
@@ -0,0 +1,11 @@
+<form action="<TMPL_VAR CGIURL>" method="get">
+<div class="smcvpostcommentembed">
+<input type="hidden" name="do" value="smcvpostcomment" />
+<input type="hidden" name="page" value="<TMPL_VAR PAGE>" />
+<input type="submit" name="submit" value="Post a comment"
+  <TMPL_IF NAME=DISABLED>disabled="disabled"</TMPL_IF> />
+<TMPL_IF NAME=DISABLED>
+<label for="submit">(<TMPL_VAR NAME=DISABLED>)</label>
+</TMPL_IF>
+</div>
+</form>
diff --git a/templates/smcvpostcomment_form.tmpl b/templates/smcvpostcomment_form.tmpl
new file mode 100644
index 000000000..9bce62396
--- /dev/null
+++ b/templates/smcvpostcomment_form.tmpl
@@ -0,0 +1,20 @@
+<TMPL_VAR MESSAGE>
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
+<TMPL_VAR FIELD-PAGE>
+Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<TMPL_VAR FIELD-BODY><br />
+<TMPL_VAR FORM-SUBMIT><br />
+<TMPL_VAR HELPONFORMATTINGLINK>
+<TMPL_VAR FORM-END>
+
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Page preview:</span>
+</div>
+<div id="preview">
+<TMPL_VAR PAGE_PREVIEW>
+</div>
+</TMPL_IF>
-- 
cgit v1.2.3


From bd8c4674a89945d4748537fbbb15464d9963c299 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 15 Nov 2008 14:11:24 +0000
Subject: smcvpostcomment: use gettext where appropriate

---
 IkiWiki/Plugin/smcvpostcomment.pm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index cb55ff94f..1255cfde1 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -38,7 +38,8 @@ sub preprocess (@) { #{{{
 	my %params=@_;
 
 	unless (length $config{cgiurl}) {
-		error("this plugin makes no sense if you have no CGI");
+		error(sprintf (gettext("[[!%s plugin requires CGI enabled]]"),
+			PLUGIN));
 	}
 
 	my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
@@ -48,15 +49,15 @@ sub preprocess (@) { #{{{
 
 	if ($params{preview}) {
 		$formtemplate->param("disabled" =>
-			'not available during Preview');
+			gettext('not available during Preview'));
 	}
 
-	debug("page $params{page} => destpage $params{page}");
+	debug("page $params{page} => destpage $params{destpage}");
 
 	# I'm reasonably sure that this counts as abuse of [[!inline]]
 	return $formtemplate->output . "\n" .
 		IkiWiki::preprocess_inline(
-			pages => "internal(/$params{page}/comment_*)",
+			pages => "internal($params{page}/_comment_*)",
 			template => PLUGIN . "_display",
 			show => 0,
 			reverse => "yes",
@@ -157,7 +158,7 @@ sub sessioncgi ($$) { #{{{
 	$page = IkiWiki::possibly_foolish_untaint($page);
 	if (!defined $page || !length $page ||
 		IkiWiki::file_pruned($page, $config{srcdir})) {
-		error ("bad page name");
+		error(gettext("bad page name"));
 	}
 
 	# FIXME: is this right? Or should we be using the candidate subpage
@@ -173,7 +174,9 @@ sub sessioncgi ($$) { #{{{
 			linktext => 'FormattingHelp'));
 
 	if (not exists $pagesources{$page}) {
-		error ("page '$page' doesn't exist, so you can't comment");
+		error(sprintf(gettext(
+			"page '%s' doesn't exist, so you can't comment"),
+			$page));
 	}
 
 	if ($form->submitted eq CANCEL) {
@@ -260,11 +263,10 @@ sub sessioncgi ($$) { #{{{
 		my $conflict;
 
 		if ($config{rcs} and $commit_comments) {
-			my $message = "Added a comment";
+			my $message = gettext("Added a comment");
 			if (defined $form->field('subject') &&
 				length $form->field('subject')) {
-				$message = "Added a comment: " .
-					$form->field('subject');
+				$message .= ": ".$form->field('subject');
 			}
 
 			IkiWiki::rcs_add($file);
-- 
cgit v1.2.3


From 49835784d8908e07fabf4200e35adcd98b73a00c Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 15 Nov 2008 14:12:26 +0000
Subject: smcvpostcomment: use better names for special comment files

---
 IkiWiki/Plugin/smcvpostcomment.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 1255cfde1..3e3c2ca93 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -253,7 +253,7 @@ sub sessioncgi ($$) { #{{{
 		my $file;
 		do {
 			$i++;
-			$file = "$page/comment_${i}._" . PLUGIN;
+			$file = "$page/_comment_${i}._" . PLUGIN;
 		} while (-e "$config{srcdir}/$file");
 
 		# FIXME: could probably do some sort of graceful retry
@@ -287,7 +287,7 @@ sub sessioncgi ($$) { #{{{
 		error($conflict) if defined $conflict;
 
 		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/comment_$i";
+		my $anticache = "?updated=$page/_comment_$i";
 		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
 	}
 	else {
-- 
cgit v1.2.3


From e65c7b73af6dcb9f8dc0435f17ea3beeab66f175 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 15 Nov 2008 14:12:42 +0000
Subject: smcvpostcomment: load inline plugin more forcibly

---
 IkiWiki/Plugin/smcvpostcomment.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 3e3c2ca93..9d3f3e858 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -8,6 +8,7 @@ package IkiWiki::Plugin::smcvpostcomment;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use IkiWiki::Plugin::inline;
 use IkiWiki::Plugin::mdwn;
 use CGI 'escapeHTML';
 
-- 
cgit v1.2.3


From 42b15f763394279ec5a9b4f51031b30470c4dc92 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 15 Nov 2008 14:12:57 +0000
Subject: smcvpostcomment: avoid warnings if form field 'body' is undef

---
 IkiWiki/Plugin/smcvpostcomment.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 9d3f3e858..367f2d9b3 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -189,7 +189,7 @@ sub sessioncgi ($$) { #{{{
 
 	my ($authorurl, $author) = linkuser(getcgiuser($session));
 
-	my $body = $form->field('body');
+	my $body = $form->field('body') || '';
 	$body =~ s/\r\n/\n/g;
 	$body =~ s/\r/\n/g;
 	$body .= "\n" if $body !~ /\n$/;
-- 
cgit v1.2.3


From 29862a8cc8fb9818bbc219955c2b0c5e64a640ce Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 15 Nov 2008 14:13:10 +0000
Subject: smcvpostcomment: explain what $fake is for

---
 IkiWiki/Plugin/smcvpostcomment.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 367f2d9b3..f224944d5 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -215,6 +215,8 @@ sub sessioncgi ($$) { #{{{
 	# - this means that if they do, rocks fall and everyone dies
 
 	if ($form->submitted eq PREVIEW) {
+		# $fake is a location that has the same number of slashes
+		# as the eventual location of this comment.
 		my $fake = "$page/_" . PLUGIN . "hypothetical";
 		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
 				IkiWiki::linkify($page, $page,
-- 
cgit v1.2.3


From 798dea20330d06690fcff11cf46aa64605b375d1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 16 Nov 2008 18:11:55 +0000
Subject: smcvpostcomment: reduce length of subject field

---
 IkiWiki/Plugin/smcvpostcomment.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index f224944d5..59f0e8cfc 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -149,7 +149,7 @@ sub sessioncgi ($$) { #{{{
 	$form->field(name => 'sid', type => 'hidden', value => $session->id,
 		force => 1);
 	$form->field(name => 'page', type => 'hidden');
-	$form->field(name => 'subject', type => 'text', size => 80);
+	$form->field(name => 'subject', type => 'text', size => 72);
 	$form->field(name => 'body', type => 'textarea', rows => 5,
 		cols => 80);
 
-- 
cgit v1.2.3


From 660a4ef151bd3da5135c9baa5b782ca373546d16 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 16 Nov 2008 18:23:23 +0000
Subject: smcvpostcomment: always allow wikilinks, and do access control

wikilinks are harmless, so we might as well allow them.

Access control for this plugin is a bit odd, since we specifically
don't want to allow comments to be edited - so the check is whether the
user is allowed to edit a deliberately invalid page name,
page/commented/on[smcvpostcomment]. You can put smcvpostcomment(*)
or smcvpostcomment(some/subdir/*) in $config{anonok_pagespec}
or the opposite in $config{locked_pages} to allow "editing" (really
just posting) comments.
---
 IkiWiki/Plugin/smcvpostcomment.pm | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 59f0e8cfc..43b1d3e6f 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -113,7 +113,6 @@ sub sessioncgi ($$) { #{{{
 	return unless $do eq PLUGIN;
 
 	# These are theoretically configurable, but currently hard-coded
-	my $allow_wikilinks = 0;
 	my $allow_directives = 0;
 	my $commit_comments = 1;
 
@@ -187,15 +186,24 @@ sub sessioncgi ($$) { #{{{
 		exit;
 	}
 
+	IkiWiki::check_canedit($page . "[" . PLUGIN . "]", $cgi, $session);
+
 	my ($authorurl, $author) = linkuser(getcgiuser($session));
 
 	my $body = $form->field('body') || '';
 	$body =~ s/\r\n/\n/g;
 	$body =~ s/\r/\n/g;
-	$body .= "\n" if $body !~ /\n$/;
+	$body = "\n" if $body !~ /\n$/;
+
+	unless ($allow_directives) {
+		# don't allow new-style directives at all
+		$body =~ s/(^|[^\\])\[\[!/$1\\[[!/g;
 
-	$body =~ s/\[\[([^!])/&#91;&#91;$1/g unless $allow_wikilinks;
-	$body =~ s/\[\[!/&#91;&#91;!/g unless $allow_directives;
+		# don't allow [[ unless it begins an old-style
+		# wikilink, if prefix_directives is off
+		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1\\[[!/g
+			unless $config{prefix_directives};
+	}
 
 	# In this template, the [[!meta]] directives should stay at the end,
 	# so that they will override anything the user specifies. (For
@@ -301,4 +309,16 @@ sub sessioncgi ($$) { #{{{
 	exit;
 } #}}}
 
+package IkiWiki::PageSpec;
+
+sub match_smcvpostcomment ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+
+	unless ($page =~ s/\[smcvpostcomment\]$//) {
+		return IkiWiki::FailReason->new("not posting a comment");
+	}
+	return match_glob($page, $glob);
+}
+
 1
-- 
cgit v1.2.3


From 1bd1b03766704bbf2271e87cf4a68978827f31fb Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 09:10:06 +0000
Subject: smcvpostcomment: remove HTML if not allowed

---
 IkiWiki/Plugin/smcvpostcomment.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 43b1d3e6f..07f008e5e 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -205,6 +205,12 @@ sub sessioncgi ($$) { #{{{
 			unless $config{prefix_directives};
 	}
 
+	unless ($allow_html) {
+		$body =~ s/&(\w|#)/&amp;$1/g;
+		$body =~ s/</&lt;/g;
+		$body =~ s/>/&gt;/g;
+	}
+
 	# In this template, the [[!meta]] directives should stay at the end,
 	# so that they will override anything the user specifies. (For
 	# instance, [[!meta author="I can fake the author"]]...)
-- 
cgit v1.2.3


From d18adfb1adedff996dfea9b20a3f1765addbec04 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 09:08:54 +0000
Subject: smcvpostcomment: indicate in form whether HTML and directives are
 allowed

---
 IkiWiki/Plugin/smcvpostcomment.pm   | 4 +++-
 templates/smcvpostcomment_form.tmpl | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 07f008e5e..2b9f1e5dc 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -171,7 +171,9 @@ sub sessioncgi ($$) { #{{{
 	$form->tmpl_param('helponformattinglink',
 		htmllink($page, $page, 'ikiwiki/formatting',
 			noimageinline => 1,
-			linktext => 'FormattingHelp'));
+			linktext => 'FormattingHelp'),
+			allowhtml => $allow_html,
+			allowdirectives => $allow_directives);
 
 	if (not exists $pagesources{$page}) {
 		error(sprintf(gettext(
diff --git a/templates/smcvpostcomment_form.tmpl b/templates/smcvpostcomment_form.tmpl
index 9bce62396..7f138a450 100644
--- a/templates/smcvpostcomment_form.tmpl
+++ b/templates/smcvpostcomment_form.tmpl
@@ -6,8 +6,10 @@
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-BODY><br />
 <TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_VAR FORM-END>
+<TMPL_VAR HELPONFORMATTINGLINK><br />
+HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
+<TMPL_VAR NAME="FORM-END">
 
 <TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
-- 
cgit v1.2.3


From bb4eb07bdd97ce91a4d28539ebbd1c937241c7a4 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 09:09:52 +0000
Subject: smcvpostcomment: make allowhtml etc. configurable, and don't allow
 commenting on pages where comments have never been allowed

---
 IkiWiki/Plugin/smcvpostcomment.pm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 2b9f1e5dc..562dc9ed5 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -43,6 +43,14 @@ sub preprocess (@) { #{{{
 			PLUGIN));
 	}
 
+	my $page = $params{page};
+	$pagestate{$page}{PLUGIN()}{comments} = 1;
+	$pagestate{$page}{PLUGIN()}{allowhtml} = IkiWiki::yesno($params{allowhtml});
+	$pagestate{$page}{PLUGIN()}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
+	$pagestate{$page}{PLUGIN()}{commit} = defined $params{commit}
+		? IkiWiki::yesno($params{commit})
+		: 1;
+
 	my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
 		blind_cache => 1);
 	$formtemplate->param(cgiurl => $config{cgiurl});
@@ -112,10 +120,6 @@ sub sessioncgi ($$) { #{{{
 	my $do = $cgi->param('do');
 	return unless $do eq PLUGIN;
 
-	# These are theoretically configurable, but currently hard-coded
-	my $allow_directives = 0;
-	my $commit_comments = 1;
-
 	IkiWiki::decode_cgi_utf8($cgi);
 
 	eval q{use CGI::FormBuilder};
@@ -161,6 +165,12 @@ sub sessioncgi ($$) { #{{{
 		error(gettext("bad page name"));
 	}
 
+	my $allow_directives = $pagestate{$page}{PLUGIN()}{allowdirectives};
+	my $allow_html = $pagestate{$page}{PLUGIN()}{allowdirectives};
+	my $commit_comments = defined $pagestate{$page}{PLUGIN()}{commit}
+		? $pagestate{$page}{PLUGIN()}{commit}
+		: 1;
+
 	# FIXME: is this right? Or should we be using the candidate subpage
 	# (whatever that might mean) as the base URL?
 	my $baseurl = urlto($page, undef, 1);
@@ -180,6 +190,11 @@ sub sessioncgi ($$) { #{{{
 			"page '%s' doesn't exist, so you can't comment"),
 			$page));
 	}
+	if (not $pagestate{$page}{PLUGIN()}{comments}) {
+		error(sprintf(gettext(
+			"comments are not enabled on page '%s'"),
+			$page));
+	}
 
 	if ($form->submitted eq CANCEL) {
 		# bounce back to the page they wanted to comment on, and exit.
-- 
cgit v1.2.3


From 442e4e7e120be14980a0431e98784dc0ad52eee6 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 09:10:50 +0000
Subject: smcvpostcomment: allow inlining to be disabled, and pass through atom
 etc. better

---
 IkiWiki/Plugin/smcvpostcomment.pm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 562dc9ed5..6bd3b2970 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -63,16 +63,28 @@ sub preprocess (@) { #{{{
 
 	debug("page $params{page} => destpage $params{destpage}");
 
-	# I'm reasonably sure that this counts as abuse of [[!inline]]
-	return $formtemplate->output . "\n" .
-		IkiWiki::preprocess_inline(
+	my $posts = '';
+	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
+		my @args = (
 			pages => "internal($params{page}/_comment_*)",
 			template => PLUGIN . "_display",
 			show => 0,
 			reverse => "yes",
+			# special stuff passed through
 			page => $params{page},
 			destpage => $params{destpage},
-			preview => $params{preview});
+			preview => $params{preview},
+		);
+		push @args, atom => $params{atom} if defined $params{atom};
+		push @args, rss => $params{rss} if defined $params{rss};
+		push @args, feeds => $params{feeds} if defined $params{feeds};
+		push @args, feedshow => $params{feedshow} if defined $params{feedshow};
+		push @args, timeformat => $params{timeformat} if defined $params{timeformat};
+		push @args, feedonly => $params{feedonly} if defined $params{feedonly};
+		$posts = "\n" . IkiWiki::preprocess_inline(@args);
+	}
+
+	return $formtemplate->output . $posts;
 } # }}}
 
 # FIXME: logic taken from editpage, should be common code?
-- 
cgit v1.2.3


From f49603bf8638ab539151114445e0b132fb518941 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 10:41:50 +0000
Subject: smcvpostcomment: import other plugins lazily and remove unnecessary
 use of CGI

---
 IkiWiki/Plugin/smcvpostcomment.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 6bd3b2970..40ffe8164 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -8,9 +8,6 @@ package IkiWiki::Plugin::smcvpostcomment;
 use warnings;
 use strict;
 use IkiWiki 2.00;
-use IkiWiki::Plugin::inline;
-use IkiWiki::Plugin::mdwn;
-use CGI 'escapeHTML';
 
 use constant PLUGIN => "smcvpostcomment";
 use constant PREVIEW => "Preview";
@@ -24,6 +21,13 @@ sub import { #{{{
 	hook(type => "htmlize", id => "_".PLUGIN,
 		call => \&IkiWiki::Plugin::mdwn::htmlize);
 	IkiWiki::loadplugin("inline");
+	IkiWiki::loadplugin("mdwn");
+} # }}}
+
+sub htmlize { # {{{
+	eval { use IkiWiki::Plugin::mdwn; };
+	error($@) if ($@);
+	return IkiWiki::Plugin::mdwn::htmlize(@_)
 } # }}}
 
 sub getsetup () { #{{{
@@ -65,6 +69,8 @@ sub preprocess (@) { #{{{
 
 	my $posts = '';
 	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
+		eval { use IkiWiki::Plugin::inline; };
+		error($@) if ($@);
 		my @args = (
 			pages => "internal($params{page}/_comment_*)",
 			template => PLUGIN . "_display",
-- 
cgit v1.2.3


From b7db3444a5d8e31bb1df60c3617f1038d93e099e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 10:42:01 +0000
Subject: smcvpostcomment: allow commenting to be closed

---
 IkiWiki/Plugin/smcvpostcomment.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 40ffe8164..22958c84a 100644
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -48,7 +48,9 @@ sub preprocess (@) { #{{{
 	}
 
 	my $page = $params{page};
-	$pagestate{$page}{PLUGIN()}{comments} = 1;
+	$pagestate{$page}{PLUGIN()}{comments} = defined $params{closed}
+		? (not IkiWiki::yesno($params{closed}))
+		: 1;
 	$pagestate{$page}{PLUGIN()}{allowhtml} = IkiWiki::yesno($params{allowhtml});
 	$pagestate{$page}{PLUGIN()}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
 	$pagestate{$page}{PLUGIN()}{commit} = defined $params{commit}
@@ -60,7 +62,11 @@ sub preprocess (@) { #{{{
 	$formtemplate->param(cgiurl => $config{cgiurl});
 	$formtemplate->param(page => $params{page});
 
-	if ($params{preview}) {
+	if (not $pagestate{$page}{PLUGIN()}{comments}) {
+		$formtemplate->param("disabled" =>
+			gettext('comments are closed'));
+	}
+	elsif ($params{preview}) {
 		$formtemplate->param("disabled" =>
 			gettext('not available during Preview'));
 	}
-- 
cgit v1.2.3


From 3c9ccb406b2260c149be387508a097fe6fdb3c93 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 17 Nov 2008 11:16:31 +0000
Subject: Rename smcvpostcomment plugin to postcomment to propose for inclusion

---
 IkiWiki/Plugin/postcomment.pm          | 371 +++++++++++++++++++++++++++++++++
 IkiWiki/Plugin/smcvpostcomment.pm      | 371 ---------------------------------
 doc/style.css                          |   8 +-
 templates/postcomment_comment.tmpl     |  10 +
 templates/postcomment_display.tmpl     |  24 +++
 templates/postcomment_embed.tmpl       |   7 +
 templates/postcomment_form.tmpl        |  25 +++
 templates/smcvpostcomment_comment.tmpl |  10 -
 templates/smcvpostcomment_display.tmpl |  24 ---
 templates/smcvpostcomment_embed.tmpl   |   7 -
 templates/smcvpostcomment_form.tmpl    |  25 ---
 11 files changed, 441 insertions(+), 441 deletions(-)
 create mode 100644 IkiWiki/Plugin/postcomment.pm
 delete mode 100644 IkiWiki/Plugin/smcvpostcomment.pm
 create mode 100644 templates/postcomment_comment.tmpl
 create mode 100644 templates/postcomment_display.tmpl
 create mode 100644 templates/postcomment_embed.tmpl
 create mode 100644 templates/postcomment_form.tmpl
 delete mode 100644 templates/smcvpostcomment_comment.tmpl
 delete mode 100644 templates/smcvpostcomment_display.tmpl
 delete mode 100644 templates/smcvpostcomment_embed.tmpl
 delete mode 100644 templates/smcvpostcomment_form.tmpl

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/postcomment.pm b/IkiWiki/Plugin/postcomment.pm
new file mode 100644
index 000000000..480ca58a5
--- /dev/null
+++ b/IkiWiki/Plugin/postcomment.pm
@@ -0,0 +1,371 @@
+#!/usr/bin/perl
+# Copyright © 2006-2008 Joey Hess <joey@ikiwiki.info>
+# Copyright © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+# Licensed under the GNU GPL, version 2, or any later version published by the
+# Free Software Foundation
+package IkiWiki::Plugin::postcomment;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+use constant PLUGIN => "postcomment";
+use constant PREVIEW => "Preview";
+use constant POST_COMMENT => "Post comment";
+use constant CANCEL => "Cancel";
+
+sub import { #{{{
+	hook(type => "getsetup", id => PLUGIN,  call => \&getsetup);
+	hook(type => "preprocess", id => PLUGIN, call => \&preprocess);
+	hook(type => "sessioncgi", id => PLUGIN, call => \&sessioncgi);
+	hook(type => "htmlize", id => "_".PLUGIN,
+		call => \&IkiWiki::Plugin::mdwn::htmlize);
+	IkiWiki::loadplugin("inline");
+	IkiWiki::loadplugin("mdwn");
+} # }}}
+
+sub htmlize { # {{{
+	eval { use IkiWiki::Plugin::mdwn; };
+	error($@) if ($@);
+	return IkiWiki::Plugin::mdwn::htmlize(@_)
+} # }}}
+
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
+# Somewhat based on IkiWiki::Plugin::inline blog posting support
+sub preprocess (@) { #{{{
+	my %params=@_;
+
+	unless (length $config{cgiurl}) {
+		error(sprintf (gettext("[[!%s plugin requires CGI enabled]]"),
+			PLUGIN));
+	}
+
+	my $page = $params{page};
+	$pagestate{$page}{PLUGIN()}{comments} = defined $params{closed}
+		? (not IkiWiki::yesno($params{closed}))
+		: 1;
+	$pagestate{$page}{PLUGIN()}{allowhtml} = IkiWiki::yesno($params{allowhtml});
+	$pagestate{$page}{PLUGIN()}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
+	$pagestate{$page}{PLUGIN()}{commit} = defined $params{commit}
+		? IkiWiki::yesno($params{commit})
+		: 1;
+
+	my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
+		blind_cache => 1);
+	$formtemplate->param(cgiurl => $config{cgiurl});
+	$formtemplate->param(page => $params{page});
+
+	if (not $pagestate{$page}{PLUGIN()}{comments}) {
+		$formtemplate->param("disabled" =>
+			gettext('comments are closed'));
+	}
+	elsif ($params{preview}) {
+		$formtemplate->param("disabled" =>
+			gettext('not available during Preview'));
+	}
+
+	debug("page $params{page} => destpage $params{destpage}");
+
+	my $posts = '';
+	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
+		eval { use IkiWiki::Plugin::inline; };
+		error($@) if ($@);
+		my @args = (
+			pages => "internal($params{page}/_comment_*)",
+			template => PLUGIN . "_display",
+			show => 0,
+			reverse => "yes",
+			# special stuff passed through
+			page => $params{page},
+			destpage => $params{destpage},
+			preview => $params{preview},
+		);
+		push @args, atom => $params{atom} if defined $params{atom};
+		push @args, rss => $params{rss} if defined $params{rss};
+		push @args, feeds => $params{feeds} if defined $params{feeds};
+		push @args, feedshow => $params{feedshow} if defined $params{feedshow};
+		push @args, timeformat => $params{timeformat} if defined $params{timeformat};
+		push @args, feedonly => $params{feedonly} if defined $params{feedonly};
+		$posts = "\n" . IkiWiki::preprocess_inline(@args);
+	}
+
+	return $formtemplate->output . $posts;
+} # }}}
+
+# FIXME: logic taken from editpage, should be common code?
+sub getcgiuser ($) { # {{{
+	my $session = shift;
+	my $user = $session->param('name');
+	$user = $ENV{REMOTE_ADDR} unless defined $user;
+	debug("getcgiuser() -> $user");
+	return $user;
+} # }}}
+
+# FIXME: logic adapted from recentchanges, should be common code?
+sub linkuser ($) { # {{{
+	my $user = shift;
+	my $oiduser = eval { IkiWiki::openiduser($user) };
+
+	if (defined $oiduser) {
+		return ($user, $oiduser);
+	}
+	else {
+		my $page = bestlink('', (length $config{userdir}
+				? "$config{userdir}/"
+				: "").$user);
+		return (urlto($page, undef, 1), $user);
+	}
+} # }}}
+
+# FIXME: taken from IkiWiki::Plugin::editpage, should be common?
+sub checksessionexpiry ($$) { # {{{
+	my $session = shift;
+	my $sid = shift;
+
+	if (defined $session->param("name")) {
+		if (! defined $sid || $sid ne $session->id) {
+			error(gettext("Your login session has expired."));
+		}
+	}
+} # }}}
+
+# Mostly cargo-culted from IkiWiki::plugin::editpage
+sub sessioncgi ($$) { #{{{
+	my $cgi=shift;
+	my $session=shift;
+
+	my $do = $cgi->param('do');
+	return unless $do eq PLUGIN;
+
+	IkiWiki::decode_cgi_utf8($cgi);
+
+	eval q{use CGI::FormBuilder};
+	error($@) if $@;
+
+	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
+	my $form = CGI::FormBuilder->new(
+		fields => [qw{do sid page subject body}],
+		charset => 'utf-8',
+		method => 'POST',
+		required => [qw{body}],
+		javascript => 0,
+		params => $cgi,
+		action => $config{cgiurl},
+		header => 0,
+		table => 0,
+		template => scalar IkiWiki::template_params(PLUGIN . '_form.tmpl'),
+		# wtf does this do in editpage?
+		wikiname => $config{wikiname},
+	);
+
+	IkiWiki::decode_form_utf8($form);
+	IkiWiki::run_hooks(formbuilder_setup => sub {
+			shift->(title => PLUGIN, form => $form, cgi => $cgi,
+				session => $session, buttons => \@buttons);
+		});
+	IkiWiki::decode_form_utf8($form);
+
+	$form->field(name => 'do', type => 'hidden');
+	$form->field(name => 'sid', type => 'hidden', value => $session->id,
+		force => 1);
+	$form->field(name => 'page', type => 'hidden');
+	$form->field(name => 'subject', type => 'text', size => 72);
+	$form->field(name => 'body', type => 'textarea', rows => 5,
+		cols => 80);
+
+	# The untaint is OK (as in editpage) because we're about to pass
+	# it to file_pruned anyway
+	my $page = $form->field('page');
+	$page = IkiWiki::possibly_foolish_untaint($page);
+	if (!defined $page || !length $page ||
+		IkiWiki::file_pruned($page, $config{srcdir})) {
+		error(gettext("bad page name"));
+	}
+
+	my $allow_directives = $pagestate{$page}{PLUGIN()}{allowdirectives};
+	my $allow_html = $pagestate{$page}{PLUGIN()}{allowdirectives};
+	my $commit_comments = defined $pagestate{$page}{PLUGIN()}{commit}
+		? $pagestate{$page}{PLUGIN()}{commit}
+		: 1;
+
+	# FIXME: is this right? Or should we be using the candidate subpage
+	# (whatever that might mean) as the base URL?
+	my $baseurl = urlto($page, undef, 1);
+
+	$form->title(sprintf(gettext("commenting on %s"),
+			IkiWiki::pagetitle($page)));
+
+	$form->tmpl_param('helponformattinglink',
+		htmllink($page, $page, 'ikiwiki/formatting',
+			noimageinline => 1,
+			linktext => 'FormattingHelp'),
+			allowhtml => $allow_html,
+			allowdirectives => $allow_directives);
+
+	if (not exists $pagesources{$page}) {
+		error(sprintf(gettext(
+			"page '%s' doesn't exist, so you can't comment"),
+			$page));
+	}
+	if (not $pagestate{$page}{PLUGIN()}{comments}) {
+		error(sprintf(gettext(
+			"comments are not enabled on page '%s'"),
+			$page));
+	}
+
+	if ($form->submitted eq CANCEL) {
+		# bounce back to the page they wanted to comment on, and exit.
+		# CANCEL need not be considered in future
+		IkiWiki::redirect($cgi, urlto($page, undef, 1));
+		exit;
+	}
+
+	IkiWiki::check_canedit($page . "[" . PLUGIN . "]", $cgi, $session);
+
+	my ($authorurl, $author) = linkuser(getcgiuser($session));
+
+	my $body = $form->field('body') || '';
+	$body =~ s/\r\n/\n/g;
+	$body =~ s/\r/\n/g;
+	$body = "\n" if $body !~ /\n$/;
+
+	unless ($allow_directives) {
+		# don't allow new-style directives at all
+		$body =~ s/(^|[^\\])\[\[!/$1\\[[!/g;
+
+		# don't allow [[ unless it begins an old-style
+		# wikilink, if prefix_directives is off
+		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1\\[[!/g
+			unless $config{prefix_directives};
+	}
+
+	unless ($allow_html) {
+		$body =~ s/&(\w|#)/&amp;$1/g;
+		$body =~ s/</&lt;/g;
+		$body =~ s/>/&gt;/g;
+	}
+
+	# In this template, the [[!meta]] directives should stay at the end,
+	# so that they will override anything the user specifies. (For
+	# instance, [[!meta author="I can fake the author"]]...)
+	my $content_tmpl = template(PLUGIN . '_comment.tmpl');
+	$content_tmpl->param(author => $author);
+	$content_tmpl->param(authorurl => $authorurl);
+	$content_tmpl->param(subject => $form->field('subject'));
+	$content_tmpl->param(body => $body);
+
+	my $content = $content_tmpl->output;
+
+	# This is essentially a simplified version of editpage:
+	# - the user does not control the page that's created, only the parent
+	# - it's always a create operation, never an edit
+	# - this means that conflicts should never happen
+	# - this means that if they do, rocks fall and everyone dies
+
+	if ($form->submitted eq PREVIEW) {
+		# $fake is a location that has the same number of slashes
+		# as the eventual location of this comment.
+		my $fake = "$page/_" . PLUGIN . "hypothetical";
+		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
+				IkiWiki::linkify($page, $page,
+					IkiWiki::preprocess($page, $page,
+						IkiWiki::filter($fake, $page,
+							$content),
+						0, 1)));
+		IkiWiki::run_hooks(format => sub {
+				$preview = shift->(page => $page,
+					content => $preview);
+			});
+
+		my $template = template(PLUGIN . "_display.tmpl");
+		$template->param(content => $preview);
+		$template->param(title => $form->field('subject'));
+		$template->param(ctime => displaytime(time));
+		$template->param(author => $author);
+		$template->param(authorurl => $authorurl);
+
+		$form->tmpl_param(page_preview => $template->output);
+	}
+	else {
+		$form->tmpl_param(page_preview => "");
+	}
+
+	if ($form->submitted eq POST_COMMENT && $form->validate) {
+		# Let's get posting. We don't check_canedit here because
+		# that somewhat defeats the point of this plugin.
+
+		checksessionexpiry($session, $cgi->param('sid'));
+
+		# FIXME: check that the wiki is locked right now, because
+		# if it's not, there are mad race conditions!
+
+		# FIXME: rather a simplistic way to make the comments...
+		my $i = 0;
+		my $file;
+		do {
+			$i++;
+			$file = "$page/_comment_${i}._" . PLUGIN;
+		} while (-e "$config{srcdir}/$file");
+
+		# FIXME: could probably do some sort of graceful retry
+		# if I could be bothered
+		writefile($file, $config{srcdir}, $content);
+
+		my $conflict;
+
+		if ($config{rcs} and $commit_comments) {
+			my $message = gettext("Added a comment");
+			if (defined $form->field('subject') &&
+				length $form->field('subject')) {
+				$message .= ": ".$form->field('subject');
+			}
+
+			IkiWiki::rcs_add($file);
+			IkiWiki::disable_commit_hook();
+			$conflict = IkiWiki::rcs_commit_staged($message,
+				$session->param('name'), $ENV{REMOTE_ADDR});
+			IkiWiki::enable_commit_hook();
+			IkiWiki::rcs_update();
+		}
+
+		# Now we need a refresh
+		require IkiWiki::Render;
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
+
+		# this should never happen, unless a committer deliberately
+		# breaks it or something
+		error($conflict) if defined $conflict;
+
+		# Bounce back to where we were, but defeat broken caches
+		my $anticache = "?updated=$page/_comment_$i";
+		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
+	}
+	else {
+		IkiWiki::showform ($form, \@buttons, $session, $cgi,
+			forcebaseurl => $baseurl);
+	}
+
+	exit;
+} #}}}
+
+package IkiWiki::PageSpec;
+
+sub match_postcomment ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+
+	unless ($page =~ s/\[postcomment\]$//) {
+		return IkiWiki::FailReason->new("not posting a comment");
+	}
+	return match_glob($page, $glob);
+}
+
+1
diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
deleted file mode 100644
index 22958c84a..000000000
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ /dev/null
@@ -1,371 +0,0 @@
-#!/usr/bin/perl
-# Copyright © 2006-2008 Joey Hess <joey@ikiwiki.info>
-# Copyright © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
-# Licensed under the GNU GPL, version 2, or any later version published by the
-# Free Software Foundation
-package IkiWiki::Plugin::smcvpostcomment;
-
-use warnings;
-use strict;
-use IkiWiki 2.00;
-
-use constant PLUGIN => "smcvpostcomment";
-use constant PREVIEW => "Preview";
-use constant POST_COMMENT => "Post comment";
-use constant CANCEL => "Cancel";
-
-sub import { #{{{
-	hook(type => "getsetup", id => PLUGIN,  call => \&getsetup);
-	hook(type => "preprocess", id => PLUGIN, call => \&preprocess);
-	hook(type => "sessioncgi", id => PLUGIN, call => \&sessioncgi);
-	hook(type => "htmlize", id => "_".PLUGIN,
-		call => \&IkiWiki::Plugin::mdwn::htmlize);
-	IkiWiki::loadplugin("inline");
-	IkiWiki::loadplugin("mdwn");
-} # }}}
-
-sub htmlize { # {{{
-	eval { use IkiWiki::Plugin::mdwn; };
-	error($@) if ($@);
-	return IkiWiki::Plugin::mdwn::htmlize(@_)
-} # }}}
-
-sub getsetup () { #{{{
-	return
-		plugin => {
-			safe => 1,
-			rebuild => undef,
-		},
-} #}}}
-
-# Somewhat based on IkiWiki::Plugin::inline blog posting support
-sub preprocess (@) { #{{{
-	my %params=@_;
-
-	unless (length $config{cgiurl}) {
-		error(sprintf (gettext("[[!%s plugin requires CGI enabled]]"),
-			PLUGIN));
-	}
-
-	my $page = $params{page};
-	$pagestate{$page}{PLUGIN()}{comments} = defined $params{closed}
-		? (not IkiWiki::yesno($params{closed}))
-		: 1;
-	$pagestate{$page}{PLUGIN()}{allowhtml} = IkiWiki::yesno($params{allowhtml});
-	$pagestate{$page}{PLUGIN()}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
-	$pagestate{$page}{PLUGIN()}{commit} = defined $params{commit}
-		? IkiWiki::yesno($params{commit})
-		: 1;
-
-	my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
-		blind_cache => 1);
-	$formtemplate->param(cgiurl => $config{cgiurl});
-	$formtemplate->param(page => $params{page});
-
-	if (not $pagestate{$page}{PLUGIN()}{comments}) {
-		$formtemplate->param("disabled" =>
-			gettext('comments are closed'));
-	}
-	elsif ($params{preview}) {
-		$formtemplate->param("disabled" =>
-			gettext('not available during Preview'));
-	}
-
-	debug("page $params{page} => destpage $params{destpage}");
-
-	my $posts = '';
-	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
-		eval { use IkiWiki::Plugin::inline; };
-		error($@) if ($@);
-		my @args = (
-			pages => "internal($params{page}/_comment_*)",
-			template => PLUGIN . "_display",
-			show => 0,
-			reverse => "yes",
-			# special stuff passed through
-			page => $params{page},
-			destpage => $params{destpage},
-			preview => $params{preview},
-		);
-		push @args, atom => $params{atom} if defined $params{atom};
-		push @args, rss => $params{rss} if defined $params{rss};
-		push @args, feeds => $params{feeds} if defined $params{feeds};
-		push @args, feedshow => $params{feedshow} if defined $params{feedshow};
-		push @args, timeformat => $params{timeformat} if defined $params{timeformat};
-		push @args, feedonly => $params{feedonly} if defined $params{feedonly};
-		$posts = "\n" . IkiWiki::preprocess_inline(@args);
-	}
-
-	return $formtemplate->output . $posts;
-} # }}}
-
-# FIXME: logic taken from editpage, should be common code?
-sub getcgiuser ($) { # {{{
-	my $session = shift;
-	my $user = $session->param('name');
-	$user = $ENV{REMOTE_ADDR} unless defined $user;
-	debug("getcgiuser() -> $user");
-	return $user;
-} # }}}
-
-# FIXME: logic adapted from recentchanges, should be common code?
-sub linkuser ($) { # {{{
-	my $user = shift;
-	my $oiduser = eval { IkiWiki::openiduser($user) };
-
-	if (defined $oiduser) {
-		return ($user, $oiduser);
-	}
-	else {
-		my $page = bestlink('', (length $config{userdir}
-				? "$config{userdir}/"
-				: "").$user);
-		return (urlto($page, undef, 1), $user);
-	}
-} # }}}
-
-# FIXME: taken from IkiWiki::Plugin::editpage, should be common?
-sub checksessionexpiry ($$) { # {{{
-	my $session = shift;
-	my $sid = shift;
-
-	if (defined $session->param("name")) {
-		if (! defined $sid || $sid ne $session->id) {
-			error(gettext("Your login session has expired."));
-		}
-	}
-} # }}}
-
-# Mostly cargo-culted from IkiWiki::plugin::editpage
-sub sessioncgi ($$) { #{{{
-	my $cgi=shift;
-	my $session=shift;
-
-	my $do = $cgi->param('do');
-	return unless $do eq PLUGIN;
-
-	IkiWiki::decode_cgi_utf8($cgi);
-
-	eval q{use CGI::FormBuilder};
-	error($@) if $@;
-
-	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
-	my $form = CGI::FormBuilder->new(
-		fields => [qw{do sid page subject body}],
-		charset => 'utf-8',
-		method => 'POST',
-		required => [qw{body}],
-		javascript => 0,
-		params => $cgi,
-		action => $config{cgiurl},
-		header => 0,
-		table => 0,
-		template => scalar IkiWiki::template_params(PLUGIN . '_form.tmpl'),
-		# wtf does this do in editpage?
-		wikiname => $config{wikiname},
-	);
-
-	IkiWiki::decode_form_utf8($form);
-	IkiWiki::run_hooks(formbuilder_setup => sub {
-			shift->(title => PLUGIN, form => $form, cgi => $cgi,
-				session => $session, buttons => \@buttons);
-		});
-	IkiWiki::decode_form_utf8($form);
-
-	$form->field(name => 'do', type => 'hidden');
-	$form->field(name => 'sid', type => 'hidden', value => $session->id,
-		force => 1);
-	$form->field(name => 'page', type => 'hidden');
-	$form->field(name => 'subject', type => 'text', size => 72);
-	$form->field(name => 'body', type => 'textarea', rows => 5,
-		cols => 80);
-
-	# The untaint is OK (as in editpage) because we're about to pass
-	# it to file_pruned anyway
-	my $page = $form->field('page');
-	$page = IkiWiki::possibly_foolish_untaint($page);
-	if (!defined $page || !length $page ||
-		IkiWiki::file_pruned($page, $config{srcdir})) {
-		error(gettext("bad page name"));
-	}
-
-	my $allow_directives = $pagestate{$page}{PLUGIN()}{allowdirectives};
-	my $allow_html = $pagestate{$page}{PLUGIN()}{allowdirectives};
-	my $commit_comments = defined $pagestate{$page}{PLUGIN()}{commit}
-		? $pagestate{$page}{PLUGIN()}{commit}
-		: 1;
-
-	# FIXME: is this right? Or should we be using the candidate subpage
-	# (whatever that might mean) as the base URL?
-	my $baseurl = urlto($page, undef, 1);
-
-	$form->title(sprintf(gettext("commenting on %s"),
-			IkiWiki::pagetitle($page)));
-
-	$form->tmpl_param('helponformattinglink',
-		htmllink($page, $page, 'ikiwiki/formatting',
-			noimageinline => 1,
-			linktext => 'FormattingHelp'),
-			allowhtml => $allow_html,
-			allowdirectives => $allow_directives);
-
-	if (not exists $pagesources{$page}) {
-		error(sprintf(gettext(
-			"page '%s' doesn't exist, so you can't comment"),
-			$page));
-	}
-	if (not $pagestate{$page}{PLUGIN()}{comments}) {
-		error(sprintf(gettext(
-			"comments are not enabled on page '%s'"),
-			$page));
-	}
-
-	if ($form->submitted eq CANCEL) {
-		# bounce back to the page they wanted to comment on, and exit.
-		# CANCEL need not be considered in future
-		IkiWiki::redirect($cgi, urlto($page, undef, 1));
-		exit;
-	}
-
-	IkiWiki::check_canedit($page . "[" . PLUGIN . "]", $cgi, $session);
-
-	my ($authorurl, $author) = linkuser(getcgiuser($session));
-
-	my $body = $form->field('body') || '';
-	$body =~ s/\r\n/\n/g;
-	$body =~ s/\r/\n/g;
-	$body = "\n" if $body !~ /\n$/;
-
-	unless ($allow_directives) {
-		# don't allow new-style directives at all
-		$body =~ s/(^|[^\\])\[\[!/$1\\[[!/g;
-
-		# don't allow [[ unless it begins an old-style
-		# wikilink, if prefix_directives is off
-		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1\\[[!/g
-			unless $config{prefix_directives};
-	}
-
-	unless ($allow_html) {
-		$body =~ s/&(\w|#)/&amp;$1/g;
-		$body =~ s/</&lt;/g;
-		$body =~ s/>/&gt;/g;
-	}
-
-	# In this template, the [[!meta]] directives should stay at the end,
-	# so that they will override anything the user specifies. (For
-	# instance, [[!meta author="I can fake the author"]]...)
-	my $content_tmpl = template(PLUGIN . '_comment.tmpl');
-	$content_tmpl->param(author => $author);
-	$content_tmpl->param(authorurl => $authorurl);
-	$content_tmpl->param(subject => $form->field('subject'));
-	$content_tmpl->param(body => $body);
-
-	my $content = $content_tmpl->output;
-
-	# This is essentially a simplified version of editpage:
-	# - the user does not control the page that's created, only the parent
-	# - it's always a create operation, never an edit
-	# - this means that conflicts should never happen
-	# - this means that if they do, rocks fall and everyone dies
-
-	if ($form->submitted eq PREVIEW) {
-		# $fake is a location that has the same number of slashes
-		# as the eventual location of this comment.
-		my $fake = "$page/_" . PLUGIN . "hypothetical";
-		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
-				IkiWiki::linkify($page, $page,
-					IkiWiki::preprocess($page, $page,
-						IkiWiki::filter($fake, $page,
-							$content),
-						0, 1)));
-		IkiWiki::run_hooks(format => sub {
-				$preview = shift->(page => $page,
-					content => $preview);
-			});
-
-		my $template = template(PLUGIN . "_display.tmpl");
-		$template->param(content => $preview);
-		$template->param(title => $form->field('subject'));
-		$template->param(ctime => displaytime(time));
-		$template->param(author => $author);
-		$template->param(authorurl => $authorurl);
-
-		$form->tmpl_param(page_preview => $template->output);
-	}
-	else {
-		$form->tmpl_param(page_preview => "");
-	}
-
-	if ($form->submitted eq POST_COMMENT && $form->validate) {
-		# Let's get posting. We don't check_canedit here because
-		# that somewhat defeats the point of this plugin.
-
-		checksessionexpiry($session, $cgi->param('sid'));
-
-		# FIXME: check that the wiki is locked right now, because
-		# if it's not, there are mad race conditions!
-
-		# FIXME: rather a simplistic way to make the comments...
-		my $i = 0;
-		my $file;
-		do {
-			$i++;
-			$file = "$page/_comment_${i}._" . PLUGIN;
-		} while (-e "$config{srcdir}/$file");
-
-		# FIXME: could probably do some sort of graceful retry
-		# if I could be bothered
-		writefile($file, $config{srcdir}, $content);
-
-		my $conflict;
-
-		if ($config{rcs} and $commit_comments) {
-			my $message = gettext("Added a comment");
-			if (defined $form->field('subject') &&
-				length $form->field('subject')) {
-				$message .= ": ".$form->field('subject');
-			}
-
-			IkiWiki::rcs_add($file);
-			IkiWiki::disable_commit_hook();
-			$conflict = IkiWiki::rcs_commit_staged($message,
-				$session->param('name'), $ENV{REMOTE_ADDR});
-			IkiWiki::enable_commit_hook();
-			IkiWiki::rcs_update();
-		}
-
-		# Now we need a refresh
-		require IkiWiki::Render;
-		IkiWiki::refresh();
-		IkiWiki::saveindex();
-
-		# this should never happen, unless a committer deliberately
-		# breaks it or something
-		error($conflict) if defined $conflict;
-
-		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/_comment_$i";
-		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
-	}
-	else {
-		IkiWiki::showform ($form, \@buttons, $session, $cgi,
-			forcebaseurl => $baseurl);
-	}
-
-	exit;
-} #}}}
-
-package IkiWiki::PageSpec;
-
-sub match_smcvpostcomment ($$;@) {
-	my $page = shift;
-	my $glob = shift;
-
-	unless ($page =~ s/\[smcvpostcomment\]$//) {
-		return IkiWiki::FailReason->new("not posting a comment");
-	}
-	return match_glob($page, $glob);
-}
-
-1
diff --git a/doc/style.css b/doc/style.css
index 896ac2b01..21ea9492c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -373,7 +373,7 @@ span.color {
 	padding: 2px;
 }
 
-.smcvpostcomment-display .author { font-weight: bold; }
-.smcvpostcomment-display { border: 1px inset #999; margin: 3px; padding: 3px; }
-.smcvpostcomment-header { font-style: italic; }
-.smcvpostcomment-subject { font-weight: bold; border-bottom: 1px solid #999; }
+.postcomment-display .author { font-weight: bold; }
+.postcomment-display { border: 1px inset #999; margin: 3px; padding: 3px; }
+.postcomment-header { font-style: italic; }
+.postcomment-subject { font-weight: bold; border-bottom: 1px solid #999; }
diff --git a/templates/postcomment_comment.tmpl b/templates/postcomment_comment.tmpl
new file mode 100644
index 000000000..8c89458f3
--- /dev/null
+++ b/templates/postcomment_comment.tmpl
@@ -0,0 +1,10 @@
+<TMPL_VAR BODY>
+<TMPL_IF NAME="SUBJECT">
+[[!meta title="<TMPL_VAR NAME="SUBJECT" ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF NAME="AUTHOR">
+[[!meta author="<TMPL_VAR NAME="AUTHOR" ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF NAME="AUTHORURL">
+[[!meta authorurl="<TMPL_VAR NAME="AUTHORURL" ESCAPE=HTML>"]]
+</TMPL_IF>
diff --git a/templates/postcomment_display.tmpl b/templates/postcomment_display.tmpl
new file mode 100644
index 000000000..d3eabb3a1
--- /dev/null
+++ b/templates/postcomment_display.tmpl
@@ -0,0 +1,24 @@
+<div class="postcomment-display">
+
+<div class="postcomment-header">
+Posted by
+<TMPL_IF NAME="AUTHOR">
+<span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR NAME=AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+
+(<TMPL_VAR CTIME>)
+</div>
+
+<div class="postcomment-subject"><TMPL_VAR TITLE></div>
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+</div><!--.postcomment-display-->
diff --git a/templates/postcomment_embed.tmpl b/templates/postcomment_embed.tmpl
new file mode 100644
index 000000000..eae741214
--- /dev/null
+++ b/templates/postcomment_embed.tmpl
@@ -0,0 +1,7 @@
+<div class="postcomment-embed">
+<TMPL_IF NAME=DISABLED>
+[Posting comments disabled: <TMPL_VAR NAME=DISABLED>]
+<TMPL_ELSE>
+<a href="<TMPL_VAR CGIURL ESCAPE=HTML>?do=postcomment&amp;page=<TMPL_VAR PAGE ESCAPE=URL>">Post a comment</a>
+</TMPL_IF>
+</div>
diff --git a/templates/postcomment_form.tmpl b/templates/postcomment_form.tmpl
new file mode 100644
index 000000000..293f0f17e
--- /dev/null
+++ b/templates/postcomment_form.tmpl
@@ -0,0 +1,25 @@
+<div class="postcomment-form">
+<TMPL_VAR MESSAGE>
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
+<TMPL_VAR FIELD-PAGE>
+Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<TMPL_VAR FIELD-BODY><br />
+<TMPL_VAR FORM-SUBMIT><br />
+<TMPL_VAR HELPONFORMATTINGLINK><br />
+HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
+<TMPL_VAR NAME="FORM-END">
+
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Comment preview:</span>
+</div><!-- .header -->
+<div id="preview">
+<TMPL_VAR PAGE_PREVIEW>
+</div><!-- #preview -->
+</TMPL_IF>
+
+</div><!-- .postcomment-form -->
diff --git a/templates/smcvpostcomment_comment.tmpl b/templates/smcvpostcomment_comment.tmpl
deleted file mode 100644
index 8c89458f3..000000000
--- a/templates/smcvpostcomment_comment.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<TMPL_VAR BODY>
-<TMPL_IF NAME="SUBJECT">
-[[!meta title="<TMPL_VAR NAME="SUBJECT" ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="AUTHOR">
-[[!meta author="<TMPL_VAR NAME="AUTHOR" ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="AUTHORURL">
-[[!meta authorurl="<TMPL_VAR NAME="AUTHORURL" ESCAPE=HTML>"]]
-</TMPL_IF>
diff --git a/templates/smcvpostcomment_display.tmpl b/templates/smcvpostcomment_display.tmpl
deleted file mode 100644
index 1b67f9094..000000000
--- a/templates/smcvpostcomment_display.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="smcvpostcomment-display">
-
-<div class="smcvpostcomment-header">
-Posted by
-<TMPL_IF NAME="AUTHOR">
-<span class="author">
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
-<TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
-</TMPL_IF>
-</span>
-</TMPL_IF>
-
-(<TMPL_VAR CTIME>)
-</div>
-
-<div class="smcvpostcomment-subject"><TMPL_VAR TITLE></div>
-
-<div class="inlinecontent">
-<TMPL_VAR CONTENT>
-</div>
-
-</div><!--.smcvpostcomment-display-->
diff --git a/templates/smcvpostcomment_embed.tmpl b/templates/smcvpostcomment_embed.tmpl
deleted file mode 100644
index db35e4da7..000000000
--- a/templates/smcvpostcomment_embed.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="smcvpostcomment-embed">
-<TMPL_IF NAME=DISABLED>
-[Posting comments disabled: <TMPL_VAR NAME=DISABLED>]
-<TMPL_ELSE>
-<a href="<TMPL_VAR CGIURL ESCAPE=HTML>?do=smcvpostcomment&amp;page=<TMPL_VAR PAGE ESCAPE=URL>">Post a comment</a>
-</TMPL_IF>
-</div>
diff --git a/templates/smcvpostcomment_form.tmpl b/templates/smcvpostcomment_form.tmpl
deleted file mode 100644
index 43fc9b65a..000000000
--- a/templates/smcvpostcomment_form.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="smcvpostcomment-form">
-<TMPL_VAR MESSAGE>
-<TMPL_VAR FORM-START>
-<TMPL_VAR FIELD-DO>
-<TMPL_VAR FIELD-SID>
-<TMPL_VAR FIELD-PAGE>
-Subject: <TMPL_VAR FIELD-SUBJECT><br />
-<TMPL_VAR FIELD-BODY><br />
-<TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK><br />
-HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
-IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
-<TMPL_VAR NAME="FORM-END">
-
-<TMPL_IF NAME="PAGE_PREVIEW">
-<hr />
-<div class="header">
-<span>Comment preview:</span>
-</div><!-- .header -->
-<div id="preview">
-<TMPL_VAR PAGE_PREVIEW>
-</div><!-- #preview -->
-</TMPL_IF>
-
-</div><!-- .smcvpostcomment-form -->
-- 
cgit v1.2.3


From 3d4aa065d6a689a017c98e7ea8b80da0b65ae361 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 10:17:18 +0000
Subject: postcomment: Rename plugin to comments, use *._comment files

The PageSpec is still called "postcomment" since that's what it means.
---
 IkiWiki/Plugin/comments.pm         | 369 ++++++++++++++++++++++++++++++++++++
 IkiWiki/Plugin/postcomment.pm      | 371 -------------------------------------
 doc/style.css                      |   8 +-
 templates/comments_comment.tmpl    |  10 +
 templates/comments_display.tmpl    |  24 +++
 templates/comments_embed.tmpl      |   7 +
 templates/comments_form.tmpl       |  25 +++
 templates/postcomment_comment.tmpl |  10 -
 templates/postcomment_display.tmpl |  24 ---
 templates/postcomment_embed.tmpl   |   7 -
 templates/postcomment_form.tmpl    |  25 ---
 11 files changed, 439 insertions(+), 441 deletions(-)
 create mode 100644 IkiWiki/Plugin/comments.pm
 delete mode 100644 IkiWiki/Plugin/postcomment.pm
 create mode 100644 templates/comments_comment.tmpl
 create mode 100644 templates/comments_display.tmpl
 create mode 100644 templates/comments_embed.tmpl
 create mode 100644 templates/comments_form.tmpl
 delete mode 100644 templates/postcomment_comment.tmpl
 delete mode 100644 templates/postcomment_display.tmpl
 delete mode 100644 templates/postcomment_embed.tmpl
 delete mode 100644 templates/postcomment_form.tmpl

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
new file mode 100644
index 000000000..b57735545
--- /dev/null
+++ b/IkiWiki/Plugin/comments.pm
@@ -0,0 +1,369 @@
+#!/usr/bin/perl
+# Copyright © 2006-2008 Joey Hess <joey@ikiwiki.info>
+# Copyright © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+# Licensed under the GNU GPL, version 2, or any later version published by the
+# Free Software Foundation
+package IkiWiki::Plugin::comments;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+use constant PREVIEW => "Preview";
+use constant POST_COMMENT => "Post comment";
+use constant CANCEL => "Cancel";
+
+sub import { #{{{
+	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
+	hook(type => "preprocess", id => 'comments', call => \&preprocess);
+	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
+	hook(type => "htmlize", id => "_comment",
+		call => \&IkiWiki::Plugin::mdwn::htmlize);
+	IkiWiki::loadplugin("inline");
+	IkiWiki::loadplugin("mdwn");
+} # }}}
+
+sub htmlize { # {{{
+	eval { use IkiWiki::Plugin::mdwn; };
+	error($@) if ($@);
+	return IkiWiki::Plugin::mdwn::htmlize(@_)
+} # }}}
+
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
+# Somewhat based on IkiWiki::Plugin::inline blog posting support
+sub preprocess (@) { #{{{
+	my %params=@_;
+
+	unless (length $config{cgiurl}) {
+		error(gettext("[[!comments plugin requires CGI enabled]]"));
+	}
+
+	my $page = $params{page};
+	$pagestate{$page}{comments}{comments} = defined $params{closed}
+		? (not IkiWiki::yesno($params{closed}))
+		: 1;
+	$pagestate{$page}{comments}{allowhtml} = IkiWiki::yesno($params{allowhtml});
+	$pagestate{$page}{comments}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
+	$pagestate{$page}{comments}{commit} = defined $params{commit}
+		? IkiWiki::yesno($params{commit})
+		: 1;
+
+	my $formtemplate = IkiWiki::template("comments_embed.tmpl",
+		blind_cache => 1);
+	$formtemplate->param(cgiurl => $config{cgiurl});
+	$formtemplate->param(page => $params{page});
+
+	if (not $pagestate{$page}{comments}{comments}) {
+		$formtemplate->param("disabled" =>
+			gettext('comments are closed'));
+	}
+	elsif ($params{preview}) {
+		$formtemplate->param("disabled" =>
+			gettext('not available during Preview'));
+	}
+
+	debug("page $params{page} => destpage $params{destpage}");
+
+	my $posts = '';
+	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
+		eval { use IkiWiki::Plugin::inline; };
+		error($@) if ($@);
+		my @args = (
+			pages => "internal($params{page}/_comment_*)",
+			template => "comments_display",
+			show => 0,
+			reverse => "yes",
+			# special stuff passed through
+			page => $params{page},
+			destpage => $params{destpage},
+			preview => $params{preview},
+		);
+		push @args, atom => $params{atom} if defined $params{atom};
+		push @args, rss => $params{rss} if defined $params{rss};
+		push @args, feeds => $params{feeds} if defined $params{feeds};
+		push @args, feedshow => $params{feedshow} if defined $params{feedshow};
+		push @args, timeformat => $params{timeformat} if defined $params{timeformat};
+		push @args, feedonly => $params{feedonly} if defined $params{feedonly};
+		$posts = "\n" . IkiWiki::preprocess_inline(@args);
+	}
+
+	return $formtemplate->output . $posts;
+} # }}}
+
+# FIXME: logic taken from editpage, should be common code?
+sub getcgiuser ($) { # {{{
+	my $session = shift;
+	my $user = $session->param('name');
+	$user = $ENV{REMOTE_ADDR} unless defined $user;
+	debug("getcgiuser() -> $user");
+	return $user;
+} # }}}
+
+# FIXME: logic adapted from recentchanges, should be common code?
+sub linkuser ($) { # {{{
+	my $user = shift;
+	my $oiduser = eval { IkiWiki::openiduser($user) };
+
+	if (defined $oiduser) {
+		return ($user, $oiduser);
+	}
+	else {
+		my $page = bestlink('', (length $config{userdir}
+				? "$config{userdir}/"
+				: "").$user);
+		return (urlto($page, undef, 1), $user);
+	}
+} # }}}
+
+# FIXME: taken from IkiWiki::Plugin::editpage, should be common?
+sub checksessionexpiry ($$) { # {{{
+	my $session = shift;
+	my $sid = shift;
+
+	if (defined $session->param("name")) {
+		if (! defined $sid || $sid ne $session->id) {
+			error(gettext("Your login session has expired."));
+		}
+	}
+} # }}}
+
+# Mostly cargo-culted from IkiWiki::plugin::editpage
+sub sessioncgi ($$) { #{{{
+	my $cgi=shift;
+	my $session=shift;
+
+	my $do = $cgi->param('do');
+	return unless $do eq 'comment';
+
+	IkiWiki::decode_cgi_utf8($cgi);
+
+	eval q{use CGI::FormBuilder};
+	error($@) if $@;
+
+	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
+	my $form = CGI::FormBuilder->new(
+		fields => [qw{do sid page subject body}],
+		charset => 'utf-8',
+		method => 'POST',
+		required => [qw{body}],
+		javascript => 0,
+		params => $cgi,
+		action => $config{cgiurl},
+		header => 0,
+		table => 0,
+		template => scalar IkiWiki::template_params('comments_form.tmpl'),
+		# wtf does this do in editpage?
+		wikiname => $config{wikiname},
+	);
+
+	IkiWiki::decode_form_utf8($form);
+	IkiWiki::run_hooks(formbuilder_setup => sub {
+			shift->(title => "comment", form => $form, cgi => $cgi,
+				session => $session, buttons => \@buttons);
+		});
+	IkiWiki::decode_form_utf8($form);
+
+	$form->field(name => 'do', type => 'hidden');
+	$form->field(name => 'sid', type => 'hidden', value => $session->id,
+		force => 1);
+	$form->field(name => 'page', type => 'hidden');
+	$form->field(name => 'subject', type => 'text', size => 72);
+	$form->field(name => 'body', type => 'textarea', rows => 5,
+		cols => 80);
+
+	# The untaint is OK (as in editpage) because we're about to pass
+	# it to file_pruned anyway
+	my $page = $form->field('page');
+	$page = IkiWiki::possibly_foolish_untaint($page);
+	if (!defined $page || !length $page ||
+		IkiWiki::file_pruned($page, $config{srcdir})) {
+		error(gettext("bad page name"));
+	}
+
+	my $allow_directives = $pagestate{$page}{comments}{allowdirectives};
+	my $allow_html = $pagestate{$page}{comments}{allowdirectives};
+	my $commit_comments = defined $pagestate{$page}{comments}{commit}
+		? $pagestate{$page}{comments}{commit}
+		: 1;
+
+	# FIXME: is this right? Or should we be using the candidate subpage
+	# (whatever that might mean) as the base URL?
+	my $baseurl = urlto($page, undef, 1);
+
+	$form->title(sprintf(gettext("commenting on %s"),
+			IkiWiki::pagetitle($page)));
+
+	$form->tmpl_param('helponformattinglink',
+		htmllink($page, $page, 'ikiwiki/formatting',
+			noimageinline => 1,
+			linktext => 'FormattingHelp'),
+			allowhtml => $allow_html,
+			allowdirectives => $allow_directives);
+
+	if (not exists $pagesources{$page}) {
+		error(sprintf(gettext(
+			"page '%s' doesn't exist, so you can't comment"),
+			$page));
+	}
+	if (not $pagestate{$page}{comments}{comments}) {
+		error(sprintf(gettext(
+			"comments are not enabled on page '%s'"),
+			$page));
+	}
+
+	if ($form->submitted eq CANCEL) {
+		# bounce back to the page they wanted to comment on, and exit.
+		# CANCEL need not be considered in future
+		IkiWiki::redirect($cgi, urlto($page, undef, 1));
+		exit;
+	}
+
+	IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
+
+	my ($authorurl, $author) = linkuser(getcgiuser($session));
+
+	my $body = $form->field('body') || '';
+	$body =~ s/\r\n/\n/g;
+	$body =~ s/\r/\n/g;
+	$body = "\n" if $body !~ /\n$/;
+
+	unless ($allow_directives) {
+		# don't allow new-style directives at all
+		$body =~ s/(^|[^\\])\[\[!/$1\\[[!/g;
+
+		# don't allow [[ unless it begins an old-style
+		# wikilink, if prefix_directives is off
+		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1\\[[!/g
+			unless $config{prefix_directives};
+	}
+
+	unless ($allow_html) {
+		$body =~ s/&(\w|#)/&amp;$1/g;
+		$body =~ s/</&lt;/g;
+		$body =~ s/>/&gt;/g;
+	}
+
+	# In this template, the [[!meta]] directives should stay at the end,
+	# so that they will override anything the user specifies. (For
+	# instance, [[!meta author="I can fake the author"]]...)
+	my $content_tmpl = template('comments_comment.tmpl');
+	$content_tmpl->param(author => $author);
+	$content_tmpl->param(authorurl => $authorurl);
+	$content_tmpl->param(subject => $form->field('subject'));
+	$content_tmpl->param(body => $body);
+
+	my $content = $content_tmpl->output;
+
+	# This is essentially a simplified version of editpage:
+	# - the user does not control the page that's created, only the parent
+	# - it's always a create operation, never an edit
+	# - this means that conflicts should never happen
+	# - this means that if they do, rocks fall and everyone dies
+
+	if ($form->submitted eq PREVIEW) {
+		# $fake is a location that has the same number of slashes
+		# as the eventual location of this comment.
+		my $fake = "$page/_comments_hypothetical";
+		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
+				IkiWiki::linkify($page, $page,
+					IkiWiki::preprocess($page, $page,
+						IkiWiki::filter($fake, $page,
+							$content),
+						0, 1)));
+		IkiWiki::run_hooks(format => sub {
+				$preview = shift->(page => $page,
+					content => $preview);
+			});
+
+		my $template = template("comments_display.tmpl");
+		$template->param(content => $preview);
+		$template->param(title => $form->field('subject'));
+		$template->param(ctime => displaytime(time));
+		$template->param(author => $author);
+		$template->param(authorurl => $authorurl);
+
+		$form->tmpl_param(page_preview => $template->output);
+	}
+	else {
+		$form->tmpl_param(page_preview => "");
+	}
+
+	if ($form->submitted eq POST_COMMENT && $form->validate) {
+		# Let's get posting. We don't check_canedit here because
+		# that somewhat defeats the point of this plugin.
+
+		checksessionexpiry($session, $cgi->param('sid'));
+
+		# FIXME: check that the wiki is locked right now, because
+		# if it's not, there are mad race conditions!
+
+		# FIXME: rather a simplistic way to make the comments...
+		my $i = 0;
+		my $file;
+		do {
+			$i++;
+			$file = "$page/_comment_${i}._comment";
+		} while (-e "$config{srcdir}/$file");
+
+		# FIXME: could probably do some sort of graceful retry
+		# if I could be bothered
+		writefile($file, $config{srcdir}, $content);
+
+		my $conflict;
+
+		if ($config{rcs} and $commit_comments) {
+			my $message = gettext("Added a comment");
+			if (defined $form->field('subject') &&
+				length $form->field('subject')) {
+				$message .= ": ".$form->field('subject');
+			}
+
+			IkiWiki::rcs_add($file);
+			IkiWiki::disable_commit_hook();
+			$conflict = IkiWiki::rcs_commit_staged($message,
+				$session->param('name'), $ENV{REMOTE_ADDR});
+			IkiWiki::enable_commit_hook();
+			IkiWiki::rcs_update();
+		}
+
+		# Now we need a refresh
+		require IkiWiki::Render;
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
+
+		# this should never happen, unless a committer deliberately
+		# breaks it or something
+		error($conflict) if defined $conflict;
+
+		# Bounce back to where we were, but defeat broken caches
+		my $anticache = "?updated=$page/_comment_$i";
+		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
+	}
+	else {
+		IkiWiki::showform ($form, \@buttons, $session, $cgi,
+			forcebaseurl => $baseurl);
+	}
+
+	exit;
+} #}}}
+
+package IkiWiki::PageSpec;
+
+sub match_postcomment ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+
+	unless ($page =~ s/\[postcomment\]$//) {
+		return IkiWiki::FailReason->new("not posting a comment");
+	}
+	return match_glob($page, $glob);
+}
+
+1
diff --git a/IkiWiki/Plugin/postcomment.pm b/IkiWiki/Plugin/postcomment.pm
deleted file mode 100644
index 480ca58a5..000000000
--- a/IkiWiki/Plugin/postcomment.pm
+++ /dev/null
@@ -1,371 +0,0 @@
-#!/usr/bin/perl
-# Copyright © 2006-2008 Joey Hess <joey@ikiwiki.info>
-# Copyright © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
-# Licensed under the GNU GPL, version 2, or any later version published by the
-# Free Software Foundation
-package IkiWiki::Plugin::postcomment;
-
-use warnings;
-use strict;
-use IkiWiki 2.00;
-
-use constant PLUGIN => "postcomment";
-use constant PREVIEW => "Preview";
-use constant POST_COMMENT => "Post comment";
-use constant CANCEL => "Cancel";
-
-sub import { #{{{
-	hook(type => "getsetup", id => PLUGIN,  call => \&getsetup);
-	hook(type => "preprocess", id => PLUGIN, call => \&preprocess);
-	hook(type => "sessioncgi", id => PLUGIN, call => \&sessioncgi);
-	hook(type => "htmlize", id => "_".PLUGIN,
-		call => \&IkiWiki::Plugin::mdwn::htmlize);
-	IkiWiki::loadplugin("inline");
-	IkiWiki::loadplugin("mdwn");
-} # }}}
-
-sub htmlize { # {{{
-	eval { use IkiWiki::Plugin::mdwn; };
-	error($@) if ($@);
-	return IkiWiki::Plugin::mdwn::htmlize(@_)
-} # }}}
-
-sub getsetup () { #{{{
-	return
-		plugin => {
-			safe => 1,
-			rebuild => undef,
-		},
-} #}}}
-
-# Somewhat based on IkiWiki::Plugin::inline blog posting support
-sub preprocess (@) { #{{{
-	my %params=@_;
-
-	unless (length $config{cgiurl}) {
-		error(sprintf (gettext("[[!%s plugin requires CGI enabled]]"),
-			PLUGIN));
-	}
-
-	my $page = $params{page};
-	$pagestate{$page}{PLUGIN()}{comments} = defined $params{closed}
-		? (not IkiWiki::yesno($params{closed}))
-		: 1;
-	$pagestate{$page}{PLUGIN()}{allowhtml} = IkiWiki::yesno($params{allowhtml});
-	$pagestate{$page}{PLUGIN()}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
-	$pagestate{$page}{PLUGIN()}{commit} = defined $params{commit}
-		? IkiWiki::yesno($params{commit})
-		: 1;
-
-	my $formtemplate = IkiWiki::template(PLUGIN . "_embed.tmpl",
-		blind_cache => 1);
-	$formtemplate->param(cgiurl => $config{cgiurl});
-	$formtemplate->param(page => $params{page});
-
-	if (not $pagestate{$page}{PLUGIN()}{comments}) {
-		$formtemplate->param("disabled" =>
-			gettext('comments are closed'));
-	}
-	elsif ($params{preview}) {
-		$formtemplate->param("disabled" =>
-			gettext('not available during Preview'));
-	}
-
-	debug("page $params{page} => destpage $params{destpage}");
-
-	my $posts = '';
-	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
-		eval { use IkiWiki::Plugin::inline; };
-		error($@) if ($@);
-		my @args = (
-			pages => "internal($params{page}/_comment_*)",
-			template => PLUGIN . "_display",
-			show => 0,
-			reverse => "yes",
-			# special stuff passed through
-			page => $params{page},
-			destpage => $params{destpage},
-			preview => $params{preview},
-		);
-		push @args, atom => $params{atom} if defined $params{atom};
-		push @args, rss => $params{rss} if defined $params{rss};
-		push @args, feeds => $params{feeds} if defined $params{feeds};
-		push @args, feedshow => $params{feedshow} if defined $params{feedshow};
-		push @args, timeformat => $params{timeformat} if defined $params{timeformat};
-		push @args, feedonly => $params{feedonly} if defined $params{feedonly};
-		$posts = "\n" . IkiWiki::preprocess_inline(@args);
-	}
-
-	return $formtemplate->output . $posts;
-} # }}}
-
-# FIXME: logic taken from editpage, should be common code?
-sub getcgiuser ($) { # {{{
-	my $session = shift;
-	my $user = $session->param('name');
-	$user = $ENV{REMOTE_ADDR} unless defined $user;
-	debug("getcgiuser() -> $user");
-	return $user;
-} # }}}
-
-# FIXME: logic adapted from recentchanges, should be common code?
-sub linkuser ($) { # {{{
-	my $user = shift;
-	my $oiduser = eval { IkiWiki::openiduser($user) };
-
-	if (defined $oiduser) {
-		return ($user, $oiduser);
-	}
-	else {
-		my $page = bestlink('', (length $config{userdir}
-				? "$config{userdir}/"
-				: "").$user);
-		return (urlto($page, undef, 1), $user);
-	}
-} # }}}
-
-# FIXME: taken from IkiWiki::Plugin::editpage, should be common?
-sub checksessionexpiry ($$) { # {{{
-	my $session = shift;
-	my $sid = shift;
-
-	if (defined $session->param("name")) {
-		if (! defined $sid || $sid ne $session->id) {
-			error(gettext("Your login session has expired."));
-		}
-	}
-} # }}}
-
-# Mostly cargo-culted from IkiWiki::plugin::editpage
-sub sessioncgi ($$) { #{{{
-	my $cgi=shift;
-	my $session=shift;
-
-	my $do = $cgi->param('do');
-	return unless $do eq PLUGIN;
-
-	IkiWiki::decode_cgi_utf8($cgi);
-
-	eval q{use CGI::FormBuilder};
-	error($@) if $@;
-
-	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
-	my $form = CGI::FormBuilder->new(
-		fields => [qw{do sid page subject body}],
-		charset => 'utf-8',
-		method => 'POST',
-		required => [qw{body}],
-		javascript => 0,
-		params => $cgi,
-		action => $config{cgiurl},
-		header => 0,
-		table => 0,
-		template => scalar IkiWiki::template_params(PLUGIN . '_form.tmpl'),
-		# wtf does this do in editpage?
-		wikiname => $config{wikiname},
-	);
-
-	IkiWiki::decode_form_utf8($form);
-	IkiWiki::run_hooks(formbuilder_setup => sub {
-			shift->(title => PLUGIN, form => $form, cgi => $cgi,
-				session => $session, buttons => \@buttons);
-		});
-	IkiWiki::decode_form_utf8($form);
-
-	$form->field(name => 'do', type => 'hidden');
-	$form->field(name => 'sid', type => 'hidden', value => $session->id,
-		force => 1);
-	$form->field(name => 'page', type => 'hidden');
-	$form->field(name => 'subject', type => 'text', size => 72);
-	$form->field(name => 'body', type => 'textarea', rows => 5,
-		cols => 80);
-
-	# The untaint is OK (as in editpage) because we're about to pass
-	# it to file_pruned anyway
-	my $page = $form->field('page');
-	$page = IkiWiki::possibly_foolish_untaint($page);
-	if (!defined $page || !length $page ||
-		IkiWiki::file_pruned($page, $config{srcdir})) {
-		error(gettext("bad page name"));
-	}
-
-	my $allow_directives = $pagestate{$page}{PLUGIN()}{allowdirectives};
-	my $allow_html = $pagestate{$page}{PLUGIN()}{allowdirectives};
-	my $commit_comments = defined $pagestate{$page}{PLUGIN()}{commit}
-		? $pagestate{$page}{PLUGIN()}{commit}
-		: 1;
-
-	# FIXME: is this right? Or should we be using the candidate subpage
-	# (whatever that might mean) as the base URL?
-	my $baseurl = urlto($page, undef, 1);
-
-	$form->title(sprintf(gettext("commenting on %s"),
-			IkiWiki::pagetitle($page)));
-
-	$form->tmpl_param('helponformattinglink',
-		htmllink($page, $page, 'ikiwiki/formatting',
-			noimageinline => 1,
-			linktext => 'FormattingHelp'),
-			allowhtml => $allow_html,
-			allowdirectives => $allow_directives);
-
-	if (not exists $pagesources{$page}) {
-		error(sprintf(gettext(
-			"page '%s' doesn't exist, so you can't comment"),
-			$page));
-	}
-	if (not $pagestate{$page}{PLUGIN()}{comments}) {
-		error(sprintf(gettext(
-			"comments are not enabled on page '%s'"),
-			$page));
-	}
-
-	if ($form->submitted eq CANCEL) {
-		# bounce back to the page they wanted to comment on, and exit.
-		# CANCEL need not be considered in future
-		IkiWiki::redirect($cgi, urlto($page, undef, 1));
-		exit;
-	}
-
-	IkiWiki::check_canedit($page . "[" . PLUGIN . "]", $cgi, $session);
-
-	my ($authorurl, $author) = linkuser(getcgiuser($session));
-
-	my $body = $form->field('body') || '';
-	$body =~ s/\r\n/\n/g;
-	$body =~ s/\r/\n/g;
-	$body = "\n" if $body !~ /\n$/;
-
-	unless ($allow_directives) {
-		# don't allow new-style directives at all
-		$body =~ s/(^|[^\\])\[\[!/$1\\[[!/g;
-
-		# don't allow [[ unless it begins an old-style
-		# wikilink, if prefix_directives is off
-		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1\\[[!/g
-			unless $config{prefix_directives};
-	}
-
-	unless ($allow_html) {
-		$body =~ s/&(\w|#)/&amp;$1/g;
-		$body =~ s/</&lt;/g;
-		$body =~ s/>/&gt;/g;
-	}
-
-	# In this template, the [[!meta]] directives should stay at the end,
-	# so that they will override anything the user specifies. (For
-	# instance, [[!meta author="I can fake the author"]]...)
-	my $content_tmpl = template(PLUGIN . '_comment.tmpl');
-	$content_tmpl->param(author => $author);
-	$content_tmpl->param(authorurl => $authorurl);
-	$content_tmpl->param(subject => $form->field('subject'));
-	$content_tmpl->param(body => $body);
-
-	my $content = $content_tmpl->output;
-
-	# This is essentially a simplified version of editpage:
-	# - the user does not control the page that's created, only the parent
-	# - it's always a create operation, never an edit
-	# - this means that conflicts should never happen
-	# - this means that if they do, rocks fall and everyone dies
-
-	if ($form->submitted eq PREVIEW) {
-		# $fake is a location that has the same number of slashes
-		# as the eventual location of this comment.
-		my $fake = "$page/_" . PLUGIN . "hypothetical";
-		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
-				IkiWiki::linkify($page, $page,
-					IkiWiki::preprocess($page, $page,
-						IkiWiki::filter($fake, $page,
-							$content),
-						0, 1)));
-		IkiWiki::run_hooks(format => sub {
-				$preview = shift->(page => $page,
-					content => $preview);
-			});
-
-		my $template = template(PLUGIN . "_display.tmpl");
-		$template->param(content => $preview);
-		$template->param(title => $form->field('subject'));
-		$template->param(ctime => displaytime(time));
-		$template->param(author => $author);
-		$template->param(authorurl => $authorurl);
-
-		$form->tmpl_param(page_preview => $template->output);
-	}
-	else {
-		$form->tmpl_param(page_preview => "");
-	}
-
-	if ($form->submitted eq POST_COMMENT && $form->validate) {
-		# Let's get posting. We don't check_canedit here because
-		# that somewhat defeats the point of this plugin.
-
-		checksessionexpiry($session, $cgi->param('sid'));
-
-		# FIXME: check that the wiki is locked right now, because
-		# if it's not, there are mad race conditions!
-
-		# FIXME: rather a simplistic way to make the comments...
-		my $i = 0;
-		my $file;
-		do {
-			$i++;
-			$file = "$page/_comment_${i}._" . PLUGIN;
-		} while (-e "$config{srcdir}/$file");
-
-		# FIXME: could probably do some sort of graceful retry
-		# if I could be bothered
-		writefile($file, $config{srcdir}, $content);
-
-		my $conflict;
-
-		if ($config{rcs} and $commit_comments) {
-			my $message = gettext("Added a comment");
-			if (defined $form->field('subject') &&
-				length $form->field('subject')) {
-				$message .= ": ".$form->field('subject');
-			}
-
-			IkiWiki::rcs_add($file);
-			IkiWiki::disable_commit_hook();
-			$conflict = IkiWiki::rcs_commit_staged($message,
-				$session->param('name'), $ENV{REMOTE_ADDR});
-			IkiWiki::enable_commit_hook();
-			IkiWiki::rcs_update();
-		}
-
-		# Now we need a refresh
-		require IkiWiki::Render;
-		IkiWiki::refresh();
-		IkiWiki::saveindex();
-
-		# this should never happen, unless a committer deliberately
-		# breaks it or something
-		error($conflict) if defined $conflict;
-
-		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/_comment_$i";
-		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
-	}
-	else {
-		IkiWiki::showform ($form, \@buttons, $session, $cgi,
-			forcebaseurl => $baseurl);
-	}
-
-	exit;
-} #}}}
-
-package IkiWiki::PageSpec;
-
-sub match_postcomment ($$;@) {
-	my $page = shift;
-	my $glob = shift;
-
-	unless ($page =~ s/\[postcomment\]$//) {
-		return IkiWiki::FailReason->new("not posting a comment");
-	}
-	return match_glob($page, $glob);
-}
-
-1
diff --git a/doc/style.css b/doc/style.css
index 21ea9492c..70f31d325 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -373,7 +373,7 @@ span.color {
 	padding: 2px;
 }
 
-.postcomment-display .author { font-weight: bold; }
-.postcomment-display { border: 1px inset #999; margin: 3px; padding: 3px; }
-.postcomment-header { font-style: italic; }
-.postcomment-subject { font-weight: bold; border-bottom: 1px solid #999; }
+.comments-display .author { font-weight: bold; }
+.comments-display { border: 1px inset #999; margin: 3px; padding: 3px; }
+.comments-header { font-style: italic; }
+.comments-subject { font-weight: bold; border-bottom: 1px solid #999; }
diff --git a/templates/comments_comment.tmpl b/templates/comments_comment.tmpl
new file mode 100644
index 000000000..8c89458f3
--- /dev/null
+++ b/templates/comments_comment.tmpl
@@ -0,0 +1,10 @@
+<TMPL_VAR BODY>
+<TMPL_IF NAME="SUBJECT">
+[[!meta title="<TMPL_VAR NAME="SUBJECT" ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF NAME="AUTHOR">
+[[!meta author="<TMPL_VAR NAME="AUTHOR" ESCAPE=HTML>"]]
+</TMPL_IF>
+<TMPL_IF NAME="AUTHORURL">
+[[!meta authorurl="<TMPL_VAR NAME="AUTHORURL" ESCAPE=HTML>"]]
+</TMPL_IF>
diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
new file mode 100644
index 000000000..04e0613e0
--- /dev/null
+++ b/templates/comments_display.tmpl
@@ -0,0 +1,24 @@
+<div class="comments-display">
+
+<div class="comments-header">
+Posted by
+<TMPL_IF NAME="AUTHOR">
+<span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR NAME=AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+
+(<TMPL_VAR CTIME>)
+</div>
+
+<div class="comments-subject"><TMPL_VAR TITLE></div>
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+</div><!--.comments-display-->
diff --git a/templates/comments_embed.tmpl b/templates/comments_embed.tmpl
new file mode 100644
index 000000000..cbb9247f2
--- /dev/null
+++ b/templates/comments_embed.tmpl
@@ -0,0 +1,7 @@
+<div class="comments-embed">
+<TMPL_IF NAME=DISABLED>
+[Posting comments disabled: <TMPL_VAR NAME=DISABLED>]
+<TMPL_ELSE>
+<a href="<TMPL_VAR CGIURL ESCAPE=HTML>?do=comment&amp;page=<TMPL_VAR PAGE ESCAPE=URL>">Post a comment</a>
+</TMPL_IF>
+</div>
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
new file mode 100644
index 000000000..fbf49be34
--- /dev/null
+++ b/templates/comments_form.tmpl
@@ -0,0 +1,25 @@
+<div class="comments-form">
+<TMPL_VAR MESSAGE>
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
+<TMPL_VAR FIELD-PAGE>
+Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<TMPL_VAR FIELD-BODY><br />
+<TMPL_VAR FORM-SUBMIT><br />
+<TMPL_VAR HELPONFORMATTINGLINK><br />
+HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
+<TMPL_VAR NAME="FORM-END">
+
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Comment preview:</span>
+</div><!-- .header -->
+<div id="preview">
+<TMPL_VAR PAGE_PREVIEW>
+</div><!-- #preview -->
+</TMPL_IF>
+
+</div><!-- .comments-form -->
diff --git a/templates/postcomment_comment.tmpl b/templates/postcomment_comment.tmpl
deleted file mode 100644
index 8c89458f3..000000000
--- a/templates/postcomment_comment.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<TMPL_VAR BODY>
-<TMPL_IF NAME="SUBJECT">
-[[!meta title="<TMPL_VAR NAME="SUBJECT" ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="AUTHOR">
-[[!meta author="<TMPL_VAR NAME="AUTHOR" ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="AUTHORURL">
-[[!meta authorurl="<TMPL_VAR NAME="AUTHORURL" ESCAPE=HTML>"]]
-</TMPL_IF>
diff --git a/templates/postcomment_display.tmpl b/templates/postcomment_display.tmpl
deleted file mode 100644
index d3eabb3a1..000000000
--- a/templates/postcomment_display.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="postcomment-display">
-
-<div class="postcomment-header">
-Posted by
-<TMPL_IF NAME="AUTHOR">
-<span class="author">
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
-<TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
-</TMPL_IF>
-</span>
-</TMPL_IF>
-
-(<TMPL_VAR CTIME>)
-</div>
-
-<div class="postcomment-subject"><TMPL_VAR TITLE></div>
-
-<div class="inlinecontent">
-<TMPL_VAR CONTENT>
-</div>
-
-</div><!--.postcomment-display-->
diff --git a/templates/postcomment_embed.tmpl b/templates/postcomment_embed.tmpl
deleted file mode 100644
index eae741214..000000000
--- a/templates/postcomment_embed.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="postcomment-embed">
-<TMPL_IF NAME=DISABLED>
-[Posting comments disabled: <TMPL_VAR NAME=DISABLED>]
-<TMPL_ELSE>
-<a href="<TMPL_VAR CGIURL ESCAPE=HTML>?do=postcomment&amp;page=<TMPL_VAR PAGE ESCAPE=URL>">Post a comment</a>
-</TMPL_IF>
-</div>
diff --git a/templates/postcomment_form.tmpl b/templates/postcomment_form.tmpl
deleted file mode 100644
index 293f0f17e..000000000
--- a/templates/postcomment_form.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="postcomment-form">
-<TMPL_VAR MESSAGE>
-<TMPL_VAR FORM-START>
-<TMPL_VAR FIELD-DO>
-<TMPL_VAR FIELD-SID>
-<TMPL_VAR FIELD-PAGE>
-Subject: <TMPL_VAR FIELD-SUBJECT><br />
-<TMPL_VAR FIELD-BODY><br />
-<TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK><br />
-HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
-IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
-<TMPL_VAR NAME="FORM-END">
-
-<TMPL_IF NAME="PAGE_PREVIEW">
-<hr />
-<div class="header">
-<span>Comment preview:</span>
-</div><!-- .header -->
-<div id="preview">
-<TMPL_VAR PAGE_PREVIEW>
-</div><!-- #preview -->
-</TMPL_IF>
-
-</div><!-- .postcomment-form -->
-- 
cgit v1.2.3


From 57e40b9ce5345530f31f4d1b25a49ed18228a8dd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 10:25:10 +0000
Subject: Fix typo that led to comments being blanked

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index b57735545..9359e9487 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -232,7 +232,7 @@ sub sessioncgi ($$) { #{{{
 	my $body = $form->field('body') || '';
 	$body =~ s/\r\n/\n/g;
 	$body =~ s/\r/\n/g;
-	$body = "\n" if $body !~ /\n$/;
+	$body .= "\n" if $body !~ /\n$/;
 
 	unless ($allow_directives) {
 		# don't allow new-style directives at all
-- 
cgit v1.2.3


From ebe140201ed53ee4f8cf5998c69e20d5fef2ad16 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 10:29:16 +0000
Subject: comments: sanitize the body of each comment before posting it

This should ensure that users can't "break out" from the enclosing
<div>, making it impossible to forge comments (assuming htmlscrubber
is enabled, and so is either htmlbalance or htmltidy).
---
 IkiWiki/Plugin/comments.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 9359e9487..c545a1335 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -250,6 +250,17 @@ sub sessioncgi ($$) { #{{{
 		$body =~ s/>/&gt;/g;
 	}
 
+	IkiWiki::run_hooks(sanitize => sub {
+		# $fake is a possible location for this comment. We don't
+		# know yet what the comment number *actually* is.
+		my $fake = "$page/_comment_1";
+		$body=shift->(
+			page => $fake,
+			destpage => $fake,
+			content => $body,
+		);
+	});
+
 	# In this template, the [[!meta]] directives should stay at the end,
 	# so that they will override anything the user specifies. (For
 	# instance, [[!meta author="I can fake the author"]]...)
@@ -268,9 +279,9 @@ sub sessioncgi ($$) { #{{{
 	# - this means that if they do, rocks fall and everyone dies
 
 	if ($form->submitted eq PREVIEW) {
-		# $fake is a location that has the same number of slashes
-		# as the eventual location of this comment.
-		my $fake = "$page/_comments_hypothetical";
+		# $fake is a possible location for this comment. We don't
+		# know yet what the comment number *actually* is.
+		my $fake = "$page/_comment_1";
 		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
 				IkiWiki::linkify($page, $page,
 					IkiWiki::preprocess($page, $page,
-- 
cgit v1.2.3


From 9d92fd5eb060678650e6ca5ce8af0a50600c6d2e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 10:43:11 +0000
Subject: comments: don't rely on mdwn getting loaded first

---
 IkiWiki/Plugin/comments.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index c545a1335..29dc06f32 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -17,8 +17,7 @@ sub import { #{{{
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
 	hook(type => "preprocess", id => 'comments', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
-	hook(type => "htmlize", id => "_comment",
-		call => \&IkiWiki::Plugin::mdwn::htmlize);
+	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	IkiWiki::loadplugin("inline");
 	IkiWiki::loadplugin("mdwn");
 } # }}}
-- 
cgit v1.2.3


From 4663f364bbc220bbdbf03582765b6d82f0bddc46 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 10:43:39 +0000
Subject: comments: load inline and mdwn lazily

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 29dc06f32..8122f9d51 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -23,7 +23,7 @@ sub import { #{{{
 } # }}}
 
 sub htmlize { # {{{
-	eval { use IkiWiki::Plugin::mdwn; };
+	eval q{use IkiWiki::Plugin::mdwn};
 	error($@) if ($@);
 	return IkiWiki::Plugin::mdwn::htmlize(@_)
 } # }}}
@@ -72,7 +72,7 @@ sub preprocess (@) { #{{{
 
 	my $posts = '';
 	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
-		eval { use IkiWiki::Plugin::inline; };
+		eval q{use IkiWiki::Plugin::inline};
 		error($@) if ($@);
 		my @args = (
 			pages => "internal($params{page}/_comment_*)",
-- 
cgit v1.2.3


From 249ea2ed7557e34614ef9f1f863cee9489798510 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 10:44:34 +0000
Subject: comments: remove allowhtml option, just switch it on all the time

Now that posts are individually sanitized, that should be safe.
---
 IkiWiki/Plugin/comments.pm   | 9 ---------
 templates/comments_form.tmpl | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8122f9d51..f10400db1 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -48,7 +48,6 @@ sub preprocess (@) { #{{{
 	$pagestate{$page}{comments}{comments} = defined $params{closed}
 		? (not IkiWiki::yesno($params{closed}))
 		: 1;
-	$pagestate{$page}{comments}{allowhtml} = IkiWiki::yesno($params{allowhtml});
 	$pagestate{$page}{comments}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
 	$pagestate{$page}{comments}{commit} = defined $params{commit}
 		? IkiWiki::yesno($params{commit})
@@ -187,7 +186,6 @@ sub sessioncgi ($$) { #{{{
 	}
 
 	my $allow_directives = $pagestate{$page}{comments}{allowdirectives};
-	my $allow_html = $pagestate{$page}{comments}{allowdirectives};
 	my $commit_comments = defined $pagestate{$page}{comments}{commit}
 		? $pagestate{$page}{comments}{commit}
 		: 1;
@@ -203,7 +201,6 @@ sub sessioncgi ($$) { #{{{
 		htmllink($page, $page, 'ikiwiki/formatting',
 			noimageinline => 1,
 			linktext => 'FormattingHelp'),
-			allowhtml => $allow_html,
 			allowdirectives => $allow_directives);
 
 	if (not exists $pagesources{$page}) {
@@ -243,12 +240,6 @@ sub sessioncgi ($$) { #{{{
 			unless $config{prefix_directives};
 	}
 
-	unless ($allow_html) {
-		$body =~ s/&(\w|#)/&amp;$1/g;
-		$body =~ s/</&lt;/g;
-		$body =~ s/>/&gt;/g;
-	}
-
 	IkiWiki::run_hooks(sanitize => sub {
 		# $fake is a possible location for this comment. We don't
 		# know yet what the comment number *actually* is.
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
index fbf49be34..59c03b4f0 100644
--- a/templates/comments_form.tmpl
+++ b/templates/comments_form.tmpl
@@ -8,7 +8,7 @@ Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-BODY><br />
 <TMPL_VAR FORM-SUBMIT><br />
 <TMPL_VAR HELPONFORMATTINGLINK><br />
-HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
+Formatting with Markdown and HTML are allowed.<br />
 IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
 <TMPL_VAR NAME="FORM-END">
 
-- 
cgit v1.2.3


From cb5aaa3cee8b35d6fc6e88a7449a9477a6587c7a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 11:25:13 +0000
Subject: htmlbalance: don't compact whitespace, and set misc other options

Not compacting whitespace is the most important one: now that we run
sanitize hooks on individual posted comments in the comments plugin,
whitespace that is significant to Markdown (but not HTML) is lost.
---
 IkiWiki/Plugin/htmlbalance.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 3a2d62d15..dcd92055f 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -30,7 +30,15 @@ sub sanitize (@) { #{{{
 	my %params=@_;
 	my $ret = '';
 
-	my $tree = HTML::TreeBuilder->new_from_content($params{content});
+	my $tree = HTML::TreeBuilder->new();
+	$tree->ignore_unknown(0);
+	$tree->ignore_ignorable_whitespace(0);
+	$tree->no_space_compacting(1);
+	$tree->p_strict(1);
+	$tree->store_comments(0);
+	$tree->store_declarations(0);
+	$tree->store_pis(0);
+	$tree->parse_content($params{content});
 	my @nodes = $tree->disembowel();
 	foreach my $node (@nodes) {
 		if (ref $node) {
-- 
cgit v1.2.3


From 9a6005a212f9be2395943f424e48270b24588fcd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 22 Nov 2008 21:53:33 +0000
Subject: editpage: factor out checksessionexpiry into IkiWiki::CGI

---
 IkiWiki/CGI.pm             | 14 ++++++++++++++
 IkiWiki/Plugin/editpage.pm | 11 +----------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 4399d0dcb..a3486cbb4 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -296,6 +296,20 @@ sub cgi_getsession ($) { #{{{
 	return $session;
 } #}}}
 
+# The session id is stored on the form and checked to
+# guard against CSRF. But only if the user is logged in,
+# as anonok can allow anonymous edits.
+sub checksessionexpiry ($$) { # {{{
+	my $session = shift;
+	my $sid = shift;
+
+	if (defined $session->param("name")) {
+		if (! defined $sid || $sid ne $session->id) {
+			error(gettext("Your login session has expired."));
+		}
+	}
+} # }}}
+
 sub cgi_savesession ($) { #{{{
 	my $session=shift;
 
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index fe2864bac..e4f0cdac0 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -340,16 +340,7 @@ sub cgi_editpage ($$) { #{{{
 	else {
 		# save page
 		check_canedit($page, $q, $session);
-	
-		# The session id is stored on the form and checked to
-		# guard against CSRF. But only if the user is logged in,
-		# as anonok can allow anonymous edits.
-		if (defined $session->param("name")) {
-			my $sid=$q->param('sid');
-			if (! defined $sid || $sid ne $session->id) {
-				error(gettext("Your login session has expired."));
-			}
-		}
+		checksessionexpiry($session, $q->param('sid'));
 
 		my $exists=-e "$config{srcdir}/$file";
 
-- 
cgit v1.2.3


From 286dbb0541225dd4ff7db6ed958922f7512b789b Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 22 Nov 2008 21:54:31 +0000
Subject: comments: use CGI module's checksessionexpiry

---
 IkiWiki/Plugin/comments.pm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index f10400db1..136dc258e 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -120,18 +120,6 @@ sub linkuser ($) { # {{{
 	}
 } # }}}
 
-# FIXME: taken from IkiWiki::Plugin::editpage, should be common?
-sub checksessionexpiry ($$) { # {{{
-	my $session = shift;
-	my $sid = shift;
-
-	if (defined $session->param("name")) {
-		if (! defined $sid || $sid ne $session->id) {
-			error(gettext("Your login session has expired."));
-		}
-	}
-} # }}}
-
 # Mostly cargo-culted from IkiWiki::plugin::editpage
 sub sessioncgi ($$) { #{{{
 	my $cgi=shift;
@@ -300,7 +288,7 @@ sub sessioncgi ($$) { #{{{
 		# Let's get posting. We don't check_canedit here because
 		# that somewhat defeats the point of this plugin.
 
-		checksessionexpiry($session, $cgi->param('sid'));
+		IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
 
 		# FIXME: check that the wiki is locked right now, because
 		# if it's not, there are mad race conditions!
-- 
cgit v1.2.3


From 430ac61f2142bc92b12d16067ca7b40202d0c589 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 12:02:39 +0000
Subject: Embed comments into comments_embed.tmpl rather than concatenating in
 perl

---
 IkiWiki/Plugin/comments.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 136dc258e..acc3ffdb3 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -69,8 +69,8 @@ sub preprocess (@) { #{{{
 
 	debug("page $params{page} => destpage $params{destpage}");
 
-	my $posts = '';
 	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
+		my $posts = '';
 		eval q{use IkiWiki::Plugin::inline};
 		error($@) if ($@);
 		my @args = (
@@ -89,10 +89,11 @@ sub preprocess (@) { #{{{
 		push @args, feedshow => $params{feedshow} if defined $params{feedshow};
 		push @args, timeformat => $params{timeformat} if defined $params{timeformat};
 		push @args, feedonly => $params{feedonly} if defined $params{feedonly};
-		$posts = "\n" . IkiWiki::preprocess_inline(@args);
+		$posts = IkiWiki::preprocess_inline(@args);
+		$formtemplate->param("comments" => $posts);
 	}
 
-	return $formtemplate->output . $posts;
+	return $formtemplate->output;
 } # }}}
 
 # FIXME: logic taken from editpage, should be common code?
-- 
cgit v1.2.3


From 3abfc1d71c914035deff75a4373041cb9962a471 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 12:03:05 +0000
Subject: comments: Use HTML entities to escape directives

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index acc3ffdb3..a68026ebc 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -221,11 +221,11 @@ sub sessioncgi ($$) { #{{{
 
 	unless ($allow_directives) {
 		# don't allow new-style directives at all
-		$body =~ s/(^|[^\\])\[\[!/$1\\[[!/g;
+		$body =~ s/(^|[^\\])\[\[!/$1&#91;&#91;!/g;
 
 		# don't allow [[ unless it begins an old-style
 		# wikilink, if prefix_directives is off
-		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1\\[[!/g
+		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1&#91;&#91;!/g
 			unless $config{prefix_directives};
 	}
 
-- 
cgit v1.2.3


From 404792c61840c974faca9230ab9005c7b8dd30d1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 12:04:00 +0000
Subject: comments: add a stub pagetemplate hook to show the comments

---
 IkiWiki/Plugin/comments.pm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index a68026ebc..ea106a90f 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -18,6 +18,7 @@ sub import { #{{{
 	hook(type => "preprocess", id => 'comments', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
+	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
 	IkiWiki::loadplugin("inline");
 	IkiWiki::loadplugin("mdwn");
 } # }}}
@@ -344,6 +345,21 @@ sub sessioncgi ($$) { #{{{
 	exit;
 } #}}}
 
+sub pagetemplate (@) { #{{{
+	my %params = @_;
+
+	my $page = $params{page};
+	my $template = $params{template};
+
+	if ($template->query(name => 'comments')) {
+		my $comments = undef;
+
+		if (defined $comments && length $comments) {
+			$template->param(name => $comments);
+		}
+	}
+} # }}}
+
 package IkiWiki::PageSpec;
 
 sub match_postcomment ($$;@) {
-- 
cgit v1.2.3


From c9bb8b03a43b735e1b9876f58a1499a1445d0663 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 12:05:24 +0000
Subject: comments: document what linkuser does

---
 IkiWiki/Plugin/comments.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ea106a90f..25f1b62f0 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -107,6 +107,7 @@ sub getcgiuser ($) { # {{{
 } # }}}
 
 # FIXME: logic adapted from recentchanges, should be common code?
+# returns (author URL, pretty-printed version)
 sub linkuser ($) { # {{{
 	my $user = shift;
 	my $oiduser = eval { IkiWiki::openiduser($user) };
-- 
cgit v1.2.3


From 4972baac4dde88b52983f10f4fed6117c71d4fad Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:07:28 +0000
Subject: comments: make preprocess a no-op

---
 IkiWiki/Plugin/comments.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 25f1b62f0..a7b166232 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -41,9 +41,7 @@ sub getsetup () { #{{{
 sub preprocess (@) { #{{{
 	my %params=@_;
 
-	unless (length $config{cgiurl}) {
-		error(gettext("[[!comments plugin requires CGI enabled]]"));
-	}
+	return "";
 
 	my $page = $params{page};
 	$pagestate{$page}{comments}{comments} = defined $params{closed}
-- 
cgit v1.2.3


From d35a2bd2ded70156250808684e859dbbc50f81db Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 12:11:18 +0000
Subject: comments: Add some global configuration

---
 IkiWiki/Plugin/comments.pm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index a7b166232..892b4af26 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -33,8 +33,54 @@ sub getsetup () { #{{{
 	return
 		plugin => {
 			safe => 1,
+			rebuild => 1,
+		},
+		# Pages where comments are shown, but new comments are not
+		# allowed, will show "Comments are closed".
+		comments_shown_pagespec => {
+			type => 'pagespec',
+			example => 'blog/*',
+			default => '',
+			description => 'PageSpec for pages where comments will be shown inline',
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 1,
+		},
+		comments_open_pagespec => {
+			type => 'pagespec',
+			example => 'blog/* and created_after(close_old_comments)',
+			default => '',
+			description => 'PageSpec for pages where new comments can be posted',
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 1,
+		},
+		comments_pagename => {
+			type => 'string',
+			example => 'comment_',
+			default => 'comment_',
+			description => 'Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"',
+			safe => 0, # manual page moving will required
 			rebuild => undef,
 		},
+		comments_allowdirectives => {
+			type => 'boolean',
+			default => 0,
+			example => 0,
+			description => 'Allow directives in newly posted comments?',
+			safe => 1,
+			rebuild => 0,
+		},
+		comments_commit => {
+			type => 'boolean',
+			example => 1,
+			default => 1,
+			description => 'commit comments to the VCS',
+			# old uncommitted comments are likely to cause
+			# confusion if this is changed
+			safe => 0,
+			rebuild => 0,
+		},
 } #}}}
 
 # Somewhat based on IkiWiki::Plugin::inline blog posting support
-- 
cgit v1.2.3


From a9b0b3da5f002e38141c038e2ab3525b099d684b Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:07:58 +0000
Subject: comments: use global configuration for allow_directives, commit, and
 pagename

---
 IkiWiki/Plugin/comments.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 892b4af26..80469f503 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -220,10 +220,9 @@ sub sessioncgi ($$) { #{{{
 		error(gettext("bad page name"));
 	}
 
-	my $allow_directives = $pagestate{$page}{comments}{allowdirectives};
-	my $commit_comments = defined $pagestate{$page}{comments}{commit}
-		? $pagestate{$page}{comments}{commit}
-		: 1;
+	my $allow_directives = $config{comments_allowdirectives};
+	my $commit_comments = $config{comments_commit};
+	my $comments_pagename = $config{comments_pagename};
 
 	# FIXME: is this right? Or should we be using the candidate subpage
 	# (whatever that might mean) as the base URL?
-- 
cgit v1.2.3


From 49eabc676a170bfbd31ee51c27e02c20355554dc Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:10:44 +0000
Subject: comments: use global config to decide whether commenting is allowed,
 and for name of page

Also:
* decide comment page name sooner
* set permalink on it
---
 IkiWiki/Plugin/comments.pm | 77 +++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 80469f503..01ee481f5 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -237,24 +237,27 @@ sub sessioncgi ($$) { #{{{
 			linktext => 'FormattingHelp'),
 			allowdirectives => $allow_directives);
 
+	if ($form->submitted eq CANCEL) {
+		# bounce back to the page they wanted to comment on, and exit.
+		# CANCEL need not be considered in future
+		IkiWiki::redirect($cgi, urlto($page, undef, 1));
+		exit;
+	}
+
 	if (not exists $pagesources{$page}) {
 		error(sprintf(gettext(
 			"page '%s' doesn't exist, so you can't comment"),
 			$page));
 	}
-	if (not $pagestate{$page}{comments}{comments}) {
+
+	if (not pagespec_match($page, $config{comments_open_pagespec},
+		location => $page)) {
 		error(sprintf(gettext(
-			"comments are not enabled on page '%s'"),
+			"comments on page '%s' are closed"),
 			$page));
 	}
 
-	if ($form->submitted eq CANCEL) {
-		# bounce back to the page they wanted to comment on, and exit.
-		# CANCEL need not be considered in future
-		IkiWiki::redirect($cgi, urlto($page, undef, 1));
-		exit;
-	}
-
+	IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
 	IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
 
 	my ($authorurl, $author) = linkuser(getcgiuser($session));
@@ -274,13 +277,24 @@ sub sessioncgi ($$) { #{{{
 			unless $config{prefix_directives};
 	}
 
+	# FIXME: check that the wiki is locked right now, because
+	# if it's not, there are mad race conditions!
+
+	# FIXME: rather a simplistic way to make the comments...
+	my $i = 0;
+	my $file;
+	my $location;
+	do {
+		$i++;
+		$location = "$page/${comments_pagename}${i}";
+	} while (-e "$config{srcdir}/$location._comment");
+
+	my $anchor = "${comments_pagename}${i}";
+
 	IkiWiki::run_hooks(sanitize => sub {
-		# $fake is a possible location for this comment. We don't
-		# know yet what the comment number *actually* is.
-		my $fake = "$page/_comment_1";
 		$body=shift->(
-			page => $fake,
-			destpage => $fake,
+			page => $location,
+			destpage => $location,
 			content => $body,
 		);
 	});
@@ -293,6 +307,8 @@ sub sessioncgi ($$) { #{{{
 	$content_tmpl->param(authorurl => $authorurl);
 	$content_tmpl->param(subject => $form->field('subject'));
 	$content_tmpl->param(body => $body);
+	$content_tmpl->param(anchor => "$anchor");
+	$content_tmpl->param(permalink => "$baseurl#$anchor");
 
 	my $content = $content_tmpl->output;
 
@@ -303,14 +319,11 @@ sub sessioncgi ($$) { #{{{
 	# - this means that if they do, rocks fall and everyone dies
 
 	if ($form->submitted eq PREVIEW) {
-		# $fake is a possible location for this comment. We don't
-		# know yet what the comment number *actually* is.
-		my $fake = "$page/_comment_1";
-		my $preview = IkiWiki::htmlize($fake, $page, 'mdwn',
+		my $preview = IkiWiki::htmlize($location, $page, 'mdwn',
 				IkiWiki::linkify($page, $page,
 					IkiWiki::preprocess($page, $page,
-						IkiWiki::filter($fake, $page,
-							$content),
+						IkiWiki::filter($location,
+							$page, $content),
 						0, 1)));
 		IkiWiki::run_hooks(format => sub {
 				$preview = shift->(page => $page,
@@ -331,24 +344,10 @@ sub sessioncgi ($$) { #{{{
 	}
 
 	if ($form->submitted eq POST_COMMENT && $form->validate) {
-		# Let's get posting. We don't check_canedit here because
-		# that somewhat defeats the point of this plugin.
-
-		IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
-
-		# FIXME: check that the wiki is locked right now, because
-		# if it's not, there are mad race conditions!
-
-		# FIXME: rather a simplistic way to make the comments...
-		my $i = 0;
-		my $file;
-		do {
-			$i++;
-			$file = "$page/_comment_${i}._comment";
-		} while (-e "$config{srcdir}/$file");
+		my $file = "$location._comment";
 
 		# FIXME: could probably do some sort of graceful retry
-		# if I could be bothered
+		# on error? Would require significant unwinding though
 		writefile($file, $config{srcdir}, $content);
 
 		my $conflict;
@@ -357,7 +356,9 @@ sub sessioncgi ($$) { #{{{
 			my $message = gettext("Added a comment");
 			if (defined $form->field('subject') &&
 				length $form->field('subject')) {
-				$message .= ": ".$form->field('subject');
+				$message = sprintf(
+					gettext("Added a comment: %s"),
+					$form->field('subject'));
 			}
 
 			IkiWiki::rcs_add($file);
@@ -378,7 +379,7 @@ sub sessioncgi ($$) { #{{{
 		error($conflict) if defined $conflict;
 
 		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/_comment_$i";
+		my $anticache = "?updated=$page/${comments_pagename}${i}";
 		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
 	}
 	else {
-- 
cgit v1.2.3


From 4ff161ba0b4b2fbb027ee2077330c08bd3a38073 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:11:14 +0000
Subject: comments: render comments/commenturl in page.tmpl

---
 IkiWiki/Plugin/comments.pm | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 01ee481f5..33d8ca8e2 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -399,8 +399,48 @@ sub pagetemplate (@) { #{{{
 	if ($template->query(name => 'comments')) {
 		my $comments = undef;
 
+		my $comments_pagename = $config{comments_pagename};
+
+		my $open = 0;
+		my $shown = pagespec_match($page,
+			$config{comments_shown_pagespec},
+			location => $page);
+
+		if (pagespec_match($page, "*/${comments_pagename}*",
+				location => $page)) {
+			$shown = 0;
+			$open = 0;
+		}
+
+		if (length $config{cgiurl}) {
+			$open = pagespec_match($page,
+				$config{comments_open_pagespec},
+				location => $page);
+		}
+
+		if ($shown) {
+			eval q{use IkiWiki::Plugin::inline};
+			error($@) if $@;
+
+			my @args = (
+				pages => "internal($page/${comments_pagename}*)",
+				template => 'comments_display',
+				show => 0,
+				reverse => 'yes',
+				page => $page,
+				destpage => $params{destpage},
+			);
+			$comments = IkiWiki::preprocess_inline(@args);
+		}
+
 		if (defined $comments && length $comments) {
-			$template->param(name => $comments);
+			$template->param(comments => $comments);
+		}
+
+		if ($open) {
+			my $commenturl = IkiWiki::cgiurl(do => 'comment',
+				page => $page);
+			$template->param(commenturl => $commenturl);
 		}
 	}
 } # }}}
-- 
cgit v1.2.3


From e66e2c2a7e2fdf2d80c20e61854480342d3fa8b4 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:42:50 +0000
Subject: comments: Use a checkconfig hook to get the default value of
 comments_pagename

---
 IkiWiki/Plugin/comments.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 33d8ca8e2..4cd76c5d5 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -14,6 +14,7 @@ use constant POST_COMMENT => "Post comment";
 use constant CANCEL => "Cancel";
 
 sub import { #{{{
+	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
 	hook(type => "preprocess", id => 'comments', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
@@ -83,6 +84,12 @@ sub getsetup () { #{{{
 		},
 } #}}}
 
+sub checkconfig () { #{{{
+	$config{comments_commit} = 1 unless defined $config{comments_commit};
+	$config{comments_pagename} = 'comment_'
+		unless defined $config{comments_pagename};
+} #}}}
+
 # Somewhat based on IkiWiki::Plugin::inline blog posting support
 sub preprocess (@) { #{{{
 	my %params=@_;
-- 
cgit v1.2.3


From 24bfc3fdc52fd55703c6b618b768cfb0905456d3 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:43:06 +0000
Subject: comments: record the time at which each comment was posted

---
 IkiWiki/Plugin/comments.pm      | 1 +
 templates/comments_comment.tmpl | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4cd76c5d5..58076938b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -316,6 +316,7 @@ sub sessioncgi ($$) { #{{{
 	$content_tmpl->param(body => $body);
 	$content_tmpl->param(anchor => "$anchor");
 	$content_tmpl->param(permalink => "$baseurl#$anchor");
+	$content_tmpl->param(date => formattime(time, "%X %x"));
 
 	my $content = $content_tmpl->output;
 
diff --git a/templates/comments_comment.tmpl b/templates/comments_comment.tmpl
index 56a28753e..8e6affb0d 100644
--- a/templates/comments_comment.tmpl
+++ b/templates/comments_comment.tmpl
@@ -15,6 +15,9 @@
 <TMPL_IF NAME="PERMALINK">
 [[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]
 </TMPL_IF>
+<TMPL_IF NAME="DATE">
+[[!meta date="<TMPL_VAR DATE ESCAPE=HTML>"]]
+</TMPL_IF>
 
 <TMPL_IF NAME="ANCHOR">
 </div>
-- 
cgit v1.2.3


From 80e84e32bf98ed76d0e207e414035b36b9232191 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:52:30 +0000
Subject: Delay checking for session expiry til we actually post a comment

---
 IkiWiki/Plugin/comments.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 58076938b..d149e5982 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -264,7 +264,6 @@ sub sessioncgi ($$) { #{{{
 			$page));
 	}
 
-	IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
 	IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
 
 	my ($authorurl, $author) = linkuser(getcgiuser($session));
@@ -354,6 +353,8 @@ sub sessioncgi ($$) { #{{{
 	if ($form->submitted eq POST_COMMENT && $form->validate) {
 		my $file = "$location._comment";
 
+		IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
+
 		# FIXME: could probably do some sort of graceful retry
 		# on error? Would require significant unwinding though
 		writefile($file, $config{srcdir}, $content);
-- 
cgit v1.2.3


From f88870f102e9578e0b44de056fec0bac2aff8b84 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:53:33 +0000
Subject: Qualify name of formattime() correctly

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d149e5982..45b13168a 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -315,7 +315,7 @@ sub sessioncgi ($$) { #{{{
 	$content_tmpl->param(body => $body);
 	$content_tmpl->param(anchor => "$anchor");
 	$content_tmpl->param(permalink => "$baseurl#$anchor");
-	$content_tmpl->param(date => formattime(time, "%X %x"));
+	$content_tmpl->param(date => IkiWiki::formattime(time, "%X %x"));
 
 	my $content = $content_tmpl->output;
 
-- 
cgit v1.2.3


From 1d696aef2c6b364b55070b15dcc7084d0b09daaf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 18:31:11 +0000
Subject: comments: Duplicate logic and CGI hook from recentchanges to link
 user pages correctly

---
 IkiWiki/Plugin/comments.pm | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 45b13168a..8b82341c0 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -20,6 +20,7 @@ sub import { #{{{
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
+	hook(type => "cgi", id => "comments", call => \&linkcgi);
 	IkiWiki::loadplugin("inline");
 	IkiWiki::loadplugin("mdwn");
 } # }}}
@@ -157,7 +158,36 @@ sub getcgiuser ($) { # {{{
 	return $user;
 } # }}}
 
-# FIXME: logic adapted from recentchanges, should be common code?
+# This is exactly the same as recentchanges_link :-(
+sub linkcgi ($) { #{{{
+	my $cgi=shift;
+	if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
+
+		my $page=decode_utf8($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, urlto($link, undef, 1));
+		}
+
+		exit;
+	}
+}
+
+# FIXME: basically the same logic as recentchanges
 # returns (author URL, pretty-printed version)
 sub linkuser ($) { # {{{
 	my $user = shift;
@@ -166,11 +196,15 @@ sub linkuser ($) { # {{{
 	if (defined $oiduser) {
 		return ($user, $oiduser);
 	}
+	# FIXME: it'd be good to avoid having such a link for anonymous
+	# posts
 	else {
-		my $page = bestlink('', (length $config{userdir}
-				? "$config{userdir}/"
-				: "").$user);
-		return (urlto($page, undef, 1), $user);
+		return (IkiWiki::cgiurl(
+				do => 'commenter',
+				page => (length $config{userdir}
+					? "$config{userdir}/"
+					: "")
+			).$user, $user);
 	}
 } # }}}
 
-- 
cgit v1.2.3


From 6a986a8a0bd20e82e128ce7e0aa9587437ae8325 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Wed, 10 Dec 2008 22:18:26 +0000
Subject: Remove dead code for preprocessing [[!comments]]

---
 IkiWiki/Plugin/comments.pm | 59 ----------------------------------------------
 1 file changed, 59 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8b82341c0..73f8d6140 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -16,7 +16,6 @@ use constant CANCEL => "Cancel";
 sub import { #{{{
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
-	hook(type => "preprocess", id => 'comments', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
@@ -91,64 +90,6 @@ sub checkconfig () { #{{{
 		unless defined $config{comments_pagename};
 } #}}}
 
-# Somewhat based on IkiWiki::Plugin::inline blog posting support
-sub preprocess (@) { #{{{
-	my %params=@_;
-
-	return "";
-
-	my $page = $params{page};
-	$pagestate{$page}{comments}{comments} = defined $params{closed}
-		? (not IkiWiki::yesno($params{closed}))
-		: 1;
-	$pagestate{$page}{comments}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
-	$pagestate{$page}{comments}{commit} = defined $params{commit}
-		? IkiWiki::yesno($params{commit})
-		: 1;
-
-	my $formtemplate = IkiWiki::template("comments_embed.tmpl",
-		blind_cache => 1);
-	$formtemplate->param(cgiurl => $config{cgiurl});
-	$formtemplate->param(page => $params{page});
-
-	if (not $pagestate{$page}{comments}{comments}) {
-		$formtemplate->param("disabled" =>
-			gettext('comments are closed'));
-	}
-	elsif ($params{preview}) {
-		$formtemplate->param("disabled" =>
-			gettext('not available during Preview'));
-	}
-
-	debug("page $params{page} => destpage $params{destpage}");
-
-	unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
-		my $posts = '';
-		eval q{use IkiWiki::Plugin::inline};
-		error($@) if ($@);
-		my @args = (
-			pages => "internal($params{page}/_comment_*)",
-			template => "comments_display",
-			show => 0,
-			reverse => "yes",
-			# special stuff passed through
-			page => $params{page},
-			destpage => $params{destpage},
-			preview => $params{preview},
-		);
-		push @args, atom => $params{atom} if defined $params{atom};
-		push @args, rss => $params{rss} if defined $params{rss};
-		push @args, feeds => $params{feeds} if defined $params{feeds};
-		push @args, feedshow => $params{feedshow} if defined $params{feedshow};
-		push @args, timeformat => $params{timeformat} if defined $params{timeformat};
-		push @args, feedonly => $params{feedonly} if defined $params{feedonly};
-		$posts = IkiWiki::preprocess_inline(@args);
-		$formtemplate->param("comments" => $posts);
-	}
-
-	return $formtemplate->output;
-} # }}}
-
 # FIXME: logic taken from editpage, should be common code?
 sub getcgiuser ($) { # {{{
 	my $session = shift;
-- 
cgit v1.2.3


From 9af0f04df3a9c589d63a4f8d95af06098f0474db Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Wed, 10 Dec 2008 23:53:04 +0000
Subject: comments: Save comments as a file with one big [[!comment]]
 directive.

This delays all comment formatting until the last possible time, allows
us to set metadata without worrying that commenters may be able to evade
it, and means that changes to how a comment is saved can be handled
gracefully. It also gives us somewhere to put the commenter's username
or IP address for later reference.
---
 IkiWiki/Plugin/comments.pm      | 146 +++++++++++++++++++++++++++++-----------
 templates/comments_comment.tmpl |  24 -------
 2 files changed, 108 insertions(+), 62 deletions(-)
 delete mode 100644 templates/comments_comment.tmpl

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 73f8d6140..13ced6ffd 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -8,6 +8,7 @@ package IkiWiki::Plugin::comments;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use Encode;
 
 use constant PREVIEW => "Preview";
 use constant POST_COMMENT => "Post comment";
@@ -16,18 +17,96 @@ use constant CANCEL => "Cancel";
 sub import { #{{{
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
+	hook(type => "preprocess", id => 'comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
 	hook(type => "cgi", id => "comments", call => \&linkcgi);
-	IkiWiki::loadplugin("inline");
 	IkiWiki::loadplugin("mdwn");
+	IkiWiki::loadplugin("inline");
 } # }}}
 
 sub htmlize { # {{{
-	eval q{use IkiWiki::Plugin::mdwn};
-	error($@) if ($@);
-	return IkiWiki::Plugin::mdwn::htmlize(@_)
+	my %params = @_;
+	return $params{content};
+} # }}}
+
+sub preprocess { # {{{
+	my %params = @_;
+	my $page = $params{page};
+
+	my $format = $params{format};
+	if (defined $format && !exists $IkiWiki::hooks{htmlize}{$format}) {
+		error(sprintf(gettext("unsupported page format %s"), $format));
+	}
+
+	my $content = $params{content};
+	if (!defined $content) {
+		error(gettext("comment must have content"));
+	}
+	$content =~ s/\\"/"/g;
+
+	$content = IkiWiki::filter($page, $params{destpage}, $content);
+
+	if ($config{comments_allowdirectives}) {
+		$content = IkiWiki::preprocess($page, $params{destpage},
+			$content);
+	}
+
+	# no need to bother with htmlize if it's just HTML
+	$content = IkiWiki::htmlize($page, $params{destpage}, $format,
+		$content) if defined $format;
+
+	IkiWiki::run_hooks(sanitize => sub {
+		$content = shift->(
+			page => $page,
+			destpage => $params{destpage},
+			content => $content,
+		);
+	});
+
+	# override any metadata
+
+	if (defined $params{username}) {
+		my ($authorurl, $author) = linkuser($params{username});
+		$pagestate{$page}{meta}{author} = $author;
+		$pagestate{$page}{meta}{authorurl} = $authorurl;
+	}
+	elsif (defined $params{ip}) {
+		$pagestate{$page}{meta}{author} = sprintf(
+			gettext("Anonymous (IP: %s)"),
+			$params{ip});
+		delete $pagestate{$page}{meta}{authorurl};
+	}
+	else {
+		$pagestate{$page}{meta}{author} = gettext("Anonymous");
+		delete $pagestate{$page}{meta}{authorurl};
+	}
+
+	if (defined $params{subject}) {
+		$pagestate{$page}{meta}{title} = $params{subject};
+	}
+	else {
+		delete $pagestate{$page}{meta}{title};
+	}
+
+	my $baseurl = urlto($params{destpage}, undef, 1);
+	my $anchor = "";
+	my $comments_pagename = $config{comments_pagename};
+	if ($params{page} =~ m/\/(\Q${comments_pagename}\E\d+)$/) {
+		$anchor = $1;
+	}
+	$pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";
+
+	eval q{use Date::Parse};
+	if (! $@) {
+		my $time = str2time($params{date});
+		$IkiWiki::pagectime{$page} = $time if defined $time;
+	}
+
+	# FIXME: hard-coded HTML (although it's just to set an ID)
+	return "<div id=\"$anchor\">$content</div>" if $anchor;
+	return $content;
 } # }}}
 
 sub getsetup () { #{{{
@@ -143,9 +222,9 @@ sub linkuser ($) { # {{{
 		return (IkiWiki::cgiurl(
 				do => 'commenter',
 				page => (length $config{userdir}
-					? "$config{userdir}/"
-					: "")
-			).$user, $user);
+					? "$config{userdir}/$user"
+					: "$user")
+			), $user);
 	}
 } # }}}
 
@@ -246,17 +325,6 @@ sub sessioncgi ($$) { #{{{
 	my $body = $form->field('body') || '';
 	$body =~ s/\r\n/\n/g;
 	$body =~ s/\r/\n/g;
-	$body .= "\n" if $body !~ /\n$/;
-
-	unless ($allow_directives) {
-		# don't allow new-style directives at all
-		$body =~ s/(^|[^\\])\[\[!/$1&#91;&#91;!/g;
-
-		# don't allow [[ unless it begins an old-style
-		# wikilink, if prefix_directives is off
-		$body =~ s/(^|[^\\])\[\[(?![^\n\s\]+]\]\])/$1&#91;&#91;!/g
-			unless $config{prefix_directives};
-	}
 
 	# FIXME: check that the wiki is locked right now, because
 	# if it's not, there are mad race conditions!
@@ -272,27 +340,29 @@ sub sessioncgi ($$) { #{{{
 
 	my $anchor = "${comments_pagename}${i}";
 
-	IkiWiki::run_hooks(sanitize => sub {
-		$body=shift->(
-			page => $location,
-			destpage => $location,
-			content => $body,
-		);
-	});
+	$body =~ s/"/\\"/g;
+	my $content = "[[!comment format=mdwn\n";
+
+	# FIXME: handling of double quotes probably wrong?
+	if (defined $session->param('name')) {
+		my $username = $session->param('name');
+		$username =~ s/"/&quot;/g;
+		$content .= " username=\"$username\"\n";
+	}
+	elsif (defined $ENV{REMOTE_ADDR}) {
+		my $ip = $ENV{REMOTE_ADDR};
+		if ($ip =~ m/^([.0-9]+)$/) {
+			$content .= " ip=\"$1\"\n";
+		}
+	}
+
+	my $subject = $form->field('subject');
+	$subject =~ s/"/&quot;/g;
+	$content .= " subject=\"$subject\"\n";
+
+	$content .= " date=\"" . IkiWiki::formattime(time, '%X %x') . "\"\n";
 
-	# In this template, the [[!meta]] directives should stay at the end,
-	# so that they will override anything the user specifies. (For
-	# instance, [[!meta author="I can fake the author"]]...)
-	my $content_tmpl = template('comments_comment.tmpl');
-	$content_tmpl->param(author => $author);
-	$content_tmpl->param(authorurl => $authorurl);
-	$content_tmpl->param(subject => $form->field('subject'));
-	$content_tmpl->param(body => $body);
-	$content_tmpl->param(anchor => "$anchor");
-	$content_tmpl->param(permalink => "$baseurl#$anchor");
-	$content_tmpl->param(date => IkiWiki::formattime(time, "%X %x"));
-
-	my $content = $content_tmpl->output;
+	$content .= " content=\"\"\"\n$body\n\"\"\"]]\n";
 
 	# This is essentially a simplified version of editpage:
 	# - the user does not control the page that's created, only the parent
diff --git a/templates/comments_comment.tmpl b/templates/comments_comment.tmpl
deleted file mode 100644
index 8e6affb0d..000000000
--- a/templates/comments_comment.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<TMPL_IF NAME="ANCHOR">
-<div id="<TMPL_VAR ANCHOR ESCAPE=HTML>">
-</TMPL_IF>
-
-<TMPL_VAR BODY>
-<TMPL_IF NAME="SUBJECT">
-[[!meta title="<TMPL_VAR NAME="SUBJECT" ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="AUTHOR">
-[[!meta author="<TMPL_VAR NAME="AUTHOR" ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="AUTHORURL">
-[[!meta authorurl="<TMPL_VAR NAME="AUTHORURL" ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
-[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]
-</TMPL_IF>
-<TMPL_IF NAME="DATE">
-[[!meta date="<TMPL_VAR DATE ESCAPE=HTML>"]]
-</TMPL_IF>
-
-<TMPL_IF NAME="ANCHOR">
-</div>
-</TMPL_IF>
-- 
cgit v1.2.3


From edb69335f2ca5d42c62f6a4cce0b044da5ef88e8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 00:19:39 +0000
Subject: comments: instead of hard-coding mdwn, allow any supported page
 format

---
 IkiWiki/Plugin/comments.pm   | 24 ++++++++++++++++++------
 templates/comments_form.tmpl |  5 +++--
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 13ced6ffd..b45a4a97b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -22,7 +22,6 @@ sub import { #{{{
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
 	hook(type => "cgi", id => "comments", call => \&linkcgi);
-	IkiWiki::loadplugin("mdwn");
 	IkiWiki::loadplugin("inline");
 } # }}}
 
@@ -243,7 +242,7 @@ sub sessioncgi ($$) { #{{{
 
 	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
 	my $form = CGI::FormBuilder->new(
-		fields => [qw{do sid page subject body}],
+		fields => [qw{do sid page subject body type}],
 		charset => 'utf-8',
 		method => 'POST',
 		required => [qw{body}],
@@ -264,13 +263,26 @@ sub sessioncgi ($$) { #{{{
 		});
 	IkiWiki::decode_form_utf8($form);
 
+	my $type = $form->param('type');
+	if (defined $type && length $type && $IkiWiki::hooks{htmlize}{$type}) {
+		$type = possibly_foolish_untaint($type);
+	}
+	else {
+		$type = $config{default_pageext};
+	}
+	my @page_types;
+	if (exists $IkiWiki::hooks{htmlize}) {
+		@page_types = grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}};
+	}
+
 	$form->field(name => 'do', type => 'hidden');
 	$form->field(name => 'sid', type => 'hidden', value => $session->id,
 		force => 1);
 	$form->field(name => 'page', type => 'hidden');
 	$form->field(name => 'subject', type => 'text', size => 72);
-	$form->field(name => 'body', type => 'textarea', rows => 5,
-		cols => 80);
+	$form->field(name => 'body', type => 'textarea', rows => 10);
+	$form->field(name => "type", value => $type, force => 1,
+		type => 'select', options => \@page_types);
 
 	# The untaint is OK (as in editpage) because we're about to pass
 	# it to file_pruned anyway
@@ -341,7 +353,7 @@ sub sessioncgi ($$) { #{{{
 	my $anchor = "${comments_pagename}${i}";
 
 	$body =~ s/"/\\"/g;
-	my $content = "[[!comment format=mdwn\n";
+	my $content = "[[!comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
 	if (defined $session->param('name')) {
@@ -371,7 +383,7 @@ sub sessioncgi ($$) { #{{{
 	# - this means that if they do, rocks fall and everyone dies
 
 	if ($form->submitted eq PREVIEW) {
-		my $preview = IkiWiki::htmlize($location, $page, 'mdwn',
+		my $preview = IkiWiki::htmlize($location, $page, '_comment',
 				IkiWiki::linkify($page, $page,
 					IkiWiki::preprocess($page, $page,
 						IkiWiki::filter($location,
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
index 59c03b4f0..e798fcdde 100644
--- a/templates/comments_form.tmpl
+++ b/templates/comments_form.tmpl
@@ -6,10 +6,11 @@
 <TMPL_VAR FIELD-PAGE>
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-BODY><br />
+Page type: <TMPL_VAR FIELD-TYPE><br />
 <TMPL_VAR FORM-SUBMIT><br />
 <TMPL_VAR HELPONFORMATTINGLINK><br />
-Formatting with Markdown and HTML are allowed.<br />
-IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
+A subset of HTML is allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
 <TMPL_VAR NAME="FORM-END">
 
 <TMPL_IF NAME="PAGE_PREVIEW">
-- 
cgit v1.2.3


From 44a7d77a301a1f219c99f3d861f0bce43cd779cf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 00:22:34 +0000
Subject: comments: rename main field to "editcontent" consistent with editpage

This has the side-effect that Ikiwiki's default style.css gives the text
box 100% width.
---
 IkiWiki/Plugin/comments.pm   | 16 ++++++++--------
 templates/comments_form.tmpl |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index b45a4a97b..46f71e2e7 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -242,10 +242,10 @@ sub sessioncgi ($$) { #{{{
 
 	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
 	my $form = CGI::FormBuilder->new(
-		fields => [qw{do sid page subject body type}],
+		fields => [qw{do sid page subject editcontent type}],
 		charset => 'utf-8',
 		method => 'POST',
-		required => [qw{body}],
+		required => [qw{editcontent}],
 		javascript => 0,
 		params => $cgi,
 		action => $config{cgiurl},
@@ -280,7 +280,7 @@ sub sessioncgi ($$) { #{{{
 		force => 1);
 	$form->field(name => 'page', type => 'hidden');
 	$form->field(name => 'subject', type => 'text', size => 72);
-	$form->field(name => 'body', type => 'textarea', rows => 10);
+	$form->field(name => 'editcontent', type => 'textarea', rows => 10);
 	$form->field(name => "type", value => $type, force => 1,
 		type => 'select', options => \@page_types);
 
@@ -334,9 +334,9 @@ sub sessioncgi ($$) { #{{{
 
 	my ($authorurl, $author) = linkuser(getcgiuser($session));
 
-	my $body = $form->field('body') || '';
-	$body =~ s/\r\n/\n/g;
-	$body =~ s/\r/\n/g;
+	my $editcontent = $form->field('editcontent') || '';
+	$editcontent =~ s/\r\n/\n/g;
+	$editcontent =~ s/\r/\n/g;
 
 	# FIXME: check that the wiki is locked right now, because
 	# if it's not, there are mad race conditions!
@@ -352,7 +352,7 @@ sub sessioncgi ($$) { #{{{
 
 	my $anchor = "${comments_pagename}${i}";
 
-	$body =~ s/"/\\"/g;
+	$editcontent =~ s/"/\\"/g;
 	my $content = "[[!comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
@@ -374,7 +374,7 @@ sub sessioncgi ($$) { #{{{
 
 	$content .= " date=\"" . IkiWiki::formattime(time, '%X %x') . "\"\n";
 
-	$content .= " content=\"\"\"\n$body\n\"\"\"]]\n";
+	$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
 	# This is essentially a simplified version of editpage:
 	# - the user does not control the page that's created, only the parent
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
index e798fcdde..9eddaadf5 100644
--- a/templates/comments_form.tmpl
+++ b/templates/comments_form.tmpl
@@ -5,7 +5,7 @@
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
-<TMPL_VAR FIELD-BODY><br />
+<TMPL_VAR FIELD-EDITCONTENT><br />
 Page type: <TMPL_VAR FIELD-TYPE><br />
 <TMPL_VAR FORM-SUBMIT><br />
 <TMPL_VAR HELPONFORMATTINGLINK><br />
-- 
cgit v1.2.3


From 0a69c7ed56ea244c62319c7a95ba7cfac9696e27 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 01:24:01 +0000
Subject: comments: Remove some dead code

---
 IkiWiki/Plugin/comments.pm | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 46f71e2e7..eb915b813 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -168,15 +168,6 @@ sub checkconfig () { #{{{
 		unless defined $config{comments_pagename};
 } #}}}
 
-# FIXME: logic taken from editpage, should be common code?
-sub getcgiuser ($) { # {{{
-	my $session = shift;
-	my $user = $session->param('name');
-	$user = $ENV{REMOTE_ADDR} unless defined $user;
-	debug("getcgiuser() -> $user");
-	return $user;
-} # }}}
-
 # This is exactly the same as recentchanges_link :-(
 sub linkcgi ($) { #{{{
 	my $cgi=shift;
@@ -332,8 +323,6 @@ sub sessioncgi ($$) { #{{{
 
 	IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
 
-	my ($authorurl, $author) = linkuser(getcgiuser($session));
-
 	my $editcontent = $form->field('editcontent') || '';
 	$editcontent =~ s/\r\n/\n/g;
 	$editcontent =~ s/\r/\n/g;
@@ -398,8 +387,6 @@ sub sessioncgi ($$) { #{{{
 		$template->param(content => $preview);
 		$template->param(title => $form->field('subject'));
 		$template->param(ctime => displaytime(time));
-		$template->param(author => $author);
-		$template->param(authorurl => $authorurl);
 
 		$form->tmpl_param(page_preview => $template->output);
 	}
-- 
cgit v1.2.3


From a5889912b386eaa43774907c3844c90e3e3ca7c8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 01:33:43 +0000
Subject: comments: Optionally allow anonymous commenters to set their
 name/URL.

Also provide a way for the comment template to pick up the verified
username/IP.
---
 IkiWiki/Plugin/comments.pm   | 126 +++++++++++++++++++++++++++++++++++++------
 templates/comments_form.tmpl |   8 +++
 2 files changed, 119 insertions(+), 15 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index eb915b813..6bd18a5cf 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -30,6 +30,18 @@ sub htmlize { # {{{
 	return $params{content};
 } # }}}
 
+# FIXME: copied verbatim from meta
+sub safeurl ($) { #{{{
+	my $url=shift;
+	if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} &&
+	    defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) {
+		return $url=~/$IkiWiki::Plugin::htmlscrubber::safe_url_regexp/;
+	}
+	else {
+		return 1;
+	}
+} #}}}
+
 sub preprocess { # {{{
 	my %params = @_;
 	my $page = $params{page};
@@ -64,29 +76,55 @@ sub preprocess { # {{{
 		);
 	});
 
-	# override any metadata
+	# set metadata, possibly overriding [[!meta]] directives from the
+	# comment itself
+
+	my $commentuser;
+	my $commentip;
+	my $commentauthor;
+	my $commentauthorurl;
 
 	if (defined $params{username}) {
-		my ($authorurl, $author) = linkuser($params{username});
-		$pagestate{$page}{meta}{author} = $author;
-		$pagestate{$page}{meta}{authorurl} = $authorurl;
+		$commentuser = $params{username};
+		($commentauthorurl, $commentauthor) =
+			linkuser($params{username});
 	}
 	elsif (defined $params{ip}) {
-		$pagestate{$page}{meta}{author} = sprintf(
-			gettext("Anonymous (IP: %s)"),
-			$params{ip});
-		delete $pagestate{$page}{meta}{authorurl};
+		$commentip = $params{ip};
+		$commentauthor = sprintf(
+			gettext("Anonymous (IP: %s)"), $params{ip});
 	}
 	else {
-		$pagestate{$page}{meta}{author} = gettext("Anonymous");
-		delete $pagestate{$page}{meta}{authorurl};
+		$commentauthor = gettext("Anonymous");
 	}
 
-	if (defined $params{subject}) {
-		$pagestate{$page}{meta}{title} = $params{subject};
+	$pagestate{$page}{comments}{commentuser} = $commentuser;
+	$pagestate{$page}{comments}{commentip} = $commentip;
+	$pagestate{$page}{comments}{commentauthor} = $commentauthor;
+	$pagestate{$page}{comments}{commentauthorurl} = $commentauthorurl;
+	if (!defined $pagestate{$page}{meta}{author}) {
+		$pagestate{$page}{meta}{author} = $commentauthor;
+	}
+	if (!defined $pagestate{$page}{meta}{authorurl}) {
+		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
+	}
+
+	if ($config{comments_allowauthor}) {
+		if (defined $params{claimedauthor}) {
+			$pagestate{$page}{meta}{author} = $params{claimedauthor};
+		}
+
+		if (defined $params{url} and safeurl($params{url})) {
+			$pagestate{$page}{meta}{authorurl} = $params{url};
+		}
 	}
 	else {
-		delete $pagestate{$page}{meta}{title};
+		$pagestate{$page}{meta}{author} = $commentauthor;
+		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
+	}
+
+	if (defined $params{subject}) {
+		$pagestate{$page}{meta}{title} = $params{subject};
 	}
 
 	my $baseurl = urlto($params{destpage}, undef, 1);
@@ -146,7 +184,15 @@ sub getsetup () { #{{{
 			type => 'boolean',
 			default => 0,
 			example => 0,
-			description => 'Allow directives in newly posted comments?',
+			description => 'Interpret directives in comments?',
+			safe => 1,
+			rebuild => 0,
+		},
+		comments_allowauthor => {
+			type => 'boolean',
+			default => 0,
+			example => 0,
+			description => 'Allow anonymous commenters to set an author name?',
 			safe => 1,
 			rebuild => 0,
 		},
@@ -233,7 +279,7 @@ sub sessioncgi ($$) { #{{{
 
 	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
 	my $form = CGI::FormBuilder->new(
-		fields => [qw{do sid page subject editcontent type}],
+		fields => [qw{do sid page subject editcontent type author url}],
 		charset => 'utf-8',
 		method => 'POST',
 		required => [qw{editcontent}],
@@ -266,6 +312,8 @@ sub sessioncgi ($$) { #{{{
 		@page_types = grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}};
 	}
 
+	my $allow_author = $config{comments_allowauthor};
+
 	$form->field(name => 'do', type => 'hidden');
 	$form->field(name => 'sid', type => 'hidden', value => $session->id,
 		force => 1);
@@ -275,6 +323,21 @@ sub sessioncgi ($$) { #{{{
 	$form->field(name => "type", value => $type, force => 1,
 		type => 'select', options => \@page_types);
 
+	$form->tmpl_param(username => $session->param('name'));
+
+	if ($allow_author and !defined $session->param('name')) {
+		$form->tmpl_param(allowauthor => 1);
+		$form->field(name => 'author', type => 'text', size => '40');
+		$form->field(name => 'url', type => 'text', size => '40');
+	}
+	else {
+		$form->tmpl_param(allowauthor => 0);
+		$form->field(name => 'author', type => 'hidden', value => '',
+			force => 1);
+		$form->field(name => 'url', type => 'hidden', value => '',
+			force => 1);
+	}
+
 	# The untaint is OK (as in editpage) because we're about to pass
 	# it to file_pruned anyway
 	my $page = $form->field('page');
@@ -357,6 +420,19 @@ sub sessioncgi ($$) { #{{{
 		}
 	}
 
+	if ($allow_author) {
+		my $author = $form->field('author');
+		if (length $author) {
+			$author =~ s/"/&quot;/g;
+			$content .= " claimedauthor=\"$author\"\n";
+		}
+		my $url = $form->field('url');
+		if (length $url) {
+			$url =~ s/"/&quot;/g;
+			$content .= " url=\"$url\"\n";
+		}
+	}
+
 	my $subject = $form->field('subject');
 	$subject =~ s/"/&quot;/g;
 	$content .= " subject=\"$subject\"\n";
@@ -496,6 +572,26 @@ sub pagetemplate (@) { #{{{
 			$template->param(commenturl => $commenturl);
 		}
 	}
+
+	if ($template->query(name => 'commentuser')) {
+		$template->param(commentuser =>
+			$pagestate{$page}{comments}{commentuser});
+	}
+
+	if ($template->query(name => 'commentip')) {
+		$template->param(commentip =>
+			$pagestate{$page}{comments}{commentip});
+	}
+
+	if ($template->query(name => 'commentauthor')) {
+		$template->param(commentauthor =>
+			$pagestate{$page}{comments}{commentauthor});
+	}
+
+	if ($template->query(name => 'commentauthorurl')) {
+		$template->param(commentauthorurl =>
+			$pagestate{$page}{comments}{commentauthorurl});
+	}
 } # }}}
 
 package IkiWiki::PageSpec;
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
index 9eddaadf5..88301fcdc 100644
--- a/templates/comments_form.tmpl
+++ b/templates/comments_form.tmpl
@@ -4,6 +4,14 @@
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
+<TMPL_IF NAME=USERNAME>
+Signed in as <TMPL_VAR NAME=USERNAME ESCAPE=HTML><br />
+<TMPL_ELSE>
+<TMPL_IF NAME=ALLOWAUTHOR>
+<TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
+<TMPL_VAR NAME=FIELD-URL> (optional)<br />
+</TMPL_IF>
+</TMPL_IF>
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-EDITCONTENT><br />
 Page type: <TMPL_VAR FIELD-TYPE><br />
-- 
cgit v1.2.3


From fbf145ca3ff18985d0885ed939ee63123add9dbd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 02:03:07 +0000
Subject: comments: avoid warning if there's no subject

---
 IkiWiki/Plugin/comments.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6bd18a5cf..d1105b366 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -434,8 +434,10 @@ sub sessioncgi ($$) { #{{{
 	}
 
 	my $subject = $form->field('subject');
-	$subject =~ s/"/&quot;/g;
-	$content .= " subject=\"$subject\"\n";
+	if (length $subject) {
+		$subject =~ s/"/&quot;/g;
+		$content .= " subject=\"$subject\"\n";
+	}
 
 	$content .= " date=\"" . IkiWiki::formattime(time, '%X %x') . "\"\n";
 
-- 
cgit v1.2.3


From 1698364da0699d1494ee305162e33f48746057c0 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 02:22:20 +0000
Subject: comments: fix invocation of possibly_foolish_untaint

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d1105b366..4fa82f467 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -302,7 +302,7 @@ sub sessioncgi ($$) { #{{{
 
 	my $type = $form->param('type');
 	if (defined $type && length $type && $IkiWiki::hooks{htmlize}{$type}) {
-		$type = possibly_foolish_untaint($type);
+		$type = IkiWiki::possibly_foolish_untaint($type);
 	}
 	else {
 		$type = $config{default_pageext};
-- 
cgit v1.2.3


From 3560460eb6dad82b7fc81278475433d326ec0628 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 02:29:11 +0000
Subject: comments: don't interpolate IP into anonymous user's "name"

If an admin wants the IP in the comment display template they can still
get it (the default template shows it).
---
 IkiWiki/Plugin/comments.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4fa82f467..e43bbc49e 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -89,12 +89,10 @@ sub preprocess { # {{{
 		($commentauthorurl, $commentauthor) =
 			linkuser($params{username});
 	}
-	elsif (defined $params{ip}) {
-		$commentip = $params{ip};
-		$commentauthor = sprintf(
-			gettext("Anonymous (IP: %s)"), $params{ip});
-	}
 	else {
+		if (defined $params{ip}) {
+			$commentip = $params{ip};
+		}
 		$commentauthor = gettext("Anonymous");
 	}
 
-- 
cgit v1.2.3


From dd1fa13bce872141442ff134610e4b9175605a4e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 21:19:50 +0000
Subject: comments: Use new feedfile, emptyfeeds options to inline

---
 IkiWiki/Plugin/comments.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index e43bbc49e..888c9fd9c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -558,6 +558,8 @@ sub pagetemplate (@) { #{{{
 				reverse => 'yes',
 				page => $page,
 				destpage => $params{destpage},
+				feedfile => 'comments',
+				emptyfeeds => 'no',
 			);
 			$comments = IkiWiki::preprocess_inline(@args);
 		}
-- 
cgit v1.2.3


From f2d5ead6af148ab214ceb5f55406a1f0691e4261 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 21:23:55 +0000
Subject: comments: Change internal-use-only directive from [[!comment]] to
 [[!_comment]]

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 888c9fd9c..9ea4a3f69 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -17,7 +17,7 @@ use constant CANCEL => "Cancel";
 sub import { #{{{
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
-	hook(type => "preprocess", id => 'comment', call => \&preprocess);
+	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
@@ -403,7 +403,7 @@ sub sessioncgi ($$) { #{{{
 	my $anchor = "${comments_pagename}${i}";
 
 	$editcontent =~ s/"/\\"/g;
-	my $content = "[[!comment format=$type\n";
+	my $content = "[[!_comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
 	if (defined $session->param('name')) {
-- 
cgit v1.2.3


From 8d3a3c6a1e2a5a2be4213c2ce80c02e8f31dc9b4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 11 Dec 2008 17:31:57 -0500
Subject: simplifiy logic

---
 IkiWiki/Plugin/inline.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 17cc46e0e..d6ef6c54c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -312,8 +312,7 @@ sub preprocess_inline (@) { #{{{
 		# emptyfeeds cannot be hidden.
 		$emptyfeeds=1;
 	}
-	elsif ($feeds && !$params{preview} &&
-	       ! (! $emptyfeeds && ! @feedlist)) {
+	elsif ($feeds && !$params{preview} && ($emptyfeeds || @feedlist)) {
 		# Add feed buttons.
 		my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
 		$linktemplate->param(rssurl => $rssurl) if $rss;
@@ -390,7 +389,7 @@ sub preprocess_inline (@) { #{{{
 		}
 	}
 	
-	if ($feeds && ! (! $emptyfeeds && ! @feedlist)) {
+	if ($feeds && ($emptyfeeds || @feedlist)) {
 		if ($rss) {
 			my $rssp=$feedbase."rss".$feednum;
 			will_render($params{destpage}, $rssp);
-- 
cgit v1.2.3


From 1942fc3bd652868ab8d6842c2bb2bdf52c0ad9fb Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 12 Dec 2008 11:02:41 +0000
Subject: comments: Store dates in GMT and in ISO-8601

The [[!_comment]] directive is a serialization format, not something for
presentation to users, so we should use the least ambiguous possible
representation.
---
 IkiWiki/Plugin/comments.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 9ea4a3f69..4ed696026 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -9,6 +9,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use Encode;
+use POSIX qw(strftime);
 
 use constant PREVIEW => "Preview";
 use constant POST_COMMENT => "Post comment";
@@ -437,7 +438,7 @@ sub sessioncgi ($$) { #{{{
 		$content .= " subject=\"$subject\"\n";
 	}
 
-	$content .= " date=\"" . IkiWiki::formattime(time, '%X %x') . "\"\n";
+	$content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
 	$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
-- 
cgit v1.2.3


From 88e8d4bf8d99b6df83deb680f1ed8685e6447875 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 14:06:45 -0500
Subject: meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.

---
 IkiWiki/Plugin/meta.pm                             | 13 +++---
 debian/changelog                                   |  1 +
 ...ubber__95__skip_setting.___40__patch__41__.mdwn | 53 +---------------------
 3 files changed, 9 insertions(+), 58 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 8d444109f..3991797c0 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -38,9 +38,10 @@ sub needsbuild (@) { #{{{
 	}
 }
 
-sub scrub ($) { #{{{
+sub scrub ($$) { #{{{
 	if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
-		return IkiWiki::Plugin::htmlscrubber::sanitize(content => shift);
+		return IkiWiki::Plugin::htmlscrubber::sanitize(
+			content => shift, destpage => shift);
 	}
 	else {
 		return shift;
@@ -137,7 +138,7 @@ sub preprocess (@) { #{{{
 	elsif ($key eq 'permalink') {
 		if (safeurl($value)) {
 			$pagestate{$page}{meta}{permalink}=$value;
-			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />');
+			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
 		}
 	}
 	elsif ($key eq 'stylesheet') {
@@ -206,7 +207,7 @@ sub preprocess (@) { #{{{
 		my $delay=int(exists $params{delay} ? $params{delay} : 0);
 		my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
 		if (! $safe) {
-			$redir=scrub($redir);
+			$redir=scrub($redir, $destpage);
 		}
 		push @{$metaheaders{$page}}, $redir;
 	}
@@ -216,7 +217,7 @@ sub preprocess (@) { #{{{
 				join(" ", map {
 					encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
 				} keys %params).
-				" />\n");
+				" />\n", $destpage);
 		}
 	}
 	elsif ($key eq 'robots') {
@@ -225,7 +226,7 @@ sub preprocess (@) { #{{{
 	}
 	else {
 		push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
-			'" content="'.encode_entities($value).'" />');
+			'" content="'.encode_entities($value).'" />', $destpage);
 	}
 
 	return "";
diff --git a/debian/changelog b/debian/changelog
index 1ff78d749..bf14860dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * inline: Support emptyfeeds=no option to skip generating empty feeds.
   * inline: Support feedfile option to change the filename of the feed
     generated.
+  * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
diff --git a/doc/bugs/Meta_plugin_does_not_respect_htmlscrubber__95__skip_setting.___40__patch__41__.mdwn b/doc/bugs/Meta_plugin_does_not_respect_htmlscrubber__95__skip_setting.___40__patch__41__.mdwn
index 9d67d6662..0e40da551 100644
--- a/doc/bugs/Meta_plugin_does_not_respect_htmlscrubber__95__skip_setting.___40__patch__41__.mdwn
+++ b/doc/bugs/Meta_plugin_does_not_respect_htmlscrubber__95__skip_setting.___40__patch__41__.mdwn
@@ -8,55 +8,4 @@ Setting htmlscrubber_skip to the pagespec should stop this getting scrubbed but
 
 Below is a patch to fix that. It seams to work but I am not sure of it is the correct thing to do.
 
---- meta.pm	2008-12-11 17:50:33.000000000 +0000
-+++ meta.pm.orig	2008-12-10 17:41:23.000000000 +0000
-@@ -38,9 +38,10 @@
- 	}
- }
- 
--sub scrub (@) { #{{{
-+sub scrub ($) { #{{{
- 	if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
--		return IkiWiki::Plugin::htmlscrubber::sanitize(content => shift, destpage => shift);
-+		#return IkiWiki::Plugin::htmlscrubber::sanitize(content => shift);
-+		return shift;
- 	}
- 	else {
- 		return shift;
-@@ -137,7 +138,7 @@
- 	elsif ($key eq 'permalink') {
- 		if (safeurl($value)) {
- 			$pagestate{$page}{meta}{permalink}=$value;
--			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $page);
-+			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />');
- 		}
- 	}
- 	elsif ($key eq 'stylesheet') {
-@@ -206,7 +207,7 @@
- 		my $delay=int(exists $params{delay} ? $params{delay} : 0);
- 		my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
- 		if (! $safe) {
--			$redir=scrub($redir, $page);
-+			$redir=scrub($redir);
- 		}
- 		push @{$metaheaders{$page}}, $redir;
- 	}
-@@ -216,7 +217,7 @@
- 				join(" ", map {
- 					encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
- 				} keys %params).
--				" />\n", $page);
-+				" />\n");
- 		}
- 	}
- 	elsif ($key eq 'robots') {
-@@ -225,7 +226,7 @@
- 	}
- 	else {
- 		push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
--			'" content="'.encode_entities($value).'" />', $page);
-+			'" content="'.encode_entities($value).'" />');
- 	}
- 
- 	return "";
-
+> [[done]], thanks for the patch --[[Joey]]
-- 
cgit v1.2.3


From 473160c947f7c986ac692814190422ad85242346 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 18 Nov 2008 11:25:13 +0000
Subject: htmlbalance: don't compact whitespace, and set misc other options

Not compacting whitespace is the most important one: now that we run
sanitize hooks on individual posted comments in the comments plugin,
whitespace that is significant to Markdown (but not HTML) is lost.
(cherry picked from commit cb5aaa3cee8b35d6fc6e88a7449a9477a6587c7a)
---
 IkiWiki/Plugin/htmlbalance.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 3a2d62d15..dcd92055f 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -30,7 +30,15 @@ sub sanitize (@) { #{{{
 	my %params=@_;
 	my $ret = '';
 
-	my $tree = HTML::TreeBuilder->new_from_content($params{content});
+	my $tree = HTML::TreeBuilder->new();
+	$tree->ignore_unknown(0);
+	$tree->ignore_ignorable_whitespace(0);
+	$tree->no_space_compacting(1);
+	$tree->p_strict(1);
+	$tree->store_comments(0);
+	$tree->store_declarations(0);
+	$tree->store_pis(0);
+	$tree->parse_content($params{content});
 	my @nodes = $tree->disembowel();
 	foreach my $node (@nodes) {
 		if (ref $node) {
-- 
cgit v1.2.3


From 38c92e63bb012da98019faf9bc11037c5cbd5a99 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 14:59:23 -0500
Subject: move getsetup to usual place

---
 IkiWiki/Plugin/comments.pm | 124 ++++++++++++++++++++++-----------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4ed696026..8d333f05f 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -26,6 +26,68 @@ sub import { #{{{
 	IkiWiki::loadplugin("inline");
 } # }}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+		# Pages where comments are shown, but new comments are not
+		# allowed, will show "Comments are closed".
+		comments_shown_pagespec => {
+			type => 'pagespec',
+			example => 'blog/*',
+			default => '',
+			description => 'PageSpec for pages where comments will be shown inline',
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 1,
+		},
+		comments_open_pagespec => {
+			type => 'pagespec',
+			example => 'blog/* and created_after(close_old_comments)',
+			default => '',
+			description => 'PageSpec for pages where new comments can be posted',
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 1,
+		},
+		comments_pagename => {
+			type => 'string',
+			example => 'comment_',
+			default => 'comment_',
+			description => 'Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"',
+			safe => 0, # manual page moving required
+			rebuild => undef,
+		},
+		comments_allowdirectives => {
+			type => 'boolean',
+			default => 0,
+			example => 0,
+			description => 'Interpret directives in comments?',
+			safe => 1,
+			rebuild => 0,
+		},
+		comments_allowauthor => {
+			type => 'boolean',
+			default => 0,
+			example => 0,
+			description => 'Allow anonymous commenters to set an author name?',
+			safe => 1,
+			rebuild => 0,
+		},
+		comments_commit => {
+			type => 'boolean',
+			example => 1,
+			default => 1,
+			description => 'commit comments to the VCS',
+			# old uncommitted comments are likely to cause
+			# confusion if this is changed
+			safe => 0,
+			rebuild => 0,
+		},
+} #}}}
+
 sub htmlize { # {{{
 	my %params = @_;
 	return $params{content};
@@ -145,68 +207,6 @@ sub preprocess { # {{{
 	return $content;
 } # }}}
 
-sub getsetup () { #{{{
-	return
-		plugin => {
-			safe => 1,
-			rebuild => 1,
-		},
-		# Pages where comments are shown, but new comments are not
-		# allowed, will show "Comments are closed".
-		comments_shown_pagespec => {
-			type => 'pagespec',
-			example => 'blog/*',
-			default => '',
-			description => 'PageSpec for pages where comments will be shown inline',
-			link => 'ikiwiki/PageSpec',
-			safe => 1,
-			rebuild => 1,
-		},
-		comments_open_pagespec => {
-			type => 'pagespec',
-			example => 'blog/* and created_after(close_old_comments)',
-			default => '',
-			description => 'PageSpec for pages where new comments can be posted',
-			link => 'ikiwiki/PageSpec',
-			safe => 1,
-			rebuild => 1,
-		},
-		comments_pagename => {
-			type => 'string',
-			example => 'comment_',
-			default => 'comment_',
-			description => 'Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"',
-			safe => 0, # manual page moving will required
-			rebuild => undef,
-		},
-		comments_allowdirectives => {
-			type => 'boolean',
-			default => 0,
-			example => 0,
-			description => 'Interpret directives in comments?',
-			safe => 1,
-			rebuild => 0,
-		},
-		comments_allowauthor => {
-			type => 'boolean',
-			default => 0,
-			example => 0,
-			description => 'Allow anonymous commenters to set an author name?',
-			safe => 1,
-			rebuild => 0,
-		},
-		comments_commit => {
-			type => 'boolean',
-			example => 1,
-			default => 1,
-			description => 'commit comments to the VCS',
-			# old uncommitted comments are likely to cause
-			# confusion if this is changed
-			safe => 0,
-			rebuild => 0,
-		},
-} #}}}
-
 sub checkconfig () { #{{{
 	$config{comments_commit} = 1 unless defined $config{comments_commit};
 	$config{comments_pagename} = 'comment_'
-- 
cgit v1.2.3


From 0ced5995d531ed108a2eec8cee7a3586cd757add Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:05:26 -0500
Subject: get rid of the [postcomment] hack

I think that using a flag variable is sorta cleaner.

(This is untested.)
---
 IkiWiki/Plugin/comments.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8d333f05f..0de7a6743 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -15,6 +15,8 @@ use constant PREVIEW => "Preview";
 use constant POST_COMMENT => "Post comment";
 use constant CANCEL => "Cancel";
 
+my $postcomment;
+
 sub import { #{{{
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
@@ -383,7 +385,11 @@ sub sessioncgi ($$) { #{{{
 			$page));
 	}
 
-	IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
+	# Set a flag to indicate that we're posting a comment,
+	# so that postcomment() can tell it should match.
+	$postcomment=1;
+	IkiWiki::check_canedit($page, $cgi, $session);
+	$postcomment=0;
 
 	my $editcontent = $form->field('editcontent') || '';
 	$editcontent =~ s/\r\n/\n/g;
@@ -603,7 +609,7 @@ sub match_postcomment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	unless ($page =~ s/\[postcomment\]$//) {
+	if (! $postcomment) {
 		return IkiWiki::FailReason->new("not posting a comment");
 	}
 	return match_glob($page, $glob);
-- 
cgit v1.2.3


From 2a7849b8385c21dfa8a6f764a5e2cf8ea5f97070 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:08:06 -0500
Subject: avoid unnecessary variable

---
 IkiWiki/Plugin/comments.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0de7a6743..f612f8947 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -558,7 +558,7 @@ sub pagetemplate (@) { #{{{
 			eval q{use IkiWiki::Plugin::inline};
 			error($@) if $@;
 
-			my @args = (
+			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/${comments_pagename}*)",
 				template => 'comments_display',
 				show => 0,
@@ -568,7 +568,6 @@ sub pagetemplate (@) { #{{{
 				feedfile => 'comments',
 				emptyfeeds => 'no',
 			);
-			$comments = IkiWiki::preprocess_inline(@args);
 		}
 
 		if (defined $comments && length $comments) {
-- 
cgit v1.2.3


From 18eeb068a6be7e45add2775a4014c85e3b41b465 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:10:17 -0500
Subject: don't explicitly use inline

loadplugin("inline") should take care of that
---
 IkiWiki/Plugin/comments.pm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index f612f8947..4999c3f24 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -555,9 +555,6 @@ sub pagetemplate (@) { #{{{
 		}
 
 		if ($shown) {
-			eval q{use IkiWiki::Plugin::inline};
-			error($@) if $@;
-
 			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/${comments_pagename}*)",
 				template => 'comments_display',
-- 
cgit v1.2.3


From f3735891cad0ca00f72ca4c68d444ca61382ad4b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:13:07 -0500
Subject: whitespace

---
 IkiWiki/Plugin/comments.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4999c3f24..6c8952d45 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -112,12 +112,12 @@ sub preprocess { # {{{
 	my $page = $params{page};
 
 	my $format = $params{format};
-	if (defined $format && !exists $IkiWiki::hooks{htmlize}{$format}) {
+	if (defined $format && ! exists $IkiWiki::hooks{htmlize}{$format}) {
 		error(sprintf(gettext("unsupported page format %s"), $format));
 	}
 
 	my $content = $params{content};
-	if (!defined $content) {
+	if (! defined $content) {
 		error(gettext("comment must have content"));
 	}
 	$content =~ s/\\"/"/g;
@@ -165,10 +165,10 @@ sub preprocess { # {{{
 	$pagestate{$page}{comments}{commentip} = $commentip;
 	$pagestate{$page}{comments}{commentauthor} = $commentauthor;
 	$pagestate{$page}{comments}{commentauthorurl} = $commentauthorurl;
-	if (!defined $pagestate{$page}{meta}{author}) {
+	if (! defined $pagestate{$page}{meta}{author}) {
 		$pagestate{$page}{meta}{author} = $commentauthor;
 	}
-	if (!defined $pagestate{$page}{meta}{authorurl}) {
+	if (! defined $pagestate{$page}{meta}{authorurl}) {
 		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
 	}
 
@@ -221,7 +221,7 @@ sub linkcgi ($) { #{{{
 	if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
 
 		my $page=decode_utf8($cgi->param("page"));
-		if (!defined $page) {
+		if (! defined $page) {
 			error("missing page parameter");
 		}
 
@@ -310,7 +310,7 @@ sub sessioncgi ($$) { #{{{
 	}
 	my @page_types;
 	if (exists $IkiWiki::hooks{htmlize}) {
-		@page_types = grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}};
+		@page_types = grep { ! /^_/ } keys %{$IkiWiki::hooks{htmlize}};
 	}
 
 	my $allow_author = $config{comments_allowauthor};
@@ -326,7 +326,7 @@ sub sessioncgi ($$) { #{{{
 
 	$form->tmpl_param(username => $session->param('name'));
 
-	if ($allow_author and !defined $session->param('name')) {
+	if ($allow_author and ! defined $session->param('name')) {
 		$form->tmpl_param(allowauthor => 1);
 		$form->field(name => 'author', type => 'text', size => '40');
 		$form->field(name => 'url', type => 'text', size => '40');
@@ -343,7 +343,7 @@ sub sessioncgi ($$) { #{{{
 	# it to file_pruned anyway
 	my $page = $form->field('page');
 	$page = IkiWiki::possibly_foolish_untaint($page);
-	if (!defined $page || !length $page ||
+	if (! defined $page || ! length $page ||
 		IkiWiki::file_pruned($page, $config{srcdir})) {
 		error(gettext("bad page name"));
 	}
-- 
cgit v1.2.3


From 9557c7c8905f08361aabd1215fa3bc19badf9a4f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:19:01 -0500
Subject: move related code together

---
 IkiWiki/Plugin/comments.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6c8952d45..c458ea9da 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -391,10 +391,6 @@ sub sessioncgi ($$) { #{{{
 	IkiWiki::check_canedit($page, $cgi, $session);
 	$postcomment=0;
 
-	my $editcontent = $form->field('editcontent') || '';
-	$editcontent =~ s/\r\n/\n/g;
-	$editcontent =~ s/\r/\n/g;
-
 	# FIXME: check that the wiki is locked right now, because
 	# if it's not, there are mad race conditions!
 
@@ -409,7 +405,6 @@ sub sessioncgi ($$) { #{{{
 
 	my $anchor = "${comments_pagename}${i}";
 
-	$editcontent =~ s/"/\\"/g;
 	my $content = "[[!_comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
@@ -446,6 +441,10 @@ sub sessioncgi ($$) { #{{{
 
 	$content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
+	my $editcontent = $form->field('editcontent') || '';
+	$editcontent =~ s/\r\n/\n/g;
+	$editcontent =~ s/\r/\n/g;
+	$editcontent =~ s/"/\\"/g;
 	$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
 	# This is essentially a simplified version of editpage:
-- 
cgit v1.2.3


From 928f6938d25c1d72ab81d75e8b67ab32e45df89c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:22:43 -0500
Subject: fix redefinition of $author

---
 IkiWiki/Plugin/comments.pm | 2 --
 1 file changed, 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index c458ea9da..972d069d5 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -403,8 +403,6 @@ sub sessioncgi ($$) { #{{{
 		$location = "$page/${comments_pagename}${i}";
 	} while (-e "$config{srcdir}/$location._comment");
 
-	my $anchor = "${comments_pagename}${i}";
-
 	my $content = "[[!_comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
-- 
cgit v1.2.3


From ef972a871bd61295068d7a105036924699c65540 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:25:12 -0500
Subject: remove fixme

sessioncgi hooks are always called with the wiki locked
---
 IkiWiki/Plugin/comments.pm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 972d069d5..273561cad 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -391,9 +391,6 @@ sub sessioncgi ($$) { #{{{
 	IkiWiki::check_canedit($page, $cgi, $session);
 	$postcomment=0;
 
-	# FIXME: check that the wiki is locked right now, because
-	# if it's not, there are mad race conditions!
-
 	# FIXME: rather a simplistic way to make the comments...
 	my $i = 0;
 	my $file;
-- 
cgit v1.2.3


From 15ec55eff58d056704b7911d8ed3975a4f09d65c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 15:38:23 -0500
Subject: elide unnecessary variables

---
 IkiWiki/Plugin/comments.pm | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 273561cad..1eb256da9 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -192,8 +192,7 @@ sub preprocess { # {{{
 
 	my $baseurl = urlto($params{destpage}, undef, 1);
 	my $anchor = "";
-	my $comments_pagename = $config{comments_pagename};
-	if ($params{page} =~ m/\/(\Q${comments_pagename}\E\d+)$/) {
+	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
 		$anchor = $1;
 	}
 	$pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";
@@ -313,8 +312,6 @@ sub sessioncgi ($$) { #{{{
 		@page_types = grep { ! /^_/ } keys %{$IkiWiki::hooks{htmlize}};
 	}
 
-	my $allow_author = $config{comments_allowauthor};
-
 	$form->field(name => 'do', type => 'hidden');
 	$form->field(name => 'sid', type => 'hidden', value => $session->id,
 		force => 1);
@@ -326,7 +323,8 @@ sub sessioncgi ($$) { #{{{
 
 	$form->tmpl_param(username => $session->param('name'));
 
-	if ($allow_author and ! defined $session->param('name')) {
+	if ($config{comments_allowauthor} and
+	    ! defined $session->param('name')) {
 		$form->tmpl_param(allowauthor => 1);
 		$form->field(name => 'author', type => 'text', size => '40');
 		$form->field(name => 'url', type => 'text', size => '40');
@@ -348,10 +346,6 @@ sub sessioncgi ($$) { #{{{
 		error(gettext("bad page name"));
 	}
 
-	my $allow_directives = $config{comments_allowdirectives};
-	my $commit_comments = $config{comments_commit};
-	my $comments_pagename = $config{comments_pagename};
-
 	# FIXME: is this right? Or should we be using the candidate subpage
 	# (whatever that might mean) as the base URL?
 	my $baseurl = urlto($page, undef, 1);
@@ -363,7 +357,7 @@ sub sessioncgi ($$) { #{{{
 		htmllink($page, $page, 'ikiwiki/formatting',
 			noimageinline => 1,
 			linktext => 'FormattingHelp'),
-			allowdirectives => $allow_directives);
+			allowdirectives => $config{allow_directives});
 
 	if ($form->submitted eq CANCEL) {
 		# bounce back to the page they wanted to comment on, and exit.
@@ -397,7 +391,7 @@ sub sessioncgi ($$) { #{{{
 	my $location;
 	do {
 		$i++;
-		$location = "$page/${comments_pagename}${i}";
+		$location = "$page/$config{comments_pagename}$i";
 	} while (-e "$config{srcdir}/$location._comment");
 
 	my $content = "[[!_comment format=$type\n";
@@ -415,7 +409,7 @@ sub sessioncgi ($$) { #{{{
 		}
 	}
 
-	if ($allow_author) {
+	if ($config{comments_allowauthor}) {
 		my $author = $form->field('author');
 		if (length $author) {
 			$author =~ s/"/&quot;/g;
@@ -482,7 +476,7 @@ sub sessioncgi ($$) { #{{{
 
 		my $conflict;
 
-		if ($config{rcs} and $commit_comments) {
+		if ($config{rcs} and $config{comments_commit}) {
 			my $message = gettext("Added a comment");
 			if (defined $form->field('subject') &&
 				length $form->field('subject')) {
@@ -509,7 +503,7 @@ sub sessioncgi ($$) { #{{{
 		error($conflict) if defined $conflict;
 
 		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/${comments_pagename}${i}";
+		my $anticache = "?updated=$page/$config{comments_pagename}$i";
 		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
 	}
 	else {
@@ -529,14 +523,12 @@ sub pagetemplate (@) { #{{{
 	if ($template->query(name => 'comments')) {
 		my $comments = undef;
 
-		my $comments_pagename = $config{comments_pagename};
-
 		my $open = 0;
 		my $shown = pagespec_match($page,
 			$config{comments_shown_pagespec},
 			location => $page);
 
-		if (pagespec_match($page, "*/${comments_pagename}*",
+		if (pagespec_match($page, "*/$config{comments_pagename}*",
 				location => $page)) {
 			$shown = 0;
 			$open = 0;
@@ -550,7 +542,7 @@ sub pagetemplate (@) { #{{{
 
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
-				pages => "internal($page/${comments_pagename}*)",
+				pages => "internal($page/$config{comments_pagename}*)",
 				template => 'comments_display',
 				show => 0,
 				reverse => 'yes',
-- 
cgit v1.2.3


From b2366f764b799522c323730eee34d99afc70cad1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 13:56:10 -0500
Subject: rename: Fix double-escaping of page name in edit box.

titlepage normally escapes, but so does formbuilder.
---
 IkiWiki/Plugin/rename.pm | 2 +-
 debian/changelog         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 7e55e271c..e4201cc94 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -111,7 +111,7 @@ sub rename_form ($$$) { #{{{
 	
 	$f->field(name => "do", type => "hidden", value => "rename", force => 1);
 	$f->field(name => "page", type => "hidden", value => $page, force => 1);
-	$f->field(name => "new_name", value => pagetitle($page), size => 60);
+	$f->field(name => "new_name", value => pagetitle($page, 1), size => 60);
 	if (!$q->param("attachment")) {
 		# insert the standard extensions
 		my @page_types;
diff --git a/debian/changelog b/debian/changelog
index 76f00157d..b43144b36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
     generated.
   * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
   * htmlbalance: don't compact whitespace, and set misc other options (smcv)
+  * rename: Fix double-escaping of page name in edit box.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
-- 
cgit v1.2.3


From f9b87a9f8b498f3a41614b159dcb278024be70dd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 13:59:12 -0500
Subject: monotone: When getting the log, tell monotone how many entries we
 want, rather than closing the pipe, which it dislikes. (thm)

---
 IkiWiki/Plugin/monotone.pm                                           | 5 ++---
 debian/changelog                                                     | 2 ++
 ...mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index f31a8606b..3a8b267a3 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -525,13 +525,12 @@ sub rcs_recentchanges ($) { #{{{
 	my $child = open(MTNLOG, "-|");
 	if (! $child) {
 		exec("mtn", "log", "--root=$config{mtnrootdir}", "--no-graph",
-		     "--brief") || error("mtn log failed to run");
+		     "--brief", "--last=$num") || error("mtn log failed to run");
 	}
 
-	while (($num >= 0) and (my $line = <MTNLOG>)) {
+	while (my $line = <MTNLOG>) {
 		if ($line =~ m/^($sha1_pattern)/) {
 			push @revs, $1;
-			$num -= 1;
 		}
 	}
 	close MTNLOG || debug("mtn log exited $?");
diff --git a/debian/changelog b/debian/changelog
index b43144b36..8f5783208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
   * htmlbalance: don't compact whitespace, and set misc other options (smcv)
   * rename: Fix double-escaping of page name in edit box.
+  * monotone: When getting the log, tell monotone how many entries
+    we want, rather than closing the pipe, which it dislikes. (thm)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
diff --git a/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn b/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
index 2167deac4..aa13ec339 100644
--- a/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
+++ b/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
@@ -19,3 +19,6 @@ When using monotone as revision control system, a "mtn: operation canceled: Brok
      		}
      	}
      	close MTNLOG || debug("mtn log exited $?");
+
+> Thanks for the patch, and for testing the monotone backend.
+> applied [[done]] --[[Joey]]
-- 
cgit v1.2.3


From 985b229be632126f376aaad7bd354d0d7d014464 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 14:26:08 -0500
Subject: checksessionexpiry: rework

This function as factored out was a bit confusing, I think this makes more
sense.
---
 IkiWiki/CGI.pm             | 14 ++++++++------
 IkiWiki/Plugin/comments.pm |  2 +-
 IkiWiki/Plugin/editpage.pm |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index a3486cbb4..a45e12e31 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -36,7 +36,7 @@ sub showform ($$$$;@) { #{{{
 
 	printheader($session);
 	print misctemplate($form->title, $form->render(submit => $buttons), @_);
-}
+} #}}}
 
 sub redirect ($$) { #{{{
 	my $q=shift;
@@ -273,7 +273,7 @@ sub check_banned ($$) { #{{{
 			exit;
 		}
 	}
-}
+} #}}}
 
 sub cgi_getsession ($) { #{{{
 	my $q=shift;
@@ -296,14 +296,16 @@ sub cgi_getsession ($) { #{{{
 	return $session;
 } #}}}
 
-# The session id is stored on the form and checked to
-# guard against CSRF. But only if the user is logged in,
-# as anonok can allow anonymous edits.
+# To guard against CSRF, the user's session id (sid)
+# can be stored on a form. This function will check
+# (for logged in users) that the sid on the form matches
+# the session id in the cookie.
 sub checksessionexpiry ($$) { # {{{
+	my $q=shift;
 	my $session = shift;
-	my $sid = shift;
 
 	if (defined $session->param("name")) {
+		my $sid=$q->param('sid');
 		if (! defined $sid || $sid ne $session->id) {
 			error(gettext("Your login session has expired."));
 		}
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 1eb256da9..b8748a1d6 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -468,7 +468,7 @@ sub sessioncgi ($$) { #{{{
 	if ($form->submitted eq POST_COMMENT && $form->validate) {
 		my $file = "$location._comment";
 
-		IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
+		IkiWiki::checksessionexpiry($cgi, $session);
 
 		# FIXME: could probably do some sort of graceful retry
 		# on error? Would require significant unwinding though
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index e4f0cdac0..242624d77 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -340,7 +340,7 @@ sub cgi_editpage ($$) { #{{{
 	else {
 		# save page
 		check_canedit($page, $q, $session);
-		checksessionexpiry($session, $q->param('sid'));
+		checksessionexpiry($q, $session, $q->param('sid'));
 
 		my $exists=-e "$config{srcdir}/$file";
 
-- 
cgit v1.2.3


From bb93fccf0690344aa77f9538a508959a6de09847 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 15:22:16 -0500
Subject: Coding style change: Remove explcit vim folding markers.

---
 IkiWiki.pm                                         | 388 ++++++++++-----------
 IkiWiki/CGI.pm                                     |  60 ++--
 IkiWiki/Plugin/aggregate.pm                        | 108 +++---
 IkiWiki/Plugin/amazon_s3.pm                        |  32 +-
 IkiWiki/Plugin/anonok.pm                           |  12 +-
 IkiWiki/Plugin/attachment.pm                       |  32 +-
 IkiWiki/Plugin/autoindex.pm                        |  16 +-
 IkiWiki/Plugin/brokenlinks.pm                      |  12 +-
 IkiWiki/Plugin/bzr.pm                              |  54 +--
 IkiWiki/Plugin/calendar.pm                         |  30 +-
 IkiWiki/Plugin/camelcase.pm                        |  14 +-
 IkiWiki/Plugin/color.pm                            |  20 +-
 IkiWiki/Plugin/comments.pm                         |  38 +-
 IkiWiki/Plugin/conditional.pm                      |  28 +-
 IkiWiki/Plugin/creole.pm                           |  12 +-
 IkiWiki/Plugin/cutpaste.pm                         |  20 +-
 IkiWiki/Plugin/ddate.pm                            |  12 +-
 IkiWiki/Plugin/editdiff.pm                         |  16 +-
 IkiWiki/Plugin/editpage.pm                         |  16 +-
 IkiWiki/Plugin/edittemplate.pm                     |  24 +-
 IkiWiki/Plugin/embed.pm                            |  20 +-
 IkiWiki/Plugin/external.pm                         |  48 +--
 IkiWiki/Plugin/favicon.pm                          |  12 +-
 IkiWiki/Plugin/filecheck.pm                        |  30 +-
 IkiWiki/Plugin/format.pm                           |   8 +-
 IkiWiki/Plugin/fortune.pm                          |  12 +-
 IkiWiki/Plugin/git.pm                              |  72 ++--
 IkiWiki/Plugin/goodstuff.pm                        |   8 +-
 IkiWiki/Plugin/google.pm                           |  16 +-
 IkiWiki/Plugin/googlecalendar.pm                   |  20 +-
 IkiWiki/Plugin/graphviz.pm                         |  16 +-
 IkiWiki/Plugin/haiku.pm                            |  12 +-
 IkiWiki/Plugin/hnb.pm                              |  12 +-
 IkiWiki/Plugin/html.pm                             |  12 +-
 IkiWiki/Plugin/htmlbalance.pm                      |  12 +-
 IkiWiki/Plugin/htmlscrubber.pm                     |  16 +-
 IkiWiki/Plugin/htmltidy.pm                         |  12 +-
 IkiWiki/Plugin/httpauth.pm                         |  12 +-
 IkiWiki/Plugin/img.pm                              |  12 +-
 IkiWiki/Plugin/inline.pm                           |  54 +--
 IkiWiki/Plugin/link.pm                             |  24 +-
 IkiWiki/Plugin/linkmap.pm                          |  20 +-
 IkiWiki/Plugin/listdirectives.pm                   |  20 +-
 IkiWiki/Plugin/lockedit.pm                         |  16 +-
 IkiWiki/Plugin/map.pm                              |  12 +-
 IkiWiki/Plugin/mdwn.pm                             |  12 +-
 IkiWiki/Plugin/mercurial.pm                        |  52 +--
 IkiWiki/Plugin/meta.pm                             |  52 +--
 IkiWiki/Plugin/mirrorlist.pm                       |  16 +-
 IkiWiki/Plugin/monotone.pm                         |  72 ++--
 IkiWiki/Plugin/more.pm                             |  10 +-
 IkiWiki/Plugin/norcs.pm                            |  48 +--
 IkiWiki/Plugin/opendiscussion.pm                   |  12 +-
 IkiWiki/Plugin/openid.pm                           |  28 +-
 IkiWiki/Plugin/orphans.pm                          |  12 +-
 IkiWiki/Plugin/otl.pm                              |  16 +-
 IkiWiki/Plugin/pagecount.pm                        |  12 +-
 IkiWiki/Plugin/pagestats.pm                        |  12 +-
 IkiWiki/Plugin/pagetemplate.pm                     |  16 +-
 IkiWiki/Plugin/parentlinks.pm                      |  16 +-
 IkiWiki/Plugin/passwordauth.pm                     |  26 +-
 IkiWiki/Plugin/pingee.pm                           |  12 +-
 IkiWiki/Plugin/pinger.pm                           |  16 +-
 IkiWiki/Plugin/poll.pm                             |  16 +-
 IkiWiki/Plugin/polygen.pm                          |  12 +-
 IkiWiki/Plugin/postsparkline.pm                    |  12 +-
 IkiWiki/Plugin/prettydate.pm                       |  16 +-
 IkiWiki/Plugin/progress.pm                         |  16 +-
 IkiWiki/Plugin/rawhtml.pm                          |   8 +-
 IkiWiki/Plugin/recentchanges.pm                    |  30 +-
 IkiWiki/Plugin/recentchangesdiff.pm                |  12 +-
 IkiWiki/Plugin/relativedate.pm                     |  20 +-
 IkiWiki/Plugin/remove.pm                           |  34 +-
 IkiWiki/Plugin/rename.pm                           |  48 +--
 IkiWiki/Plugin/search.pm                           |  40 +--
 IkiWiki/Plugin/shortcut.pm                         |  20 +-
 IkiWiki/Plugin/sidebar.pm                          |  16 +-
 IkiWiki/Plugin/signinedit.pm                       |  12 +-
 IkiWiki/Plugin/skeleton.pm.example                 | 102 +++---
 IkiWiki/Plugin/smiley.pm                           |  16 +-
 IkiWiki/Plugin/sparkline.pm                        |  12 +-
 IkiWiki/Plugin/svn.pm                              |  54 +--
 IkiWiki/Plugin/table.pm                            |  26 +-
 IkiWiki/Plugin/tag.pm                              |  32 +-
 IkiWiki/Plugin/template.pm                         |  12 +-
 IkiWiki/Plugin/testpagespec.pm                     |  12 +-
 IkiWiki/Plugin/teximg.pm                           |  32 +-
 IkiWiki/Plugin/textile.pm                          |  12 +-
 IkiWiki/Plugin/tla.pm                              |  46 +--
 IkiWiki/Plugin/toc.pm                              |  14 +-
 IkiWiki/Plugin/toggle.pm                           |  28 +-
 IkiWiki/Plugin/txt.pm                              |   4 +-
 IkiWiki/Plugin/typography.pm                       |  16 +-
 IkiWiki/Plugin/version.pm                          |  16 +-
 IkiWiki/Plugin/websetup.pm                         |  36 +-
 IkiWiki/Plugin/wikitext.pm                         |  12 +-
 IkiWiki/Receive.pm                                 |  16 +-
 IkiWiki/Render.pm                                  |  34 +-
 IkiWiki/Setup.pm                                   |  12 +-
 IkiWiki/Setup/Automator.pm                         |  12 +-
 IkiWiki/Setup/Standard.pm                          |  16 +-
 IkiWiki/UserInfo.pm                                |  32 +-
 IkiWiki/Wrapper.pm                                 |   4 +-
 debian/changelog                                   |   1 +
 .../Allow_overriding_of_symlink_restriction.mdwn   |   6 +-
 doc/bugs/Can__39__t_create_root_page.mdwn          |   4 +-
 ...dency_in_eval_while_running_with_-T_switch.mdwn |   4 +-
 doc/bugs/Monotone_rcs_support.mdwn                 |   2 +-
 ..._blog_items_when_filename_contains_a_colon.mdwn |   8 +-
 doc/bugs/Problem_with_toc.pm_plug-in.mdwn          |   4 +-
 doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn    |  14 +-
 .../RecentChanges_broken_with_empty_svnpath.mdwn   |   2 +-
 ...itles_are_lower-cased_when_creating_a_page.mdwn |   2 +-
 ...n_and_a_directive_does_not_contain_a_space.mdwn |   4 +-
 ...celed:_Broken_pipe__34_____40__patch__41__.mdwn |   2 +-
 doc/bugs/git_stderr_output_causes_problems.mdwn    |   2 +-
 ...plugin_should_pass_through_class_attribute.mdwn |   4 +-
 doc/bugs/inline_sort-by-title_issues.mdwn          |   2 +-
 doc/bugs/mercurial_fail_to_add.mdwn                |   2 +-
 doc/bugs/methodResponse_in_add__95__plugins.mdwn   |   2 +-
 doc/bugs/multiple_pages_with_same_name.mdwn        |   6 +-
 ...pec_parsing_chokes_on_function__40____41__.mdwn |   2 +-
 doc/bugs/prune_causing_taint_mode_failures.mdwn    |   4 +-
 doc/bugs/quieten_mercurial.mdwn                    |   4 +-
 ..._for_locale_data_in_the_installed_location.mdwn |   2 +-
 doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn  |   6 +-
 doc/plugins/contrib/headinganchors.mdwn            |   8 +-
 doc/plugins/contrib/siterel2pagerel.mdwn           |   8 +-
 doc/plugins/contrib/unixauth.mdwn                  |  24 +-
 .../Add_DATE_parameter_for_use_in_templates.mdwn   |  14 +-
 ...for_latest_Text::Markdown_as_found_on_CPAN.mdwn |   2 +-
 doc/todo/Allow_change_of_wiki_file_types.mdwn      |   8 +-
 doc/todo/Allow_edittemplate_to_set_file_type.mdwn  |   8 +-
 .../Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn |   8 +-
 doc/todo/Default_text_for_new_pages.mdwn           |   8 +-
 ..._templates_inserted_by_the_template_plugin.mdwn |   2 +-
 ...nline_plugin_option_to_show_full_page_path.mdwn |   2 +-
 .../Move_teximg_latex_preamble_to_config_file.mdwn |  10 +-
 ...bitrary_date_to_be_used_by_calendar_plugin.mdwn |  12 +-
 doc/todo/Silence_monotone_warning.mdwn             |   2 +-
 ...side_of_link__40____41___within_a_pagespec.mdwn |   4 +-
 doc/todo/Wrapper_config_with_multiline_regexp.mdwn |   4 +-
 .../add_forward_age_sorting_option_to_inline.mdwn  |   2 +-
 .../discussion.mdwn                                |  20 +-
 doc/todo/blogpost_plugin.mdwn                      |  20 +-
 doc/todo/bzr.mdwn                                  |  28 +-
 doc/todo/cas_authentication.mdwn                   |  14 +-
 doc/todo/color_plugin.mdwn                         |  20 +-
 doc/todo/darcs.mdwn                                |  26 +-
 doc/todo/datearchives-plugin.mdwn                  |   8 +-
 doc/todo/different_search_engine.mdwn              |  40 +--
 doc/todo/directive_docs.mdwn                       |  12 +-
 doc/todo/enable-htaccess-files.mdwn                |   2 +-
 doc/todo/format_escape.mdwn                        |  16 +-
 .../fortune:_select_options_via_environment.mdwn   |   4 +-
 doc/todo/index.html_allowed.mdwn                   |  10 +-
 doc/todo/inline:_numerical_ordering_by_title.mdwn  |  22 +-
 .../language_definition_for_the_meta_plugin.mdwn   |   4 +-
 doc/todo/meta_rcsid.mdwn                           |   2 +-
 doc/todo/missingparents.pm.mdwn                    |  44 +--
 doc/todo/modify_page_filename_in_plugin.mdwn       |   6 +-
 doc/todo/pagespec_relative_to_a_target.mdwn        |  16 +-
 doc/todo/provide_sha1_for_git_diffurl.mdwn         |   2 +-
 doc/todo/require_CAPTCHA_to_edit.mdwn              |  22 +-
 doc/todo/source_link.mdwn                          |  14 +-
 doc/todo/structured_page_data.mdwn                 |  50 +--
 .../supporting_comments_via_disussion_pages.mdwn   |  12 +-
 doc/todo/syntax_highlighting.mdwn                  |   4 +-
 doc/todo/tidy_git__39__s_ctime_debug_output.mdwn   |   2 +-
 doc/todo/tmplvars_plugin.mdwn                      |  12 +-
 doc/todo/tracking_bugs_with_dependencies.mdwn      |  58 +--
 ...turn_edittemplate_verbosity_off_by_default.mdwn |   6 +-
 doc/todo/using_meta_titles_for_parentlinks.html    |   8 +-
 ...closures_for_values__41___in_ikiwiki.setup.mdwn |   8 +-
 ikiwiki.in                                         |  12 +-
 175 files changed, 1776 insertions(+), 1775 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1c68c2cb3..d93ff7374 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -34,7 +34,7 @@ memoize("abs2rel");
 memoize("pagespec_translate");
 memoize("file_pruned");
 
-sub getsetup () { #{{{
+sub getsetup () {
 	wikiname => {
 		type => "string",
 		default => "wiki",
@@ -431,9 +431,9 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
-} #}}}
+}
 
-sub defaultconfig () { #{{{
+sub defaultconfig () {
 	my %s=getsetup();
 	my @ret;
 	foreach my $key (keys %s) {
@@ -441,9 +441,9 @@ sub defaultconfig () { #{{{
 	}
 	use Data::Dumper;
 	return @ret;
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	# locale stuff; avoid LC_ALL since it overrides everything
 	if (defined $ENV{LC_ALL}) {
 		$ENV{LANG} = $ENV{LC_ALL};
@@ -490,9 +490,9 @@ sub checkconfig () { #{{{
 	run_hooks(checkconfig => sub { shift->() });
 
 	return 1;
-} #}}}
+}
 
-sub listplugins () { #{{{
+sub listplugins () {
 	my %ret;
 
 	foreach my $dir (@INC, $config{libdir}) {
@@ -510,9 +510,9 @@ sub listplugins () { #{{{
 	}
 
 	return keys %ret;
-} #}}}
+}
 
-sub loadplugins () { #{{{
+sub loadplugins () {
 	if (defined $config{libdir} && length $config{libdir}) {
 		unshift @INC, possibly_foolish_untaint($config{libdir});
 	}
@@ -539,9 +539,9 @@ sub loadplugins () { #{{{
 	}
 
 	return 1;
-} #}}}
+}
 
-sub loadplugin ($) { #{{{
+sub loadplugin ($) {
 	my $plugin=shift;
 
 	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
@@ -567,9 +567,9 @@ sub loadplugin ($) { #{{{
 	}
 	$loaded_plugins{$plugin}=1;
 	return 1;
-} #}}}
+}
 
-sub error ($;$) { #{{{
+sub error ($;$) {
 	my $message=shift;
 	my $cleaner=shift;
 	log_message('err' => $message) if $config{syslog};
@@ -577,15 +577,15 @@ sub error ($;$) { #{{{
 		$cleaner->();
 	}
 	die $message."\n";
-} #}}}
+}
 
-sub debug ($) { #{{{
+sub debug ($) {
 	return unless $config{verbose};
 	return log_message(debug => @_);
-} #}}}
+}
 
 my $log_open=0;
-sub log_message ($$) { #{{{
+sub log_message ($$) {
 	my $type=shift;
 
 	if ($config{syslog}) {
@@ -605,44 +605,44 @@ sub log_message ($$) { #{{{
 	else {
 		return print STDERR "@_\n";
 	}
-} #}}}
+}
 
-sub possibly_foolish_untaint ($) { #{{{
+sub possibly_foolish_untaint ($) {
 	my $tainted=shift;
 	my ($untainted)=$tainted=~/(.*)/s;
 	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 =~ /\.([^.]+)$/) {
 		return $1 if exists $hooks{htmlize}{$1};
 	}
 	return;
-} #}}}
+}
 
-sub isinternal ($) { #{{{
+sub isinternal ($) {
 	my $page=shift;
 	return exists $pagesources{$page} &&
 		$pagesources{$page} =~ /\._([^.]+)$/;
-} #}}}
+}
 
-sub pagename ($) { #{{{
+sub pagename ($) {
 	my $file=shift;
 
 	my $type=pagetype($file);
@@ -652,9 +652,9 @@ sub pagename ($) { #{{{
 		$page=$1;
 	}
 	return $page;
-} #}}}
+}
 
-sub newpagefile ($$) { #{{{
+sub newpagefile ($$) {
 	my $page=shift;
 	my $type=shift;
 
@@ -664,9 +664,9 @@ sub newpagefile ($$) { #{{{
 	else {
 		return $page."/index.".$type;
 	}
-} #}}}
+}
 
-sub targetpage ($$;$) { #{{{
+sub targetpage ($$;$) {
 	my $page=shift;
 	my $ext=shift;
 	my $filename=shift;
@@ -680,15 +680,15 @@ sub targetpage ($$;$) { #{{{
 	else {
 		return $page."/index.".$ext;
 	}
-} #}}}
+}
 
-sub htmlpage ($) { #{{{
+sub htmlpage ($) {
 	my $page=shift;
 	
 	return targetpage($page, $config{htmlext});
-} #}}}
+}
 
-sub srcfile_stat { #{{{
+sub srcfile_stat {
 	my $file=shift;
 	my $nothrow=shift;
 
@@ -698,13 +698,13 @@ sub srcfile_stat { #{{{
 	}
 	error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow;
 	return;
-} #}}}
+}
 
-sub srcfile ($;$) { #{{{
+sub srcfile ($;$) {
 	return (srcfile_stat(@_))[0];
-} #}}}
+}
 
-sub add_underlay ($) { #{{{
+sub add_underlay ($) {
 	my $dir=shift;
 
 	if ($dir !~ /^\//) {
@@ -716,9 +716,9 @@ sub add_underlay ($) { #{{{
 	}
 
 	return 1;
-} #}}}
+}
 
-sub readfile ($;$$) { #{{{
+sub readfile ($;$$) {
 	my $file=shift;
 	my $binary=shift;
 	my $wantfd=shift;
@@ -738,9 +738,9 @@ sub readfile ($;$$) { #{{{
 	}
 	close $in || error("failed to read $file: $!");
 	return $ret;
-} #}}}
+}
 
-sub prep_writefile ($$) { #{{{
+sub prep_writefile ($$) {
 	my $file=shift;
 	my $destdir=shift;
 	
@@ -764,9 +764,9 @@ sub prep_writefile ($$) { #{{{
 	}
 
 	return 1;
-} #}}}
+}
 
-sub writefile ($$$;$$) { #{{{
+sub writefile ($$$;$$) {
 	my $file=shift; # can include subdirs
 	my $destdir=shift; # directory to put file in
 	my $content=shift;
@@ -794,10 +794,10 @@ sub writefile ($$$;$$) { #{{{
 		error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
 
 	return 1;
-} #}}}
+}
 
 my %cleared;
-sub will_render ($$;$) { #{{{
+sub will_render ($$;$) {
 	my $page=shift;
 	my $dest=shift;
 	my $clear=shift;
@@ -821,9 +821,9 @@ sub will_render ($$;$) { #{{{
 	$destsources{$dest}=$page;
 
 	return 1;
-} #}}}
+}
 
-sub bestlink ($$) { #{{{
+sub bestlink ($$) {
 	my $page=shift;
 	my $link=shift;
 	
@@ -859,15 +859,15 @@ sub bestlink ($$) { #{{{
 
 	#print STDERR "warning: page $page, broken link: $link\n";
 	return "";
-} #}}}
+}
 
-sub isinlinableimage ($) { #{{{
+sub isinlinableimage ($) {
 	my $file=shift;
 	
 	return $file =~ /\.(png|gif|jpg|jpeg)$/i;
-} #}}}
+}
 
-sub pagetitle ($;$) { #{{{
+sub pagetitle ($;$) {
 	my $page=shift;
 	my $unescaped=shift;
 
@@ -879,31 +879,31 @@ sub pagetitle ($;$) { #{{{
 	}
 
 	return $page;
-} #}}}
+}
 
-sub titlepage ($) { #{{{
+sub titlepage ($) {
 	my $title=shift;
 	# support use w/o %config set
 	my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
 	$title=~s/([^$chars]|_)/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
 	return $title;
-} #}}}
+}
 
-sub linkpage ($) { #{{{
+sub linkpage ($) {
 	my $link=shift;
 	my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
 	$link=~s/([^$chars])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
 	return $link;
-} #}}}
+}
 
-sub cgiurl (@) { #{{{
+sub cgiurl (@) {
 	my %params=@_;
 
 	return $config{cgiurl}."?".
 		join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);
-} #}}}
+}
 
-sub baseurl (;$) { #{{{
+sub baseurl (;$) {
 	my $page=shift;
 
 	return "$config{url}/" if ! defined $page;
@@ -912,9 +912,9 @@ sub baseurl (;$) { #{{{
 	$page=~s/[^\/]+$//;
 	$page=~s/[^\/]+\//..\//g;
 	return $page;
-} #}}}
+}
 
-sub abs2rel ($$) { #{{{
+sub abs2rel ($$) {
 	# Work around very innefficient behavior in File::Spec if abs2rel
 	# is passed two relative paths. It's much faster if paths are
 	# absolute! (Debian bug #376658; fixed in debian unstable now)
@@ -925,15 +925,15 @@ sub abs2rel ($$) { #{{{
 	my $ret=File::Spec->abs2rel($path, $base);
 	$ret=~s/^// if defined $ret;
 	return $ret;
-} #}}}
+}
 
-sub displaytime ($;$) { #{{{
+sub displaytime ($;$) {
 	# Plugins can override this function to mark up the time to
 	# display.
 	return '<span class="date">'.formattime(@_).'</span>';
-} #}}}
+}
 
-sub formattime ($;$) { #{{{
+sub formattime ($;$) {
 	# Plugins can override this function to format the time.
 	my $time=shift;
 	my $format=shift;
@@ -944,9 +944,9 @@ sub formattime ($;$) { #{{{
 	# strftime doesn't know about encodings, so make sure
 	# its output is properly treated as utf8
 	return decode_utf8(POSIX::strftime($format, localtime($time)));
-} #}}}
+}
 
-sub beautify_urlpath ($) { #{{{
+sub beautify_urlpath ($) {
 	my $url=shift;
 
 	if ($config{usedirs}) {
@@ -960,9 +960,9 @@ sub beautify_urlpath ($) { #{{{
 	}
 
 	return $url;
-} #}}}
+}
 
-sub urlto ($$;$) { #{{{
+sub urlto ($$;$) {
 	my $to=shift;
 	my $from=shift;
 	my $absolute=shift;
@@ -982,9 +982,9 @@ sub urlto ($$;$) { #{{{
 	my $link = abs2rel($to, dirname(htmlpage($from)));
 
 	return beautify_urlpath($link);
-} #}}}
+}
 
-sub htmllink ($$$;@) { #{{{
+sub htmllink ($$$;@) {
 	my $lpage=shift; # the page doing the linking
 	my $page=shift; # the page that will contain the link (different for inline)
 	my $link=shift;
@@ -1047,9 +1047,9 @@ sub htmllink ($$$;@) { #{{{
 	}
 
 	return "<a href=\"$bestlink\"@attrs>$linktext</a>";
-} #}}}
+}
 
-sub userlink ($) { #{{{
+sub userlink ($) {
 	my $user=shift;
 
 	my $oiduser=eval { openiduser($user) };
@@ -1064,9 +1064,9 @@ sub userlink ($) { #{{{
 			length $config{userdir} ? $config{userdir}."/".$user : $user
 		), noimageinline => 1);
 	}
-} #}}}
+}
 
-sub htmlize ($$$$) { #{{{
+sub htmlize ($$$$) {
 	my $page=shift;
 	my $destpage=shift;
 	my $type=shift;
@@ -1101,9 +1101,9 @@ sub htmlize ($$$$) { #{{{
 	}
 
 	return $content;
-} #}}}
+}
 
-sub linkify ($$$) { #{{{
+sub linkify ($$$) {
 	my $page=shift;
 	my $destpage=shift;
 	my $content=shift;
@@ -1117,11 +1117,11 @@ sub linkify ($$$) { #{{{
 	});
 	
 	return $content;
-} #}}}
+}
 
 our %preprocessing;
 our $preprocess_preview=0;
-sub preprocess ($$$;$$) { #{{{
+sub preprocess ($$$;$$) {
 	my $page=shift; # the page the data comes from
 	my $destpage=shift; # the page the data will appear in (different for inline)
 	my $content=shift;
@@ -1274,9 +1274,9 @@ sub preprocess ($$$;$$) { #{{{
 
 	$content =~ s{$regex}{$handle->($1, $2, $3, $4)}eg;
 	return $content;
-} #}}}
+}
 
-sub filter ($$$) { #{{{
+sub filter ($$$) {
 	my $page=shift;
 	my $destpage=shift;
 	my $content=shift;
@@ -1287,15 +1287,15 @@ sub filter ($$$) { #{{{
 	});
 
 	return $content;
-} #}}}
+}
 
-sub indexlink () { #{{{
+sub indexlink () {
 	return "<a href=\"$config{url}\">$config{wikiname}</a>";
-} #}}}
+}
 
 my $wikilock;
 
-sub lockwiki () { #{{{
+sub lockwiki () {
 	# Take an exclusive lock on the wiki to prevent multiple concurrent
 	# run issues. The lock will be dropped on program exit.
 	if (! -d $config{wikistatedir}) {
@@ -1307,17 +1307,17 @@ sub lockwiki () { #{{{
 		error("failed to get lock");
 	}
 	return 1;
-} #}}}
+}
 
-sub unlockwiki () { #{{{
+sub unlockwiki () {
 	POSIX::close($ENV{IKIWIKI_CGILOCK_FD}) if exists $ENV{IKIWIKI_CGILOCK_FD};
 	return close($wikilock) if $wikilock;
 	return;
-} #}}}
+}
 
 my $commitlock;
 
-sub commit_hook_enabled () { #{{{
+sub commit_hook_enabled () {
 	open($commitlock, '+>', "$config{wikistatedir}/commitlock") ||
 		error("cannot write to $config{wikistatedir}/commitlock: $!");
 	if (! flock($commitlock, 1 | 4)) { # LOCK_SH | LOCK_NB to test
@@ -1326,23 +1326,23 @@ sub commit_hook_enabled () { #{{{
 	}
 	close($commitlock) || error("failed closing commitlock: $!");
 	return 1;
-} #}}}
+}
 
-sub disable_commit_hook () { #{{{
+sub disable_commit_hook () {
 	open($commitlock, '>', "$config{wikistatedir}/commitlock") ||
 		error("cannot write to $config{wikistatedir}/commitlock: $!");
 	if (! flock($commitlock, 2)) { # LOCK_EX
 		error("failed to get commit lock");
 	}
 	return 1;
-} #}}}
+}
 
-sub enable_commit_hook () { #{{{
+sub enable_commit_hook () {
 	return close($commitlock) if $commitlock;
 	return;
-} #}}}
+}
 
-sub loadindex () { #{{{
+sub loadindex () {
 	%oldrenderedfiles=%pagectime=();
 	if (! $config{rebuild}) {
 		%pagesources=%pagemtime=%oldlinks=%links=%depends=
@@ -1402,9 +1402,9 @@ sub loadindex () { #{{{
 		$destsources{$_}=$page foreach @{$renderedfiles{$page}};
 	}
 	return close($in);
-} #}}}
+}
 
-sub saveindex () { #{{{
+sub saveindex () {
 	run_hooks(savestate => sub { shift->() });
 
 	my %hookids;
@@ -1460,18 +1460,18 @@ sub saveindex () { #{{{
 		error("failed renaming $newfile to $config{wikistatedir}/indexdb", $cleanup);
 	
 	return 1;
-} #}}}
+}
 
-sub template_file ($) { #{{{
+sub template_file ($) {
 	my $template=shift;
 
 	foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
 		return "$dir/$template" if -e "$dir/$template";
 	}
 	return;
-} #}}}
+}
 
-sub template_params (@) { #{{{
+sub template_params (@) {
 	my $filename=template_file(shift);
 
 	if (! defined $filename) {
@@ -1490,14 +1490,14 @@ sub template_params (@) { #{{{
 		@_
 	);
 	return wantarray ? @ret : {@ret};
-} #}}}
+}
 
-sub template ($;@) { #{{{
+sub template ($;@) {
 	require HTML::Template;
 	return HTML::Template->new(template_params(@_));
-} #}}}
+}
 
-sub misctemplate ($$;@) { #{{{
+sub misctemplate ($$;@) {
 	my $title=shift;
 	my $pagebody=shift;
 	
@@ -1514,9 +1514,9 @@ sub misctemplate ($$;@) { #{{{
 		shift->(page => "", destpage => "", template => $template);
 	});
 	return $template->output;
-}#}}}
+}
 
-sub hook (@) { # {{{
+sub hook (@) {
 	my %param=@_;
 	
 	if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {
@@ -1527,9 +1527,9 @@ sub hook (@) { # {{{
 	
 	$hooks{$param{type}}{$param{id}}=\%param;
 	return 1;
-} # }}}
+}
 
-sub run_hooks ($$) { # {{{
+sub run_hooks ($$) {
 	# Calls the given sub for each hook of the given type,
 	# passing it the hook function to call.
 	my $type=shift;
@@ -1550,53 +1550,53 @@ sub run_hooks ($$) { # {{{
 	}
 
 	return 1;
-} #}}}
+}
 
-sub rcs_update () { #{{{
+sub rcs_update () {
 	$hooks{rcs}{rcs_update}{call}->(@_);
-} #}}}
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	$hooks{rcs}{rcs_prepedit}{call}->(@_);
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	$hooks{rcs}{rcs_commit}{call}->(@_);
-} #}}}
+}
 
-sub rcs_commit_staged ($$$) { #{{{
+sub rcs_commit_staged ($$$) {
 	$hooks{rcs}{rcs_commit_staged}{call}->(@_);
-} #}}}
+}
 
-sub rcs_add ($) { #{{{
+sub rcs_add ($) {
 	$hooks{rcs}{rcs_add}{call}->(@_);
-} #}}}
+}
 
-sub rcs_remove ($) { #{{{
+sub rcs_remove ($) {
 	$hooks{rcs}{rcs_remove}{call}->(@_);
-} #}}}
+}
 
-sub rcs_rename ($$) { #{{{
+sub rcs_rename ($$) {
 	$hooks{rcs}{rcs_rename}{call}->(@_);
-} #}}}
+}
 
-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {
 	$hooks{rcs}{rcs_recentchanges}{call}->(@_);
-} #}}}
+}
 
-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {
 	$hooks{rcs}{rcs_diff}{call}->(@_);
-} #}}}
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
-} #}}}
+}
 
-sub rcs_receive () { #{{{
+sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
-} #}}}
+}
 
-sub globlist_to_pagespec ($) { #{{{
+sub globlist_to_pagespec ($) {
 	my @globlist=split(' ', shift);
 
 	my (@spec, @skip);
@@ -1620,20 +1620,20 @@ sub globlist_to_pagespec ($) { #{{{
 		}
 	}
 	return $spec;
-} #}}}
+}
 
-sub is_globlist ($) { #{{{
+sub is_globlist ($) {
 	my $s=shift;
 	return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-} #}}}
+}
 
-sub safequote ($) { #{{{
+sub safequote ($) {
 	my $s=shift;
 	$s=~s/[{}]//g;
 	return "q{$s}";
-} #}}}
+}
 
-sub add_depends ($$) { #{{{
+sub add_depends ($$) {
 	my $page=shift;
 	my $pagespec=shift;
 	
@@ -1647,9 +1647,9 @@ sub add_depends ($$) { #{{{
 	}
 
 	return 1;
-} # }}}
+}
 
-sub file_pruned ($$) { #{{{
+sub file_pruned ($$) {
 	require File::Spec;
 	my $file=File::Spec->canonpath(shift);
 	my $base=File::Spec->canonpath(shift);
@@ -1657,9 +1657,9 @@ sub file_pruned ($$) { #{{{
 
 	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
 	return $file =~ m/$regexp/ && $file ne $base;
-} #}}}
+}
 
-sub gettext { #{{{
+sub gettext {
 	# Only use gettext in the rare cases it's needed.
 	if ((exists $ENV{LANG} && length $ENV{LANG}) ||
 	    (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
@@ -1680,15 +1680,15 @@ sub gettext { #{{{
 	else {
 		return shift;
 	}
-} #}}}
+}
 
-sub yesno ($) { #{{{
+sub yesno ($) {
 	my $val=shift;
 
 	return (defined $val && lc($val) eq gettext("yes"));
-} #}}}
+}
 
-sub inject { #{{{
+sub inject {
 	# Injects a new function into the symbol table to replace an
 	# exported function.
 	my %params=@_;
@@ -1711,9 +1711,9 @@ sub inject { #{{{
 	}
 	use strict;
 	use warnings;
-} #}}}
+}
 
-sub pagespec_merge ($$) { #{{{
+sub pagespec_merge ($$) {
 	my $a=shift;
 	my $b=shift;
 
@@ -1728,9 +1728,9 @@ sub pagespec_merge ($$) { #{{{
         }
 
 	return "($a) or ($b)";
-} #}}}
+}
 
-sub pagespec_translate ($) { #{{{
+sub pagespec_translate ($) {
 	my $spec=shift;
 
 	# Support for old-style GlobLists.
@@ -1784,9 +1784,9 @@ sub pagespec_translate ($) { #{{{
 
 	no warnings;
 	return eval 'sub { my $page=shift; '.$code.' }';
-} #}}}
+}
 
-sub pagespec_match ($$;@) { #{{{
+sub pagespec_match ($$;@) {
 	my $page=shift;
 	my $spec=shift;
 	my @params=@_;
@@ -1799,55 +1799,55 @@ sub pagespec_match ($$;@) { #{{{
 	my $sub=pagespec_translate($spec);
 	return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
 	return $sub->($page, @params);
-} #}}}
+}
 
-sub pagespec_valid ($) { #{{{
+sub pagespec_valid ($) {
 	my $spec=shift;
 
 	my $sub=pagespec_translate($spec);
 	return ! $@;
-} #}}}
+}
 
-sub glob2re ($) { #{{{
+sub glob2re ($) {
 	my $re=quotemeta(shift);
 	$re=~s/\\\*/.*/g;
 	$re=~s/\\\?/./g;
 	return $re;
-} #}}}
+}
 
 package IkiWiki::FailReason;
 
-use overload ( #{{{
+use overload (
 	'""'	=> sub { ${$_[0]} },
 	'0+'	=> sub { 0 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::SuccessReason'},
 	fallback => 1,
-); #}}}
+);
 
-sub new { #{{{
+sub new {
 	my $class = shift;
 	my $value = shift;
 	return bless \$value, $class;
-} #}}}
+}
 
 package IkiWiki::SuccessReason;
 
-use overload ( #{{{
+use overload (
 	'""'	=> sub { ${$_[0]} },
 	'0+'	=> sub { 1 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::FailReason'},
 	fallback => 1,
-); #}}}
+);
 
-sub new { #{{{
+sub new {
 	my $class = shift;
 	my $value = shift;
 	return bless \$value, $class;
-}; #}}}
+};
 
 package IkiWiki::PageSpec;
 
-sub match_glob ($$;@) { #{{{
+sub match_glob ($$;@) {
 	my $page=shift;
 	my $glob=shift;
 	my %params=@_;
@@ -1873,13 +1873,13 @@ sub match_glob ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("$glob does not match $page");
 	}
-} #}}}
+}
 
-sub match_internal ($$;@) { #{{{
+sub match_internal ($$;@) {
 	return match_glob($_[0], $_[1], @_, internal => 1)
-} #}}}
+}
 
-sub match_link ($$;@) { #{{{
+sub match_link ($$;@) {
 	my $page=shift;
 	my $link=lc(shift);
 	my %params=@_;
@@ -1911,13 +1911,13 @@ sub match_link ($$;@) { #{{{
 		}
 	}
 	return IkiWiki::FailReason->new("$page does not link to $link");
-} #}}}
+}
 
-sub match_backlink ($$;@) { #{{{
+sub match_backlink ($$;@) {
 	return match_link($_[1], $_[0], @_);
-} #}}}
+}
 
-sub match_created_before ($$;@) { #{{{
+sub match_created_before ($$;@) {
 	my $page=shift;
 	my $testpage=shift;
 
@@ -1932,9 +1932,9 @@ sub match_created_before ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("$testpage has no ctime");
 	}
-} #}}}
+}
 
-sub match_created_after ($$;@) { #{{{
+sub match_created_after ($$;@) {
 	my $page=shift;
 	my $testpage=shift;
 
@@ -1949,36 +1949,36 @@ sub match_created_after ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("$testpage has no ctime");
 	}
-} #}}}
+}
 
-sub match_creation_day ($$;@) { #{{{
+sub match_creation_day ($$;@) {
 	if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
 		return IkiWiki::SuccessReason->new('creation_day matched');
 	}
 	else {
 		return IkiWiki::FailReason->new('creation_day did not match');
 	}
-} #}}}
+}
 
-sub match_creation_month ($$;@) { #{{{
+sub match_creation_month ($$;@) {
 	if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
 		return IkiWiki::SuccessReason->new('creation_month matched');
 	}
 	else {
 		return IkiWiki::FailReason->new('creation_month did not match');
 	}
-} #}}}
+}
 
-sub match_creation_year ($$;@) { #{{{
+sub match_creation_year ($$;@) {
 	if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
 		return IkiWiki::SuccessReason->new('creation_year matched');
 	}
 	else {
 		return IkiWiki::FailReason->new('creation_year did not match');
 	}
-} #}}}
+}
 
-sub match_user ($$;@) { #{{{
+sub match_user ($$;@) {
 	shift;
 	my $user=shift;
 	my %params=@_;
@@ -1996,9 +1996,9 @@ sub match_user ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("user is $params{user}, not $user");
 	}
-} #}}}
+}
 
-sub match_admin ($$;@) { #{{{
+sub match_admin ($$;@) {
 	shift;
 	shift;
 	my %params=@_;
@@ -2016,9 +2016,9 @@ sub match_admin ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("user is not an admin");
 	}
-} #}}}
+}
 
-sub match_ip ($$;@) { #{{{
+sub match_ip ($$;@) {
 	shift;
 	my $ip=shift;
 	my %params=@_;
@@ -2033,6 +2033,6 @@ sub match_ip ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index a45e12e31..81cb42d13 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -9,7 +9,7 @@ use IkiWiki::UserInfo;
 use open qw{:utf8 :std};
 use Encode;
 
-sub printheader ($) { #{{{
+sub printheader ($) {
 	my $session=shift;
 	
 	if ($config{sslcookie}) {
@@ -19,9 +19,9 @@ sub printheader ($) { #{{{
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1));
 	}
-} #}}}
+}
 
-sub showform ($$$$;@) { #{{{
+sub showform ($$$$;@) {
 	my $form=shift;
 	my $buttons=shift;
 	my $session=shift;
@@ -36,9 +36,9 @@ sub showform ($$$$;@) { #{{{
 
 	printheader($session);
 	print misctemplate($form->title, $form->render(submit => $buttons), @_);
-} #}}}
+}
 
-sub redirect ($$) { #{{{
+sub redirect ($$) {
 	my $q=shift;
 	my $url=shift;
 	if (! $config{w3mmode}) {
@@ -48,9 +48,9 @@ sub redirect ($$) { #{{{
 		print "Content-type: text/plain\n";
 		print "W3m-control: GOTO $url\n\n";
 	}
-} #}}}
+}
 
-sub decode_cgi_utf8 ($) { #{{{
+sub decode_cgi_utf8 ($) {
 	# decode_form_utf8 method is needed for 5.10
 	if ($] < 5.01) {
 		my $cgi = shift;
@@ -58,9 +58,9 @@ sub decode_cgi_utf8 ($) { #{{{
 			$cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
 		}
 	}
-} #}}}
+}
 
-sub decode_form_utf8 ($) { #{{{
+sub decode_form_utf8 ($) {
 	if ($] >= 5.01) {
 		my $form = shift;
 		foreach my $f ($form->field) {
@@ -70,11 +70,11 @@ sub decode_form_utf8 ($) { #{{{
 			);
 		}
 	}
-} #}}}
+}
 
 # Check if the user is signed in. If not, redirect to the signin form and
 # save their place to return to later.
-sub needsignin ($$) { #{{{
+sub needsignin ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -85,9 +85,9 @@ sub needsignin ($$) { #{{{
 		cgi_savesession($session);
 		exit;
 	}
-} #}}}	
+}
 
-sub cgi_signin ($$) { #{{{
+sub cgi_signin ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -127,9 +127,9 @@ sub cgi_signin ($$) { #{{{
 	}
 
 	showform($form, $buttons, $session, $q);
-} #}}}
+}
 
-sub cgi_postsignin ($$) { #{{{
+sub cgi_postsignin ($$) {
 	my $q=shift;
 	my $session=shift;
 	
@@ -144,9 +144,9 @@ sub cgi_postsignin ($$) { #{{{
 	else {
 		error(gettext("login failed, perhaps you need to turn on cookies?"));
 	}
-} #}}}
+}
 
-sub cgi_prefs ($$) { #{{{
+sub cgi_prefs ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -254,9 +254,9 @@ sub cgi_prefs ($$) { #{{{
 	}
 	
 	showform($form, $buttons, $session, $q);
-} #}}}
+}
 
-sub check_banned ($$) { #{{{
+sub check_banned ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -273,9 +273,9 @@ sub check_banned ($$) { #{{{
 			exit;
 		}
 	}
-} #}}}
+}
 
-sub cgi_getsession ($) { #{{{
+sub cgi_getsession ($) {
 	my $q=shift;
 
 	eval q{use CGI::Session; use HTML::Entities};
@@ -294,13 +294,13 @@ sub cgi_getsession ($) { #{{{
 	umask($oldmask);
 
 	return $session;
-} #}}}
+}
 
 # To guard against CSRF, the user's session id (sid)
 # can be stored on a form. This function will check
 # (for logged in users) that the sid on the form matches
 # the session id in the cookie.
-sub checksessionexpiry ($$) { # {{{
+sub checksessionexpiry ($$) {
 	my $q=shift;
 	my $session = shift;
 
@@ -310,18 +310,18 @@ sub checksessionexpiry ($$) { # {{{
 			error(gettext("Your login session has expired."));
 		}
 	}
-} # }}}
+}
 
-sub cgi_savesession ($) { #{{{
+sub cgi_savesession ($) {
 	my $session=shift;
 
 	# Force session flush with safe umask.
 	my $oldmask=umask(077);
 	$session->flush;
 	umask($oldmask);
-} #}}}
+}
 
-sub cgi (;$$) { #{{{
+sub cgi (;$$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -391,16 +391,16 @@ sub cgi (;$$) { #{{{
 	else {
 		error("unknown do parameter");
 	}
-} #}}}
+}
 
 # Does not need to be called directly; all errors will go through here.
-sub cgierror ($) { #{{{
+sub cgierror ($) {
 	my $message=shift;
 
 	print "Content-type: text/html\n\n";
 	print misctemplate(gettext("Error"),
 		"<p class=\"error\">".gettext("Error").": $message</p>");
 	die $@;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index adaa619ab..29bc6d0ce 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -14,7 +14,7 @@ use open qw{:utf8 :std};
 my %feeds;
 my %guids;
 
-sub import { #{{{
+sub import {
 	hook(type => "getopt", id => "aggregate", call => \&getopt);
 	hook(type => "getsetup", id => "aggregate", call => \&getsetup);
 	hook(type => "checkconfig", id => "aggregate", call => \&checkconfig);
@@ -26,9 +26,9 @@ sub import { #{{{
 	if (exists $config{aggregate_webtrigger} && $config{aggregate_webtrigger}) {
 		hook(type => "cgi", id => "aggregate", call => \&cgi);
 	}
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
         eval q{use Getopt::Long};
 	error($@) if $@;
         Getopt::Long::Configure('pass_through');
@@ -36,9 +36,9 @@ sub getopt () { #{{{
 		"aggregate" => \$config{aggregate},
 		"aggregateinternal!" => \$config{aggregateinternal},
 	);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -58,16 +58,16 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if ($config{aggregate} && ! ($config{post_commit} && 
 	                             IkiWiki::commit_hook_enabled())) {
 		launchaggregation();
 	}
-} #}}}
+}
 
-sub cgi ($) { #{{{
+sub cgi ($) {
 	my $cgi=shift;
 
 	if (defined $cgi->param('do') &&
@@ -90,9 +90,9 @@ sub cgi ($) { #{{{
 		}
 		exit 0;
 	}
-} #}}}
+}
 
-sub launchaggregation () { #{{{
+sub launchaggregation () {
 	# See if any feeds need aggregation.
 	loadstate();
 	my @feeds=needsaggregate();
@@ -135,16 +135,16 @@ sub launchaggregation () { #{{{
 	unlockaggregate();
 
 	return 1;
-} #}}}
+}
 
 #  Pages with extension _aggregated have plain html markup, pass through.
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	return $params{content};
-} #}}}
+}
 
 # Used by ikiwiki-transition aggregateinternal.
-sub migrate_to_internal { #{{{
+sub migrate_to_internal {
 	if (! lockaggregate()) {
 		error("an aggregation process is currently running");
 	}
@@ -190,9 +190,9 @@ sub migrate_to_internal { #{{{
 	IkiWiki::unlockwiki;
 	
 	unlockaggregate();
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 	
 	loadstate();
@@ -206,9 +206,9 @@ sub needsbuild (@) { #{{{
 			markunseen($feed->{sourcepage});
 		}
 	}
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	foreach my $required (qw{name url}) {
@@ -265,9 +265,9 @@ sub preprocess (@) { #{{{
 	       ($feed->{newposts} ? "; ".$feed->{newposts}.
 	                            " ".gettext("new") : "").
 	       ")";
-} # }}}
+}
 
-sub delete (@) { #{{{
+sub delete (@) {
 	my @files=@_;
 
 	# Remove feed data for removed pages.
@@ -275,9 +275,9 @@ sub delete (@) { #{{{
 		my $page=pagename($file);
 		markunseen($page);
 	}
-} #}}}
+}
 
-sub markunseen ($) { #{{{
+sub markunseen ($) {
 	my $page=shift;
 
 	foreach my $id (keys %feeds) {
@@ -285,11 +285,11 @@ sub markunseen ($) { #{{{
 			$feeds{$id}->{unseen}=1;
 		}
 	}
-} #}}}
+}
 
 my $state_loaded=0;
 
-sub loadstate () { #{{{
+sub loadstate () {
 	return if $state_loaded;
 	$state_loaded=1;
 	if (-e "$config{wikistatedir}/aggregate") {
@@ -323,9 +323,9 @@ sub loadstate () { #{{{
 
 		close IN;
 	}
-} #}}}
+}
 
-sub savestate () { #{{{
+sub savestate () {
 	return unless $state_loaded;
 	garbage_collect();
 	my $newfile="$config{wikistatedir}/aggregate.new";
@@ -350,9 +350,9 @@ sub savestate () { #{{{
 	close OUT || error("save $newfile: $!", $cleanup);
 	rename($newfile, "$config{wikistatedir}/aggregate") ||
 		error("rename $newfile: $!", $cleanup);
-} #}}}
+}
 
-sub garbage_collect () { #{{{
+sub garbage_collect () {
 	foreach my $name (keys %feeds) {
 		# remove any feeds that were not seen while building the pages
 		# that used to contain them
@@ -375,9 +375,9 @@ sub garbage_collect () { #{{{
 			delete $guid->{md5};
 		}
 	}
-} #}}}
+}
 
-sub mergestate () { #{{{
+sub mergestate () {
 	# Load the current state in from disk, and merge into it
 	# values from the state in memory that might have changed
 	# during aggregation.
@@ -407,15 +407,15 @@ sub mergestate () { #{{{
 			$guids{$guid}=$myguids{$guid};
 		}
 	}
-} #}}}
+}
 
-sub clearstate () { #{{{
+sub clearstate () {
 	%feeds=();
 	%guids=();
 	$state_loaded=0;
-} #}}}
+}
 
-sub expire () { #{{{
+sub expire () {
 	foreach my $feed (values %feeds) {
 		next unless $feed->{expireage} || $feed->{expirecount};
 		my $count=0;
@@ -444,14 +444,14 @@ sub expire () { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub needsaggregate () { #{{{
+sub needsaggregate () {
 	return values %feeds if $config{rebuild};
 	return grep { time - $_->{lastupdate} >= $_->{updateinterval} } values %feeds;
-} #}}}
+}
 
-sub aggregate (@) { #{{{
+sub aggregate (@) {
 	eval q{use XML::Feed};
 	error($@) if $@;
 	eval q{use URI::Fetch};
@@ -542,9 +542,9 @@ sub aggregate (@) { #{{{
 			);
 		}
 	}
-} #}}}
+}
 
-sub add_page (@) { #{{{
+sub add_page (@) {
 	my %params=@_;
 	
 	my $feed=$params{feed};
@@ -635,21 +635,21 @@ sub add_page (@) { #{{{
 		# Dummy value for expiry code.
 		$IkiWiki::pagectime{$guid->{page}}=time;
 	}
-} #}}}
+}
 
-sub wikiescape ($) { #{{{
+sub wikiescape ($) {
 	# escape accidental wikilinks and preprocessor stuff
 	return encode_entities(shift, '\[\]');
-} #}}}
+}
 
-sub urlabs ($$) { #{{{
+sub urlabs ($$) {
 	my $url=shift;
 	my $urlbase=shift;
 
 	URI->new_abs($url, $urlbase)->as_string;
-} #}}}
+}
 
-sub htmlabs ($$) { #{{{
+sub htmlabs ($$) {
 	# Convert links in html from relative to absolute.
 	# Note that this is a heuristic, which is not specified by the rss
 	# spec and may not be right for all feeds. Also, see Debian
@@ -685,15 +685,15 @@ sub htmlabs ($$) { #{{{
 	$p->eof;
 
 	return $ret;
-} #}}}
+}
 
-sub htmlfn ($) { #{{{
+sub htmlfn ($) {
 	return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
-} #}}}
+}
 
 my $aggregatelock;
 
-sub lockaggregate () { #{{{
+sub lockaggregate () {
 	# Take an exclusive lock to prevent multiple concurrent aggregators.
 	# Returns true if the lock was aquired.
 	if (! -d $config{wikistatedir}) {
@@ -706,11 +706,11 @@ sub lockaggregate () { #{{{
 		return 0;
 	}
 	return 1;
-} #}}}
+}
 
-sub unlockaggregate () { #{{{
+sub unlockaggregate () {
 	return close($aggregatelock) if $aggregatelock;
 	return;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index 597539c13..93c10b629 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -16,13 +16,13 @@ BEGIN {
 	}
 };
 
-sub import { #{{{
+sub import {
 	hook(type => "getopt", id => "amazon_s3", call => \&getopt);
 	hook(type => "getsetup", id => "amazon_s3", call => \&getsetup);
 	hook(type => "checkconfig", id => "amazon_s3", call => \&checkconfig);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
         eval q{use Getopt::Long};
         error($@) if $@;
         Getopt::Long::Configure('pass_through');
@@ -38,9 +38,9 @@ sub getopt () { #{{{
 		debug(gettext("done"));
 		exit(0);
 	});
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0,
@@ -88,9 +88,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub checkconfig { #{{{
+sub checkconfig {
 	foreach my $field (qw{amazon_s3_key_id amazon_s3_key_file
 	                      amazon_s3_bucket}) {
 		if (! exists $config{$field} || ! defined $config{$field}) {
@@ -101,11 +101,11 @@ sub checkconfig { #{{{
 	    ! defined $config{amazon_s3_prefix}) {
 	    $config{amazon_s3_prefix}="wiki/";
 	}
-} #}}}
+}
 
 {
 my $bucket;
-sub getbucket { #{{{
+sub getbucket {
 	return $bucket if defined $bucket;
 	
 	open(IN, "<", $config{amazon_s3_key_file}) || error($config{amazon_s3_key_file}.": ".$!);
@@ -138,11 +138,11 @@ sub getbucket { #{{{
 	}
 
 	return $bucket;
-} #}}}
+}
 }
 
 # Given a file, return any S3 keys associated with it.
-sub file2keys ($) { #{{{
+sub file2keys ($) {
 	my $file=shift;
 
 	my @keys;
@@ -162,14 +162,14 @@ sub file2keys ($) { #{{{
 		}
 	}
 	return @keys;
-} #}}}
+}
 
 package IkiWiki;
 use File::MimeInfo;
 use Encode;
 
 # This is a wrapper around the real writefile.
-sub writefile ($$$;$$) { #{{{
+sub writefile ($$$;$$) {
         my $file=shift;
         my $destdir=shift;
         my $content=shift;
@@ -225,10 +225,10 @@ sub writefile ($$$;$$) { #{{{
 	}
 
 	return $ret;
-} #}}}
+}
 
 # This is a wrapper around the real prune.
-sub prune ($) { #{{{
+sub prune ($) {
 	my $file=shift;
 
 	my @keys=IkiWiki::Plugin::amazon_s3::file2keys($file);
@@ -247,6 +247,6 @@ sub prune ($) { #{{{
 	}
 
 	return $IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::prune'}->($file);
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index 2be983693..1cbdfe4e5 100644
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -5,12 +5,12 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "anonok", call => \&getsetup);
 	hook(type => "canedit", id => "anonok", call => \&canedit);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -24,9 +24,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub canedit ($$$) { #{{{
+sub canedit ($$$) {
 	my $page=shift;
 	my $cgi=shift;
 	my $session=shift;
@@ -45,6 +45,6 @@ sub canedit ($$$) { #{{{
 	else {
 		return "";
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 44781165c..87da6cd4e 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -5,16 +5,16 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	add_underlay("javascript");
 	hook(type => "getsetup", id => "attachment", call => \&getsetup);
 	hook(type => "checkconfig", id => "attachment", call => \&checkconfig);
 	hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
 	IkiWiki::loadplugin("filecheck");
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -35,9 +35,9 @@ sub getsetup () { #{{{
 			safe => 0, # executed
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub check_canattach ($$;$) { #{{{
+sub check_canattach ($$;$) {
 	my $session=shift;
 	my $dest=shift; # where it's going to be put, under the srcdir
 	my $file=shift; # the path to the attachment currently
@@ -84,13 +84,13 @@ sub check_canattach ($$;$) { #{{{
 	else {
 		return 1;
 	}
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	$config{cgi_disable_uploads}=0;
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 	my $form=$params{form};
 	my $q=$params{cgi};
@@ -153,9 +153,9 @@ sub formbuilder_setup (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	my $form=$params{form};
 	my $q=$params{cgi};
@@ -253,9 +253,9 @@ sub formbuilder (@) { #{{{
 	# Generate the attachment list only after having added any new
 	# attachments.
 	$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
-} # }}}
+}
 
-sub attachment_location ($) { #{{{
+sub attachment_location ($) {
 	my $page=shift;
 	
 	# Put the attachment in a subdir of the page it's attached
@@ -264,9 +264,9 @@ sub attachment_location ($) { #{{{
 	$page.="/" if length $page;
 	
 	return $page;
-} #}}}
+}
 
-sub attachment_list ($) { #{{{
+sub attachment_list ($) {
 	my $page=shift;
 	my $loc=attachment_location($page);
 
@@ -287,6 +287,6 @@ sub attachment_list ($) { #{{{
 	# Sort newer attachments to the top of the list, so a newly-added
 	# attachment appears just before the form used to add it.
 	return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index d1b3edb1f..bb08091ae 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -6,20 +6,20 @@ use strict;
 use IkiWiki 2.00;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "autoindex", call => \&getsetup);
 	hook(type => "refresh", id => "autoindex", call => \&refresh);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub genindex ($) { #{{{
+sub genindex ($) {
 	my $page=shift;
 	my $file=newpagefile($page, $config{default_pageext});
 	my $template=template("autoindex.tmpl");
@@ -28,9 +28,9 @@ sub genindex ($) { #{{{
 	if ($config{rcs}) {
 		IkiWiki::rcs_add($file);
 	}
-} #}}}
+}
 
-sub refresh () { #{{{
+sub refresh () {
 	eval q{use File::Find};
 	error($@) if $@;
 
@@ -107,6 +107,6 @@ sub refresh () { #{{{
 			IkiWiki::enable_commit_hook();
 		}
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 37752dd3e..1c52099bf 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -6,20 +6,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "brokenlinks", call => \&getsetup);
 	hook(type => "preprocess", id => "brokenlinks", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
@@ -61,6 +61,6 @@ sub preprocess (@) { #{{{
 			}
 			sort @broken)
 		."</ul>\n";
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 1054f5b3e..16c959069 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -7,7 +7,7 @@ use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
-sub import { #{{{
+sub import {
 	hook(type => "checkconfig", id => "bzr", call => \&checkconfig);
 	hook(type => "getsetup", id => "bzr", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -20,18 +20,18 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (defined $config{bzr_wrapper} && length $config{bzr_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{bzr_wrapper},
 			wrappermode => (defined $config{bzr_wrappermode} ? $config{bzr_wrappermode} : "06755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
@@ -65,9 +65,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub bzr_log ($) { #{{{
+sub bzr_log ($) {
 	my $out = shift;
 	my @infos = ();
 	my $key = undef;
@@ -99,20 +99,20 @@ sub bzr_log ($) { #{{{
 	close $out;
 
 	return @infos;
-} #}}}
+}
 
-sub rcs_update () { #{{{
+sub rcs_update () {
 	my @cmdline = ("bzr", "update", "--quiet", $config{srcdir});
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
-} #}}}
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	return "";
-} #}}}
+}
 
-sub bzr_author ($$) { #{{{
+sub bzr_author ($$) {
 	my ($user, $ipaddr) = @_;
 
 	if (defined $user) {
@@ -124,9 +124,9 @@ sub bzr_author ($$) { #{{{
 	else {
 		return "Anonymous";
 	}
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
 	$user = bzr_author($user, $ipaddr);
@@ -143,7 +143,7 @@ sub rcs_commit ($$$;$$) { #{{{
 	}
 
 	return undef; # success
-} #}}}
+}
 
 sub rcs_commit_staged ($$$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
@@ -164,27 +164,27 @@ sub rcs_commit_staged ($$$) {
 	}
 
 	return undef; # success
-} #}}}
+}
 
-sub rcs_add ($) { # {{{
+sub rcs_add ($) {
 	my ($file) = @_;
 
 	my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file");
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
-} #}}}
+}
 
-sub rcs_remove ($) { # {{{
+sub rcs_remove ($) {
 	my ($file) = @_;
 
 	my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
-} #}}}
+}
 
-sub rcs_rename ($$) { # {{{
+sub rcs_rename ($$) {
 	my ($src, $dest) = @_;
 
 	my $parent = IkiWiki::dirname($dest);
@@ -196,9 +196,9 @@ sub rcs_rename ($$) { # {{{
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
-} #}}}
+}
 
-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {
 	my ($num) = @_;
 
 	my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num, 
@@ -253,9 +253,9 @@ sub rcs_recentchanges ($) { #{{{
 	}
 
 	return @ret;
-} #}}}
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	my ($file) = @_;
 
 	# XXX filename passes through the shell here, should try to avoid
@@ -274,6 +274,6 @@ sub rcs_getctime ($) { #{{{
 	
 	my $ctime = str2time($log[0]->{"timestamp"});
 	return $ctime;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 6d536a91b..88303fc44 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -29,13 +29,13 @@ my %linkcache;
 my $time=time;
 my @now=localtime($time);
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "calendar", call => \&getsetup);
 	hook(type => "needsbuild", id => "calendar", call => \&needsbuild);
 	hook(type => "preprocess", id => "calendar", call => \&preprocess);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -48,23 +48,23 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub is_leap_year (@) { #{{{
+sub is_leap_year (@) {
 	my %params=@_;
 	return ($params{year} % 4 == 0 && (($params{year} % 100 != 0) || $params{year} % 400 == 0));
-} #}}}
+}
 
-sub month_days { #{{{
+sub month_days {
 	my %params=@_;
 	my $days_in_month = (31,28,31,30,31,30,31,31,30,31,30,31)[$params{month}-1];
 	if ($params{month} == 2 && is_leap_year(%params)) {
 		$days_in_month++;
 	}
 	return $days_in_month;
-} #}}}
+}
 
-sub format_month (@) { #{{{
+sub format_month (@) {
 	my %params=@_;
 
 	my $pagespec = $params{pages};
@@ -215,9 +215,9 @@ EOF
         add_depends($params{page}, join(" or ", @list));
 
 	return $calendar;
-} #}}}
+}
 
-sub format_year (@) { #{{{
+sub format_year (@) {
 	my %params=@_;
 
 	my $pagespec = $params{pages};
@@ -318,9 +318,9 @@ EOF
 EOF
 
 	return $calendar;
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages} = "*"            unless defined $params{pages};
 	$params{type}  = "month"        unless defined $params{type};
@@ -397,7 +397,7 @@ sub preprocess (@) { #{{{
 	return "\n<div><div class=\"calendar\">$calendar</div></div>\n";
 } #}}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{calendar}{nextchange}) {
@@ -415,6 +415,6 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 7881becd5..6c1fafb7b 100644
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -22,21 +22,21 @@ my $link_regexp=qr{
 	)
 }x;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "camelcase", call => \&getsetup);
 	hook(type => "linkify", id => "camelcase", call => \&linkify);
 	hook(type => "scan", id => "camelcase", call => \&scan);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		};
-} #}}}
+}
 
-sub linkify (@) { #{{{
+sub linkify (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $destpage=$params{destpage};
@@ -46,9 +46,9 @@ sub linkify (@) { #{{{
 	}eg;
 
 	return $params{content};
-} #}}}
+}
 
-sub scan (@) { #{{{
+sub scan (@) {
         my %params=@_;
         my $page=$params{page};
         my $content=$params{content};
diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index ac702ff02..53d8389d2 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -7,12 +7,12 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "preprocess", id => "color", call => \&preprocess);
 	hook(type => "format",     id => "color", call => \&format);
-} #}}}
+}
 
-sub preserve_style ($$$) { #{{{
+sub preserve_style ($$$) {
 	my $foreground = shift;
 	my $background = shift;
 	my $text       = shift;
@@ -37,18 +37,18 @@ sub preserve_style ($$$) { #{{{
 	
 	return $preserved;
 
-} #}}}
+}
 
-sub replace_preserved_style ($) { #{{{
+sub replace_preserved_style ($) {
 	my $content = shift;
 
 	$content =~ s!<span class="color">((color: ([a-z]+|\#[0-9a-f]{3,6})?)?((; )?(background-color: ([a-z]+|\#[0-9a-f]{3,6})?)?)?)</span>!<span class="color" style="$1">!g;
 	$content =~ s!<span class="colorend">!!g;
 
 	return $content;
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params = @_;
 
 	# Preprocess the text to expand any preprocessor directives
@@ -57,13 +57,13 @@ sub preprocess (@) { #{{{
 				IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
 
 	return preserve_style($params{foreground}, $params{background}, $params{text});
-} #}}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
 	my %params = @_;
 
 	$params{content} = replace_preserved_style($params{content});
 	return $params{content};	
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index b8748a1d6..6184c6031 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -17,7 +17,7 @@ use constant CANCEL => "Cancel";
 
 my $postcomment;
 
-sub import { #{{{
+sub import {
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
 	hook(type => "preprocess", id => '_comment', call => \&preprocess);
@@ -26,9 +26,9 @@ sub import { #{{{
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
 	hook(type => "cgi", id => "comments", call => \&linkcgi);
 	IkiWiki::loadplugin("inline");
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -88,15 +88,15 @@ sub getsetup () { #{{{
 			safe => 0,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub htmlize { # {{{
+sub htmlize {
 	my %params = @_;
 	return $params{content};
-} # }}}
+}
 
 # FIXME: copied verbatim from meta
-sub safeurl ($) { #{{{
+sub safeurl ($) {
 	my $url=shift;
 	if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} &&
 	    defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) {
@@ -105,9 +105,9 @@ sub safeurl ($) { #{{{
 	else {
 		return 1;
 	}
-} #}}}
+}
 
-sub preprocess { # {{{
+sub preprocess {
 	my %params = @_;
 	my $page = $params{page};
 
@@ -206,16 +206,16 @@ sub preprocess { # {{{
 	# FIXME: hard-coded HTML (although it's just to set an ID)
 	return "<div id=\"$anchor\">$content</div>" if $anchor;
 	return $content;
-} # }}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	$config{comments_commit} = 1 unless defined $config{comments_commit};
 	$config{comments_pagename} = 'comment_'
 		unless defined $config{comments_pagename};
-} #}}}
+}
 
 # This is exactly the same as recentchanges_link :-(
-sub linkcgi ($) { #{{{
+sub linkcgi ($) {
 	my $cgi=shift;
 	if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
 
@@ -245,7 +245,7 @@ sub linkcgi ($) { #{{{
 
 # FIXME: basically the same logic as recentchanges
 # returns (author URL, pretty-printed version)
-sub linkuser ($) { # {{{
+sub linkuser ($) {
 	my $user = shift;
 	my $oiduser = eval { IkiWiki::openiduser($user) };
 
@@ -262,10 +262,10 @@ sub linkuser ($) { # {{{
 					: "$user")
 			), $user);
 	}
-} # }}}
+}
 
 # Mostly cargo-culted from IkiWiki::plugin::editpage
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
@@ -512,9 +512,9 @@ sub sessioncgi ($$) { #{{{
 	}
 
 	exit;
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params = @_;
 
 	my $page = $params{page};
@@ -583,7 +583,7 @@ sub pagetemplate (@) { #{{{
 		$template->param(commentauthorurl =>
 			$pagestate{$page}{comments}{commentauthorurl});
 	}
-} # }}}
+}
 
 package IkiWiki::PageSpec;
 
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index e787424aa..66253e07d 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -6,20 +6,20 @@ use strict;
 use IkiWiki 2.00;
 use UNIVERSAL;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "conditional", call => \&getsetup);
 	hook(type => "preprocess", id => "if", call => \&preprocess_if);
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess_if (@) { #{{{
+sub preprocess_if (@) {
 	my %params=@_;
 
 	foreach my $param (qw{test then}) {
@@ -66,11 +66,11 @@ sub preprocess_if (@) { #{{{
 	}
 	return IkiWiki::preprocess($params{page}, $params{destpage}, 
 		IkiWiki::filter($params{page}, $params{destpage}, $ret));
-} # }}}
+}
 
 package IkiWiki::PageSpec;
 
-sub match_enabled ($$;@) { #{{{
+sub match_enabled ($$;@) {
 	shift;
 	my $plugin=shift;
 	
@@ -81,9 +81,9 @@ sub match_enabled ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("$plugin is not enabled");
 	}
-} #}}}
+}
 
-sub match_sourcepage ($$;@) { #{{{
+sub match_sourcepage ($$;@) {
 	shift;
 	my $glob=shift;
 	my %params=@_;
@@ -95,9 +95,9 @@ sub match_sourcepage ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("sourcepage does not match $glob");
 	}
-} #}}}
+}
 
-sub match_destpage ($$;@) { #{{{
+sub match_destpage ($$;@) {
 	shift;
 	my $glob=shift;
 	my %params=@_;
@@ -109,9 +109,9 @@ sub match_destpage ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("destpage does not match $glob");
 	}
-} #}}}
+}
 
-sub match_included ($$;@) { #{{{
+sub match_included ($$;@) {
 	shift;
 	shift;
 	my %params=@_;
@@ -123,6 +123,6 @@ sub match_included ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("page $params{sourcepage} is not included");
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index 7c729300d..3c46a48df 100644
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -7,20 +7,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "creole", call => \&getsetup);
 	hook(type => "htmlize", id => "creole", call => \&htmlize);
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
 		},
-} #}}}
+}
 
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	my $content = $params{content};
 
@@ -32,6 +32,6 @@ sub htmlize (@) { #{{{
 	creole_custombarelinks();
 
 	return creole_parse($content);
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 92667a1ef..e579c1ea2 100644
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -7,22 +7,22 @@ use IkiWiki 2.00;
 
 my %savedtext;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "cutpaste", call => \&getsetup);
 	hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1);
 	hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1);
 	hook(type => "preprocess", id => "paste", call => \&preprocess_paste);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess_cut (@) { #{{{
+sub preprocess_cut (@) {
 	my %params=@_;
 
 	foreach my $param (qw{id text}) {
@@ -35,9 +35,9 @@ sub preprocess_cut (@) { #{{{
 	$savedtext{$params{page}}->{$params{id}} = $params{text};
 
 	return "" if defined wantarray;
-} # }}}
+}
 
-sub preprocess_copy (@) { #{{{
+sub preprocess_copy (@) {
 	my %params=@_;
 
 	foreach my $param (qw{id text}) {
@@ -51,9 +51,9 @@ sub preprocess_copy (@) { #{{{
 
 	return IkiWiki::preprocess($params{page}, $params{destpage}, 
 		IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray;
-} # }}}
+}
 
-sub preprocess_paste (@) { #{{{
+sub preprocess_paste (@) {
 	my %params=@_;
 
 	foreach my $param (qw{id}) {
@@ -71,6 +71,6 @@ sub preprocess_paste (@) { #{{{
 
 	return IkiWiki::preprocess($params{page}, $params{destpage}, 
 		IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}}));
-} # }}}
+}
 
 1;
diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index c73317b2f..3470640dc 100644
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -5,19 +5,19 @@ package IkiWiki::Plugin::ddate;
 use IkiWiki 2.00;
 no warnings;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "ddate", call => \&getsetup);
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub IkiWiki::formattime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) {
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
@@ -36,6 +36,6 @@ sub IkiWiki::formattime ($;$) { #{{{
 	my $dt = DateTime->from_epoch(epoch => $time);
 	my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
 	return $dd->strftime($format);
-} #}}}
+}
 
 5
diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index f5d7837fc..068b83b3c 100644
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -8,21 +8,21 @@ use IkiWiki 2.00;
 use HTML::Entities;
 use IPC::Open2;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "editdiff", call => \&getsetup);
 	hook(type => "formbuilder_setup", id => "editdiff",
 		call => \&formbuilder_setup);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub diff ($$) { #{{{
+sub diff ($$) {
 	my $orig=shift;
 	my $content=shift;
 
@@ -50,9 +50,9 @@ sub diff ($$) { #{{{
 	return "couldn't run diff\n" if $sigpipe;
 
 	return "<pre>".encode_entities($ret)."</pre>";
-} #}}}
+}
 
-sub formbuilder_setup { #{{{
+sub formbuilder_setup {
 	my %params=@_;
 	my $form=$params{form};
 
@@ -72,6 +72,6 @@ sub formbuilder_setup { #{{{
 		my $diff = diff(srcfile($pagesources{$page}), $content);
 		$form->tmpl_param("page_preview", $diff);
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 242624d77..9210d6ff8 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -6,19 +6,19 @@ use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "editpage", call => \&getsetup);
 	hook(type => "refresh", id => "editpage", call => \&refresh);
         hook(type => "sessioncgi", id => "editpage", call => \&IkiWiki::cgi_editpage);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
 sub refresh () {
 	if (exists $wikistate{editpage} && exists $wikistate{editpage}{previews}) {
@@ -54,7 +54,7 @@ sub refresh () {
 # and other plugins use the functions below.
 package IkiWiki;
 
-sub check_canedit ($$$;$) { #{{{
+sub check_canedit ($$$;$) {
 	my $page=shift;
 	my $q=shift;
 	my $session=shift;
@@ -79,9 +79,9 @@ sub check_canedit ($$$;$) { #{{{
 		}
 	});
 	return $canedit;
-} #}}}
+}
 
-sub cgi_editpage ($$) { #{{{
+sub cgi_editpage ($$) {
 	my $q=shift;
 	my $session=shift;
 	
@@ -453,6 +453,6 @@ sub cgi_editpage ($$) { #{{{
 	}
 
 	exit;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 846b4e7c8..7c0e7c2f8 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -7,7 +7,7 @@ use IkiWiki 2.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "edittemplate",
 		call => \&getsetup);
 	hook(type => "needsbuild", id => "edittemplate",
@@ -16,17 +16,17 @@ sub import { #{{{
 		call => \&preprocess);
 	hook(type => "formbuilder", id => "edittemplate",
 		call => \&formbuilder);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 
 	foreach my $page (keys %pagestate) {
@@ -40,9 +40,9 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
         my %params=@_;
 
 	return "" if $params{page} ne $params{destpage};
@@ -62,9 +62,9 @@ sub preprocess (@) { #{{{
 	return sprintf(gettext("edittemplate %s registered for %s"),
 		htmllink($params{page}, $params{destpage}, $link),
 	       	$params{match});
-} # }}}
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	my $form=$params{form};
 
@@ -103,9 +103,9 @@ sub formbuilder (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub filltemplate ($$) { #{{{
+sub filltemplate ($$) {
 	my $template_page=shift;
 	my $page=shift;
 
@@ -136,6 +136,6 @@ sub filltemplate ($$) { #{{{
 	$template->param(name => $page);
 
 	return $template->output;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/embed.pm b/IkiWiki/Plugin/embed.pm
index 2a1637392..664c95763 100644
--- a/IkiWiki/Plugin/embed.pm
+++ b/IkiWiki/Plugin/embed.pm
@@ -43,35 +43,35 @@ my $safehtml=qr{(
 
 my @embedded;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "embed", call => \&getsetup);
 	hook(type => "filter", id => "embed", call => \&filter);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub embed ($) { #{{{
+sub embed ($) {
 	hook(type => "format", id => "embed", call => \&format) unless @embedded;
 	push @embedded, shift;
 	return "<div class=\"embed$#embedded\"></div>";
-} #}}}
+}
 
-sub filter (@) { #{{{
+sub filter (@) {
 	my %params=@_;
 	$params{content} =~ s/$safehtml/embed($1)/eg;
 	return $params{content};
-} # }}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
         my %params=@_;
 	$params{content} =~ s/<div class="embed(\d+)"><\/div>/$embedded[$1]/eg;
         return $params{content};
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 4ce9c8bab..2d540143f 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -14,7 +14,7 @@ use IO::Handle;
 
 my %plugins;
 
-sub import { #{{{
+sub import {
 	my $self=shift;
 	my $plugin=shift;
 	return unless defined $plugin;
@@ -32,17 +32,17 @@ sub import { #{{{
 	$RPC::XML::ENCODING="utf-8";
 
 	rpc_call($plugins{$plugin}, "import");
-} #}}}
+}
 
-sub rpc_write ($$) { #{{{
+sub rpc_write ($$) {
 	my $fh=shift;
 	my $string=shift;
 
 	$fh->print($string."\n");
 	$fh->flush;
-} #}}}
+}
 
-sub rpc_call ($$;@) { #{{{
+sub rpc_call ($$;@) {
 	my $plugin=shift;
 	my $command=shift;
 
@@ -131,12 +131,12 @@ sub rpc_call ($$;@) { #{{{
 	}
 
 	return undef;
-} #}}}
+}
 
 package IkiWiki::RPC::XML;
 use Memoize;
 
-sub getvar ($$$) { #{{{
+sub getvar ($$$) {
 	my $plugin=shift;
 	my $varname="IkiWiki::".shift;
 	my $key=shift;
@@ -145,9 +145,9 @@ sub getvar ($$$) { #{{{
 	my $ret=$varname->{$key};
 	use strict 'refs';
 	return $ret;
-} #}}}
+}
 
-sub setvar ($$$;@) { #{{{
+sub setvar ($$$;@) {
 	my $plugin=shift;
 	my $varname="IkiWiki::".shift;
 	my $key=shift;
@@ -157,18 +157,18 @@ sub setvar ($$$;@) { #{{{
 	my $ret=$varname->{$key}=$value;
 	use strict 'refs';
 	return $ret;
-} #}}}
+}
 
-sub getstate ($$$$) { #{{{
+sub getstate ($$$$) {
 	my $plugin=shift;
 	my $page=shift;
 	my $id=shift;
 	my $key=shift;
 
 	return $IkiWiki::pagestate{$page}{$id}{$key};
-} #}}}
+}
 
-sub setstate ($$$$;@) { #{{{
+sub setstate ($$$$;@) {
 	my $plugin=shift;
 	my $page=shift;
 	my $id=shift;
@@ -176,22 +176,22 @@ sub setstate ($$$$;@) { #{{{
 	my $value=shift;
 
 	return $IkiWiki::pagestate{$page}{$id}{$key}=$value;
-} #}}}
+}
 
-sub getargv ($) { #{{{
+sub getargv ($) {
 	my $plugin=shift;
 
 	return \@ARGV;
-} #}}}
+}
 
-sub setargv ($@) { #{{{
+sub setargv ($@) {
 	my $plugin=shift;
 	my $array=shift;
 
 	@ARGV=@$array;
-} #}}}
+}
 
-sub inject ($@) { #{{{
+sub inject ($@) {
 	# Bind a given perl function name to a particular RPC request.
 	my $plugin=shift;
 	my %params=@_;
@@ -213,9 +213,9 @@ sub inject ($@) { #{{{
 	# the injected version.
 	IkiWiki::inject(name => $params{name}, call => $sub);
 	return 1;
-} #}}}
+}
 
-sub hook ($@) { #{{{
+sub hook ($@) {
 	# the call parameter is a function name to call, since XML RPC
 	# cannot pass a function reference
 	my $plugin=shift;
@@ -227,13 +227,13 @@ sub hook ($@) { #{{{
 	IkiWiki::hook(%params, call => sub {
 		IkiWiki::Plugin::external::rpc_call($plugin, $callback, @_);
 	});
-} #}}}
+}
 
-sub pagespec_match ($@) { #{{{
+sub pagespec_match ($@) {
 	# convert pagespec_match's return object into a XML RPC boolean
 	my $plugin=shift;
 
 	return RPC::XML::boolean->new(0 + IkiWiki::pagespec_march(@_));
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/favicon.pm b/IkiWiki/Plugin/favicon.pm
index e9204dea9..68359a4aa 100644
--- a/IkiWiki/Plugin/favicon.pm
+++ b/IkiWiki/Plugin/favicon.pm
@@ -7,20 +7,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "favicon", call => \&getsetup);
 	hook(type => "pagetemplate", id => "favicon", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 
 	my $template=$params{template};
@@ -28,6 +28,6 @@ sub pagetemplate (@) { #{{{
 	if ($template->query(name => "favicon")) {
 		$template->param(favicon => "favicon.ico");
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 27f764e3b..5040a185c 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -37,9 +37,9 @@ my %units=( #{{{	# size in bytes
 	# ikiwiki, if you find you need larger data quantities, either modify
 	# yourself to add them, or travel back in time to 2008 and kill me.
 	#   -- Joey
-); #}}}
+);
 
-sub parsesize ($) { #{{{
+sub parsesize ($) {
 	my $size=shift;
 
 	no warnings;
@@ -51,10 +51,10 @@ sub parsesize ($) { #{{{
 		}
 	}
 	return $base;
-} #}}}
+}
 
 # This is provided for other plugins that want to convert back the other way.
-sub humansize ($) { #{{{
+sub humansize ($) {
 	my $size=shift;
 
 	foreach my $unit (reverse sort { $units{$a} <=> $units{$b} || $b cmp $a } keys %units) {
@@ -63,11 +63,11 @@ sub humansize ($) { #{{{
 		}
 	}
 	return $size; # near zero, or negative
-} #}}}
+}
 
 package IkiWiki::PageSpec;
 
-sub match_maxsize ($$;@) { #{{{
+sub match_maxsize ($$;@) {
 	my $page=shift;
 	my $maxsize=eval{IkiWiki::Plugin::filecheck::parsesize(shift)};
 	if ($@) {
@@ -86,9 +86,9 @@ sub match_maxsize ($$;@) { #{{{
 	else {
 		return IkiWiki::SuccessReason->new("file not too large");
 	}
-} #}}}
+}
 
-sub match_minsize ($$;@) { #{{{
+sub match_minsize ($$;@) {
 	my $page=shift;
 	my $minsize=eval{IkiWiki::Plugin::filecheck::parsesize(shift)};
 	if ($@) {
@@ -107,9 +107,9 @@ sub match_minsize ($$;@) { #{{{
 	else {
 		return IkiWiki::SuccessReason->new("file not too small");
 	}
-} #}}}
+}
 
-sub match_mimetype ($$;@) { #{{{
+sub match_mimetype ($$;@) {
 	my $page=shift;
 	my $wanted=shift;
 
@@ -140,9 +140,9 @@ sub match_mimetype ($$;@) { #{{{
 	else {
 		return IkiWiki::SuccessReason->new("file MIME type is $mimetype");
 	}
-} #}}}
+}
 
-sub match_virusfree ($$;@) { #{{{
+sub match_virusfree ($$;@) {
 	my $page=shift;
 	my $wanted=shift;
 
@@ -182,9 +182,9 @@ sub match_virusfree ($$;@) { #{{{
 	else {
 		return IkiWiki::SuccessReason->new("file seems virusfree ($reason)");
 	}
-} #}}}
+}
 
-sub match_ispage ($$;@) { #{{{
+sub match_ispage ($$;@) {
 	my $filename=shift;
 
 	if (defined IkiWiki::pagetype($filename)) {
@@ -193,4 +193,4 @@ sub match_ispage ($$;@) { #{{{
 	else {
 		return IkiWiki::FailReason->new("file is not a wiki page");
 	}
-} #}}}
+}
diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index 1e21a0bdc..b4d3a3c5f 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -5,11 +5,11 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "preprocess", id => "format", call => \&preprocess);
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my $format=$_[0];
 	shift; shift;
 	my $text=$_[0];
@@ -25,6 +25,6 @@ sub preprocess (@) { #{{{
 
 	return IkiWiki::htmlize($params{page}, $params{destpage}, $format,
 		IkiWiki::preprocess($params{page}, $params{destpage}, $text));
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 456b63e9f..6a12f28fd 100644
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -6,20 +6,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "fortune", call => \&getsetup);
 	hook(type => "preprocess", id => "fortune", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	$ENV{PATH}="$ENV{PATH}:/usr/games:/usr/local/games";
 	my $f = `fortune 2>/dev/null`;
 
@@ -29,6 +29,6 @@ sub preprocess (@) { #{{{
 	else {
 		return "<pre>$f</pre>\n";
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 1a39d87e5..6a7f6c3ae 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -11,7 +11,7 @@ my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
 my $no_chdir=0;
 
-sub import { #{{{
+sub import {
 	hook(type => "checkconfig", id => "git", call => \&checkconfig);
 	hook(type => "getsetup", id => "git", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -25,9 +25,9 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 	hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive);
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (! defined $config{gitorigin_branch}) {
 		$config{gitorigin_branch}="origin";
 	}
@@ -49,9 +49,9 @@ sub checkconfig () { #{{{
 			wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
@@ -113,9 +113,9 @@ sub getsetup () { #{{{
 			safe => 0, # paranoia
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub safe_git (&@) { #{{{
+sub safe_git (&@) {
 	# Start a child process safely without resorting /bin/sh.
 	# Return command output or success state (in scalar context).
 
@@ -152,9 +152,9 @@ sub safe_git (&@) { #{{{
 sub run_or_die ($@) { safe_git(\&error, @_) }
 sub run_or_cry ($@) { safe_git(sub { warn @_ },  @_) }
 sub run_or_non ($@) { safe_git(undef,            @_) }
-#}}}
 
-sub merge_past ($$$) { #{{{
+
+sub merge_past ($$$) {
 	# Unlike with Subversion, Git cannot make a 'svn merge -rN:M file'.
 	# Git merge commands work with the committed changes, except in the
 	# implicit case of '-m' of git checkout(1).  So we should invent a
@@ -246,9 +246,9 @@ sub merge_past ($$$) { #{{{
 	error("Git merge failed!\n$failure\n") if $failure;
 
 	return $conflict;
-} #}}}
+}
 
-sub parse_diff_tree ($@) { #{{{
+sub parse_diff_tree ($@) {
 	# Parse the raw diff tree chunk and return the info hash.
 	# See git-diff-tree(1) for the syntax.
 
@@ -358,9 +358,9 @@ sub parse_diff_tree ($@) { #{{{
 	}
 
 	return \%ci;
-} #}}}
+}
 
-sub git_commit_info ($;$) { #{{{
+sub git_commit_info ($;$) {
 	# Return an array of commit info hashes of num commits
 	# starting from the given sha1sum.
 	my ($sha1, $num) = @_;
@@ -381,9 +381,9 @@ sub git_commit_info ($;$) { #{{{
 	warn "Cannot parse commit info for '$sha1' commit" if !@ci;
 
 	return wantarray ? @ci : $ci[0];
-} #}}}
+}
 
-sub git_sha1 (;$) { #{{{
+sub git_sha1 (;$) {
 	# Return head sha1sum (of given file).
 	my $file = shift || q{--};
 
@@ -394,25 +394,25 @@ sub git_sha1 (;$) { #{{{
 		($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
 	} else { debug("Empty sha1sum for '$file'.") }
 	return defined $sha1 ? $sha1 : q{};
-} #}}}
+}
 
-sub rcs_update () { #{{{
+sub rcs_update () {
 	# Update working directory.
 
 	if (length $config{gitorigin_branch}) {
 		run_or_cry('git', 'pull', $config{gitorigin_branch});
 	}
-} #}}}
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	# Return the commit sha1sum of the file when editing begins.
 	# This will be later used in rcs_commit if a merge is required.
 	my ($file) = @_;
 
 	return git_sha1($file);
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	# Try to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on
 	# failure.
@@ -431,7 +431,7 @@ sub rcs_commit ($$$;$$) { #{{{
 
 	rcs_add($file);	
 	return rcs_commit_staged($message, $user, $ipaddr);
-} #}}}
+}
 
 sub rcs_commit_staged ($$$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
@@ -472,29 +472,29 @@ sub rcs_commit_staged ($$$) {
 	return undef; # success
 }
 
-sub rcs_add ($) { # {{{
+sub rcs_add ($) {
 	# Add file to archive.
 
 	my ($file) = @_;
 
 	run_or_cry('git', 'add', $file);
-} #}}}
+}
 
-sub rcs_remove ($) { # {{{
+sub rcs_remove ($) {
 	# Remove file from archive.
 
 	my ($file) = @_;
 
 	run_or_cry('git', 'rm', '-f', $file);
-} #}}}
+}
 
-sub rcs_rename ($$) { # {{{
+sub rcs_rename ($$) {
 	my ($src, $dest) = @_;
 
 	run_or_cry('git', 'mv', '-f', $src, $dest);
-} #}}}
+}
 
-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {
 	# List of recent changes.
 
 	my ($num) = @_;
@@ -562,9 +562,9 @@ sub rcs_recentchanges ($) { #{{{
 	}
 
 	return @rets;
-} #}}}
+}
 
-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {
 	my $rev=shift;
 	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
 	my @lines;
@@ -579,9 +579,9 @@ sub rcs_diff ($) { #{{{
 	else {
 		return join("", @lines);
 	}
-} #}}}
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	my $file=shift;
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
@@ -592,9 +592,9 @@ sub rcs_getctime ($) { #{{{
 	debug("ctime for '$file': ". localtime($ctime));
 
 	return $ctime;
-} #}}}
+}
 
-sub rcs_receive () { #{{{
+sub rcs_receive () {
 	# The wiki may not be the only thing in the git repo.
 	# Determine if it is in a subdirectory by examining the srcdir,
 	# and its parents, looking for the .git directory.
@@ -685,6 +685,6 @@ sub rcs_receive () { #{{{
 	}
 
 	return reverse @rets;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index a18e626d4..92bc8200a 100644
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -24,19 +24,19 @@ my @bundle=qw{
 	toggle
 };
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "goodstuff", call => \&getsetup);
 	foreach my $plugin (@bundle) {
 		IkiWiki::loadplugin($plugin);
 	}
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 92b9b29eb..5394c5a6f 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -8,21 +8,21 @@ use URI;
 
 my $host;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "google", call => \&getsetup);
 	hook(type => "checkconfig", id => "google", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "google", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (! length $config{url}) {
 		error(sprintf(gettext("Must specify %s when using the google search plugin"), "url"));
 	}
@@ -31,10 +31,10 @@ sub checkconfig () { #{{{
 		error(gettext("Failed to parse url, cannot determine domain name"));
 	}
 	$host=$uri->host;
-} #}}}
+}
 
 my $form;
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $template=$params{template};
@@ -49,6 +49,6 @@ sub pagetemplate (@) { #{{{
 
 		$template->param(searchform => $form);
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/googlecalendar.pm b/IkiWiki/Plugin/googlecalendar.pm
index 81a3ad677..9e09d7dbb 100644
--- a/IkiWiki/Plugin/googlecalendar.pm
+++ b/IkiWiki/Plugin/googlecalendar.pm
@@ -5,24 +5,24 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "googlecalendar",
 		call => \&getsetup);
 	hook(type => "preprocess", id => "googlecalendar",
 		call => \&preprocess);
 	hook(type => "format", id => "googlecalendar",
 		call => \&format);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	# Parse the html, looking for the url to embed for the calendar.
@@ -35,21 +35,21 @@ sub preprocess (@) { #{{{
 	my ($width)=$params{html}=~m#width="(\d+)"#;
 
 	return "<div class=\"googlecalendar\" src=\"$url\" height=\"$height\" width=\"$width\"></div>";
-} # }}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
         my %params=@_;
 
 	$params{content}=~s/<div class=\"googlecalendar" src="([^"]+)" height="([^"]+)" width="([^"]+)"><\/div>/gencal($1,$2,$3)/eg;
 
         return $params{content};
-} # }}}
+}
 
-sub gencal ($$$) { #{{{
+sub gencal ($$$) {
 	my $url=shift;
 	my $height=shift;
 	my $width=shift;
 	return qq{<iframe src="http://www.google.com/calendar/embed?$url" style=" border-width:0 " width="$width" frameborder="0" height="$height"></iframe>};
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 20b419413..23631da30 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -8,24 +8,24 @@ use strict;
 use IkiWiki 2.00;
 use IPC::Open2;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "graphviz", call => \&getsetup);
 	hook(type => "preprocess", id => "graph", call => \&graph);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
 my %graphviz_programs = (
 	"dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );
 
-sub render_graph (\%) { #{{{
+sub render_graph (\%) {
 	my %params = %{(shift)};
 
 	my $src = "$params{type} g {\n";
@@ -84,9 +84,9 @@ sub render_graph (\%) { #{{{
 	else {
 		return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
 	}
-} #}}}
+}
 
-sub graph (@) { #{{{
+sub graph (@) {
 	my %params=@_;
 	$params{src} = "" unless defined $params{src};
 	$params{type} = "digraph" unless defined $params{type};
@@ -94,6 +94,6 @@ sub graph (@) { #{{{
 	error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
 	return render_graph(%params);
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index eb8b786e8..fe68c6eec 100644
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -6,20 +6,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "haiku", call => \&getsetup);
 	hook(type => "preprocess", id => "haiku", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup { #{{{
+sub getsetup {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	my $haiku;
@@ -54,6 +54,6 @@ sub preprocess (@) { #{{{
 	$haiku=~s/\n/<br \/>\n/mg;
 	
 	return "\n\n<blockquote><p>$haiku</p></blockquote>\n\n";
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm
index 40e4f9452..d5b5ce3b4 100644
--- a/IkiWiki/Plugin/hnb.pm
+++ b/IkiWiki/Plugin/hnb.pm
@@ -13,20 +13,20 @@ use strict;
 use IkiWiki 2.00;
 use File::Temp qw(:mktemp);
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "hnb", call => \&getsetup);
 	hook(type => "htmlize", id => "hnb", call => \&htmlize);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
 		},
-} #}}}
+}
 
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params = @_;
 
 	# hnb outputs version number etc. every time to STDOUT, so
@@ -52,6 +52,6 @@ sub htmlize (@) { #{{{
 	$ret =~ s/<body>.*//si;
 
 	return $ret;
-} #}}}
+}
 
 1;
diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index b75207578..9b9547cca 100644
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -6,7 +6,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "html", call => \&getsetup);
 	hook(type => "htmlize", id => "html", call => \&htmlize);
 	hook(type => "htmlize", id => "htm", call => \&htmlize);
@@ -14,19 +14,19 @@ sub import { #{{{
 	# ikiwiki defaults to skipping .html files as a security measure;
 	# make it process them so this plugin can take effect
 	$config{wiki_file_prune_regexps} = [ grep { !m/\\\.x\?html\?\$/ } @{$config{wiki_file_prune_regexps}} ];
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
 		},
-} #}}}
+}
 
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	return $params{content};
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index dcd92055f..acbe40a5d 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -13,20 +13,20 @@ use IkiWiki 2.00;
 use HTML::TreeBuilder;
 use HTML::Entities;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);
 	hook(type => "sanitize", id => "htmlbalance", call => \&sanitize);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 	my $ret = '';
 
@@ -52,6 +52,6 @@ sub sanitize (@) { #{{{
 	}
 	$tree->delete();
 	return $ret;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 7398c8478..823b3d806 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -9,7 +9,7 @@ use IkiWiki 2.00;
 # Feel free to use it from other plugins.
 our $safe_url_regexp;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "htmlscrubber", call => \&getsetup);
 	hook(type => "sanitize", id => "htmlscrubber", call => \&sanitize);
 
@@ -33,9 +33,9 @@ sub import { #{{{
 	# data is a special case. Allow data:image/*, but
 	# disallow data:text/javascript and everything else.
 	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+(?:$|\/))/i;
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -49,9 +49,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 
 	if (exists $config{htmlscrubber_skip} &&
@@ -62,10 +62,10 @@ sub sanitize (@) { #{{{
 	}
 
 	return scrubber()->scrub($params{content});
-} # }}}
+}
 
 my $_scrubber;
-sub scrubber { #{{{
+sub scrubber {
 	return $_scrubber if defined $_scrubber;
 
 	eval q{use HTML::Scrubber};
@@ -111,6 +111,6 @@ sub scrubber { #{{{
 		}],
 	);
 	return $_scrubber;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 9ba5e9592..02438ebef 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -12,20 +12,20 @@ use strict;
 use IkiWiki 2.00;
 use IPC::Open2;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "tidy", call => \&getsetup);
 	hook(type => "sanitize", id => "tidy", call => \&sanitize);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 
 	my $pid;
@@ -49,6 +49,6 @@ sub sanitize (@) { #{{{
 	return "" if $sigpipe || ! defined $ret;
 
 	return $ret;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index fc0cffb1e..39edff615 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -6,26 +6,26 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub auth ($$) { #{{{
+sub auth ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
 	if (defined $cgi->remote_user()) {
 		$session->param("name", $cgi->remote_user());
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 7b89ab673..395890c0e 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -9,20 +9,20 @@ use IkiWiki 2.00;
 
 my %imgdefaults;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "img", call => \&getsetup);
 	hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
 	my %params=@_;
 
@@ -149,6 +149,6 @@ sub preprocess (@) { #{{{
 	else {
 		return $imgtag;
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d6ef6c54c..d37db97ec 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -13,7 +13,7 @@ my %page_numfeeds;
 my @inline;
 my $nested=0;
 
-sub import { #{{{
+sub import {
 	hook(type => "getopt", id => "inline", call => \&getopt);
 	hook(type => "getsetup", id => "inline", call => \&getsetup);
 	hook(type => "checkconfig", id => "inline", call => \&checkconfig);
@@ -27,9 +27,9 @@ sub import { #{{{
 	# This ensures each page only pings once and prevents slow
 	# pings interrupting page builds.
 	hook(type => "change", id => "inline", call => \&IkiWiki::pingurl);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
 	Getopt::Long::Configure('pass_through');
@@ -42,9 +42,9 @@ sub getopt () { #{{{
 			push @{$config{pingurl}}, $_[1];
 		},      
 	);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -85,9 +85,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (($config{rss} || $config{atom}) && ! length $config{url}) {
 		error(gettext("Must specify url to wiki with --url when using --rss or --atom"));
 	}
@@ -100,9 +100,9 @@ sub checkconfig () { #{{{
 	if (! exists $config{pingurl}) {
 		$config{pingurl}=[];
 	}
-} #}}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
         my %params=@_;
 
 	# Fill in the inline content generated earlier. This is actually an
@@ -111,9 +111,9 @@ sub format (@) { #{{{
 		delete @inline[$1,]
 	}eg;
 	return $params{content};
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -148,7 +148,7 @@ package IkiWiki;
 my %toping;
 my %feedlinks;
 
-sub preprocess_inline (@) { #{{{
+sub preprocess_inline (@) {
 	my %params=@_;
 	
 	if (! exists $params{pages}) {
@@ -416,18 +416,18 @@ sub preprocess_inline (@) { #{{{
 	return $ret if $raw || $nested;
 	push @inline, $ret;
 	return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
-} #}}}
+}
 
-sub pagetemplate_inline (@) { #{{{
+sub pagetemplate_inline (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $template=$params{template};
 
 	$template->param(feedlinks => $feedlinks{$page})
 		if exists $feedlinks{$page} && $template->query(name => "feedlinks");
-} #}}}
+}
 
-sub get_inline_content ($$) { #{{{
+sub get_inline_content ($$) {
 	my $page=shift;
 	my $destpage=shift;
 	
@@ -446,9 +446,9 @@ sub get_inline_content ($$) { #{{{
 	else {
 		return "";
 	}
-} #}}}
+}
 
-sub date_822 ($) { #{{{
+sub date_822 ($) {
 	my $time=shift;
 
 	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
@@ -456,9 +456,9 @@ sub date_822 ($) { #{{{
 	my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
 	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
 	return $ret;
-} #}}}
+}
 
-sub date_3339 ($) { #{{{
+sub date_3339 ($) {
 	my $time=shift;
 
 	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
@@ -466,9 +466,9 @@ sub date_3339 ($) { #{{{
 	my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
 	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
 	return $ret;
-} #}}}
+}
 
-sub absolute_urls ($$) { #{{{
+sub absolute_urls ($$) {
 	# sucky sub because rss sucks
 	my $content=shift;
 	my $baseurl=shift;
@@ -489,9 +489,9 @@ sub absolute_urls ($$) { #{{{
 	$content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)(\/[^"]*)"/$1 href="$urltop$2"/mig;
 	$content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)(\/[^"]*)"/$1 src="$urltop$2"/mig;
 	return $content;
-} #}}}
+}
 
-sub genfeed ($$$$$@) { #{{{
+sub genfeed ($$$$$@) {
 	my $feedtype=shift;
 	my $feedurl=shift;
 	my $feeddesc=shift;
@@ -576,9 +576,9 @@ sub genfeed ($$$$$@) { #{{{
 	});
 	
 	return $template->output;
-} #}}}
+}
 
-sub pingurl (@) { #{{{
+sub pingurl (@) {
 	return unless @{$config{pingurl}} && %toping;
 
 	eval q{require RPC::XML::Client};
@@ -624,6 +624,6 @@ sub pingurl (@) { #{{{
 	}
 
 	exit 0; # daemon done
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 0638d4bdd..3799209d0 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -7,23 +7,23 @@ use IkiWiki 2.00;
 
 my $link_regexp;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "link", call => \&getsetup);
 	hook(type => "checkconfig", id => "link", call => \&checkconfig);
 	hook(type => "linkify", id => "link", call => \&linkify);
 	hook(type => "scan", id => "link", call => \&scan);
 	hook(type => "renamepage", id => "link", call => \&renamepage);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if ($config{prefix_directives}) {
 		$link_regexp = qr{
 			\[\[(?=[^!])            # beginning of link
@@ -58,9 +58,9 @@ sub checkconfig () { #{{{
 			\]\]                    # end of link
 		}x,
 	}
-} #}}}
+}
 
-sub linkify (@) { #{{{
+sub linkify (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $destpage=$params{destpage};
@@ -78,9 +78,9 @@ sub linkify (@) { #{{{
 	}eg;
 	
 	return $params{content};
-} #}}}
+}
 
-sub scan (@) { #{{{
+sub scan (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $content=$params{content};
@@ -88,9 +88,9 @@ sub scan (@) { #{{{
 	while ($content =~ /(?<!\\)$link_regexp/g) {
 		push @{$links{$page}}, linkpage($2);
 	}
-} # }}}
+}
 
-sub renamepage (@) { #{{{
+sub renamepage (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $old=$params{oldpage};
@@ -118,6 +118,6 @@ sub renamepage (@) { #{{{
 	}eg;
 
 	return $params{content};
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 81ee665c8..cb9f3ef41 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -6,24 +6,24 @@ use strict;
 use IkiWiki 2.00;
 use IPC::Open2;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "linkmap", call => \&getsetup);
 	hook(type => "preprocess", id => "linkmap", call => \&preprocess);
 	hook(type => "format", id => "linkmap", call => \&format);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
 my $mapnum=0;
 my %maps;
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	$params{pages}="*" unless defined $params{pages};
@@ -39,17 +39,17 @@ sub preprocess (@) { #{{{
 	$mapnum++;
 	$maps{$mapnum}=\%params;
 	return "<div class=\"linkmap$mapnum\"></div>";
-} # }}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
         my %params=@_;
 
 	$params{content}=~s/<div class=\"linkmap(\d+)"><\/div>/genmap($1)/eg;
 
         return $params{content};
-} # }}}
+}
 
-sub genmap ($) { #{{{
+sub genmap ($) {
 	my $mapnum=shift;
 	return "" unless exists $maps{$mapnum};
 	my %params=%{$maps{$mapnum}};
@@ -106,6 +106,6 @@ sub genmap ($) { #{{{
 	error gettext("failed to run dot") if $sigpipe;
 
 	return $ret;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 2ab3e4665..be82b0495 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -6,15 +6,15 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	add_underlay("directives");
 	hook(type => "getsetup", id => "listdirectives", call => \&getsetup);
 	hook(type => "checkconfig", id => "listdirectives", call => \&checkconfig);
 	hook(type => "needsbuild", id => "listdirectives", call => \&needsbuild);
 	hook(type => "preprocess", id => "listdirectives", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -27,22 +27,22 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
 my @fulllist;
 my @shortlist;
 my $pluginstring;
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (! defined $config{directive_description_dir}) {
 		$config{directive_description_dir} = "ikiwiki/directive";
 	}
 	else {
 		$config{directive_description_dir} =~ s/\/+$//;
 	}
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 
 	@fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
@@ -63,9 +63,9 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	
 	$pagestate{$params{destpage}}{listdirectives}{shown}=$pluginstring;
@@ -92,6 +92,6 @@ sub preprocess (@) { #{{{
 	$result .= "</ul>";
 
 	return $result;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index f6cac6cdd..31a9e70cd 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -5,14 +5,14 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "lockedit", call => \&getsetup);
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
 	hook(type => "formbuilder_setup", id => "lockedit",
 	     call => \&formbuilder_setup);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -26,9 +26,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub canedit ($$) { #{{{
+sub canedit ($$) {
 	my $page=shift;
 	my $cgi=shift;
 	my $session=shift;
@@ -70,9 +70,9 @@ sub canedit ($$) { #{{{
 	}
 
 	return undef;
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	# XXX deprecated, should be removed eventually	
@@ -109,6 +109,6 @@ sub formbuilder_setup (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 18c584a30..af14ef5de 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -11,20 +11,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "map", call => \&getsetup);
 	hook(type => "preprocess", id => "map", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
@@ -144,6 +144,6 @@ sub preprocess (@) { #{{{
 	}
 	$map .= "</div>\n";
 	return $map;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 6c1d2ef3c..0d5f398a0 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -6,12 +6,12 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "mdwn", call => \&getsetup);
 	hook(type => "htmlize", id => "mdwn", call => \&htmlize);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -24,10 +24,10 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
 my $markdown_sub;
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	my $content = $params{content};
 
@@ -83,6 +83,6 @@ sub htmlize (@) { #{{{
 	$content=Encode::decode_utf8($content);
 
 	return $content;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 7aceebcdb..82423286d 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -7,7 +7,7 @@ use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
-sub import { #{{{
+sub import {
 	hook(type => "checkconfig", id => "mercurial", call => \&checkconfig);
 	hook(type => "getsetup", id => "mercurial", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -20,18 +20,18 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (exists $config{mercurial_wrapper} && length $config{mercurial_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{mercurial_wrapper},
 			wrappermode => (defined $config{mercurial_wrappermode} ? $config{mercurial_wrappermode} : "06755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
@@ -65,9 +65,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub mercurial_log ($) { #{{{
+sub mercurial_log ($) {
 	my $out = shift;
 	my @infos;
 
@@ -111,20 +111,20 @@ sub mercurial_log ($) { #{{{
 	close $out;
 
 	return @infos;
-} #}}}
+}
 
-sub rcs_update () { #{{{
+sub rcs_update () {
 	my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "update");
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
-} #}}}
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	return "";
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
 	if (defined $user) {
@@ -149,7 +149,7 @@ sub rcs_commit ($$$;$$) { #{{{
 	}
 
 	return undef; # success
-} #}}}
+}
 
 sub rcs_commit_staged ($$$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
@@ -159,28 +159,28 @@ sub rcs_commit_staged ($$$) {
 	error("rcs_commit_staged not implemented for mercurial"); # TODO
 }
 
-sub rcs_add ($) { # {{{
+sub rcs_add ($) {
 	my ($file) = @_;
 
 	my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$config{srcdir}/$file");
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
-} #}}}
+}
 
-sub rcs_remove ($) { # {{{
+sub rcs_remove ($) {
 	my ($file) = @_;
 
 	error("rcs_remove not implemented for mercurial"); # TODO
-} #}}}
+}
 
-sub rcs_rename ($$) { # {{{
+sub rcs_rename ($$) {
 	my ($src, $dest) = @_;
 
 	error("rcs_rename not implemented for mercurial"); # TODO
-} #}}}
+}
 
-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {
 	my ($num) = @_;
 
 	my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,
@@ -225,13 +225,13 @@ sub rcs_recentchanges ($) { #{{{
 	}
 
 	return @ret;
-} #}}}
+}
 
-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {
 	# TODO
-} #}}}
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	my ($file) = @_;
 
 	# XXX filename passes through the shell here, should try to avoid
@@ -251,6 +251,6 @@ sub rcs_getctime ($) { #{{{
 	
 	my $ctime = str2time($log[0]->{"date"});
 	return $ctime;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 3991797c0..ea60be507 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -8,22 +8,22 @@ use IkiWiki 2.00;
 
 my %metaheaders;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "meta", call => \&getsetup);
 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{meta}) {
@@ -38,7 +38,7 @@ sub needsbuild (@) { #{{{
 	}
 }
 
-sub scrub ($$) { #{{{
+sub scrub ($$) {
 	if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
 		return IkiWiki::Plugin::htmlscrubber::sanitize(
 			content => shift, destpage => shift);
@@ -46,9 +46,9 @@ sub scrub ($$) { #{{{
 	else {
 		return shift;
 	}
-} #}}}
+}
 
-sub safeurl ($) { #{{{
+sub safeurl ($) {
 	my $url=shift;
 	if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} &&
 	    defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) {
@@ -57,9 +57,9 @@ sub safeurl ($) { #{{{
 	else {
 		return 1;
 	}
-} #}}}
+}
 
-sub htmlize ($$$) { #{{{
+sub htmlize ($$$) {
 	my $page = shift;
 	my $destpage = shift;
 
@@ -68,7 +68,7 @@ sub htmlize ($$$) { #{{{
 		IkiWiki::preprocess($page, $destpage, shift)));
 }
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	return "" unless @_;
 	my %params=@_;
 	my $key=shift;
@@ -230,9 +230,9 @@ sub preprocess (@) { #{{{
 	}
 
 	return "";
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
         my $page=$params{page};
         my $destpage=$params{destpage};
@@ -260,9 +260,9 @@ sub pagetemplate (@) { #{{{
 			$template->param($field => htmlize($page, $destpage, $pagestate{$page}{meta}{$field}));
 		}
 	}
-} # }}}
+}
 
-sub match { #{{{
+sub match {
 	my $field=shift;
 	my $page=shift;
 	
@@ -288,28 +288,28 @@ sub match { #{{{
 	else {
 		return IkiWiki::FailReason->new("$page does not have a $field");
 	}
-} #}}}
+}
 
 package IkiWiki::PageSpec;
 
-sub match_title ($$;@) { #{{{
+sub match_title ($$;@) {
 	IkiWiki::Plugin::meta::match("title", @_);	
-} #}}}
+}
 
-sub match_author ($$;@) { #{{{
+sub match_author ($$;@) {
 	IkiWiki::Plugin::meta::match("author", @_);
-} #}}}
+}
 
-sub match_authorurl ($$;@) { #{{{
+sub match_authorurl ($$;@) {
 	IkiWiki::Plugin::meta::match("authorurl", @_);
-} #}}}
+}
 
-sub match_license ($$;@) { #{{{
+sub match_license ($$;@) {
 	IkiWiki::Plugin::meta::match("license", @_);
-} #}}}
+}
 
-sub match_copyright ($$;@) { #{{{
+sub match_copyright ($$;@) {
 	IkiWiki::Plugin::meta::match("copyright", @_);
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index aab60c435..b726386f6 100644
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -5,12 +5,12 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "mirrorlist", call => \&getsetup);
 	hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -23,9 +23,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
         my $template=$params{template};
 	
@@ -34,9 +34,9 @@ sub pagetemplate (@) { #{{{
 		$value.=mirrorlist($params{page});
 		$template->param(extrafooter => $value);
 	}
-} # }}}
+}
 
-sub mirrorlist ($) { #{{{
+sub mirrorlist ($) {
 	my $page=shift;
 	return "<p>".
 		(keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")).
@@ -49,6 +49,6 @@ sub mirrorlist ($) { #{{{
 			} keys %{$config{mirrorlist}}
 		).
 		"</p>";
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 3a8b267a3..38abb9a07 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -10,7 +10,7 @@ use Date::Format qw(time2str);
 
 my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate sha1sums
 
-sub import { #{{{
+sub import {
 	hook(type => "checkconfig", id => "monotone", call => \&checkconfig);
 	hook(type => "getsetup", id => "monotone", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -23,9 +23,9 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (!defined($config{mtnrootdir})) {
 		$config{mtnrootdir} = $config{srcdir};
 	}
@@ -61,9 +61,9 @@ sub checkconfig () { #{{{
 			wrappermode => (defined $config{mtn_wrappermode} ? $config{mtn_wrappermode} : "06755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
@@ -117,9 +117,9 @@ sub getsetup () { #{{{
 			safe => 0, # path
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub get_rev () { #{{{
+sub get_rev () {
 	my $sha1 = `mtn --root=$config{mtnrootdir} automate get_base_revision_id`;
 
 	($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
@@ -128,9 +128,9 @@ sub get_rev () { #{{{
 	}
 
 	return $sha1;
-} #}}}
+}
 
-sub get_rev_auto ($) { #{{{
+sub get_rev_auto ($) {
 	my $automator=shift;
 
 	my @results = $automator->call("get_base_revision_id");
@@ -142,9 +142,9 @@ sub get_rev_auto ($) { #{{{
 	}
 
 	return $sha1;
-} #}}}
+}
 
-sub mtn_merge ($$$$) { #{{{
+sub mtn_merge ($$$$) {
 	my $leftRev=shift;
 	my $rightRev=shift;
 	my $branch=shift;
@@ -172,9 +172,9 @@ sub mtn_merge ($$$$) { #{{{
 	debug("merged $leftRev, $rightRev to make $mergeRev");
 
 	return $mergeRev;
-} #}}}
+}
 
-sub commit_file_to_new_rev ($$$$$$$$) { #{{{
+sub commit_file_to_new_rev ($$$$$$$$) {
 	my $automator=shift;
 	my $wsfilename=shift;
 	my $oldFileID=shift;
@@ -219,9 +219,9 @@ sub commit_file_to_new_rev ($$$$$$$$) { #{{{
 	
 	debug("Added certs for rev: $newRevID");
 	return $newRevID;
-} #}}}
+}
 
-sub read_certs ($$) { #{{{
+sub read_certs ($$) {
 	my $automator=shift;
 	my $rev=shift;
 	my @results = $automator->call("certs", $rev);
@@ -239,9 +239,9 @@ sub read_certs ($$) { #{{{
 	}
 
 	return @ret;
-} #}}}
+}
 
-sub get_changed_files ($$) { #{{{
+sub get_changed_files ($$) {
 	my $automator=shift;
 	my $rev=shift;
 	
@@ -261,9 +261,9 @@ sub get_changed_files ($$) { #{{{
 	}
 	
 	return @ret;
-} #}}}
+}
 
-sub rcs_update () { #{{{
+sub rcs_update () {
 	chdir $config{srcdir}
 	    or error("Cannot chdir to $config{srcdir}: $!");
 
@@ -278,9 +278,9 @@ sub rcs_update () { #{{{
 	if (system("mtn", "--root=$config{mtnrootdir}", "update", "--quiet") != 0) {
 		debug("monotone update failed");
 	}
-} #}}}
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	my $file=shift;
 
 	chdir $config{srcdir}
@@ -289,9 +289,9 @@ sub rcs_prepedit ($) { #{{{
 	# For monotone, return the revision of the file when
 	# editing begins.
 	return get_rev();
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -434,7 +434,7 @@ sub rcs_commit ($$$;$$) { #{{{
 	}
 
 	return undef # success
-} #}}}
+}
 
 sub rcs_commit_staged ($$$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
@@ -466,7 +466,7 @@ sub rcs_commit_staged ($$$) {
 	}
 }
 
-sub rcs_add ($) { #{{{
+sub rcs_add ($) {
 	my $file=shift;
 
 	chdir $config{srcdir}
@@ -476,9 +476,9 @@ sub rcs_add ($) { #{{{
 	           $file) != 0) {
 		error("Monotone add failed");
 	}
-} #}}}
+}
 
-sub rcs_remove ($) { # {{{
+sub rcs_remove ($) {
 	my $file = shift;
 
 	chdir $config{srcdir}
@@ -495,9 +495,9 @@ sub rcs_remove ($) { # {{{
 	           $file) != 0) {
 		error("Monotone remove failed");
 	}
-} #}}}
+}
 
-sub rcs_rename ($$) { # {{{
+sub rcs_rename ($$) {
 	my ($src, $dest) = @_;
 
 	chdir $config{srcdir}
@@ -507,9 +507,9 @@ sub rcs_rename ($$) { # {{{
 	           $src, $dest) != 0) {
 		error("Monotone rename failed");
 	}
-} #}}}
+}
 
-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {
 	my $num=shift;
 	my @ret;
 
@@ -614,9 +614,9 @@ sub rcs_recentchanges ($) { #{{{
 	$automator->close();
 
 	return @ret;
-} #}}}
+}
 
-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {
 	my $rev=shift;
 	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
 	
@@ -638,9 +638,9 @@ sub rcs_diff ($) { #{{{
 	else {
 		return join("", @lines);
 	}
-} #}}}
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	my $file=shift;
 
 	chdir $config{srcdir}
@@ -690,6 +690,6 @@ sub rcs_getctime ($) { #{{{
 	$date=str2time($date, 'UTC');
 	debug("found ctime ".localtime($date)." for $file");
 	return $date;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index 4484441c3..f1216ad3d 100644
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -7,20 +7,20 @@ use IkiWiki 2.00;
 
 my $linktext = gettext("more");
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "more", call => \&getsetup);
 	hook(type => "preprocess", id => "more", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	$params{linktext} = $linktext unless defined $params{linktext};
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index 58c26b633..bfe84c0e1 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -6,7 +6,7 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "norcs", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
 	hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
@@ -18,51 +18,51 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => 0,
 		},
-} #}}}
+}
 
 
-sub rcs_update () { #{{{
-} #}}}
+sub rcs_update () {
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	return ""
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 	return undef # success
-} #}}}
+}
 
-sub rcs_commit_staged ($$$) { #{{{
+sub rcs_commit_staged ($$$) {
 	my ($message, $user, $ipaddr)=@_;
 	return undef # success
-} #}}}
+}
 
-sub rcs_add ($) { #{{{
-} #}}}
+sub rcs_add ($) {
+}
 
-sub rcs_remove ($) { #{{{
-} #}}}
+sub rcs_remove ($) {
+}
 
-sub rcs_rename ($$) { #{{{
-} #}}}
+sub rcs_rename ($$) {
+}
 
-sub rcs_recentchanges ($) { #{{{
-} #}}}
+sub rcs_recentchanges ($) {
+}
 
-sub rcs_diff ($) { #{{{
-} #}}}
+sub rcs_diff ($) {
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	error gettext("getctime not implemented");
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 96a74aee8..95220d7b3 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -5,20 +5,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "opendiscussion", call => \&getsetup);
 	hook(type => "canedit", id => "opendiscussion", call => \&canedit);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub canedit ($$) { #{{{
+sub canedit ($$) {
 	my $page=shift;
 	my $cgi=shift;
 	my $session=shift;
@@ -26,6 +26,6 @@ sub canedit ($$) { #{{{
 	my $discussion=gettext("discussion");
 	return "" if $page=~/(\/|^)\Q$discussion\E$/;
 	return undef;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index f12cbdaa3..2933c9ed9 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -6,22 +6,22 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
 	hook(type => "auth", id => "openid", call => \&auth);
 	hook(type => "formbuilder_setup", id => "openid",
 		call => \&formbuilder_setup, last => 1);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
 	Getopt::Long::Configure('pass_through');
 	GetOptions("openidsignup=s" => \$config{openidsignup});
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -34,9 +34,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -92,7 +92,7 @@ sub formbuilder_setup (@) { #{{{
 	}
 }
 
-sub validate ($$$;$) { #{{{
+sub validate ($$$;$) {
 	my $q=shift;
 	my $session=shift;
 	my $openid_url=shift;
@@ -121,9 +121,9 @@ sub validate ($$$;$) { #{{{
 	# eventually bounce them back to auth()
 	IkiWiki::redirect($q, $check_url);
 	exit 0;
-} #}}}
+}
 
-sub auth ($$) { #{{{
+sub auth ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -147,9 +147,9 @@ sub auth ($$) { #{{{
 		# myopenid.com affiliate support
 		validate($q, $session, $q->param('openid_identifier'));
 	}
-} #}}}
+}
 
-sub getobj ($$) { #{{{
+sub getobj ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -178,13 +178,13 @@ sub getobj ($$) { #{{{
 		consumer_secret => sub { return shift()+$secret },
 		required_root => $config{cgiurl},
 	);
-} #}}}
+}
 
 package IkiWiki;
 
 # This is not used by this plugin, but this seems the best place to put it.
 # Used elsewhere to pretty-display the name of an openid user.
-sub openiduser ($) { #{{{
+sub openiduser ($) {
 	my $user=shift;
 
 	if ($user =~ m!^https?://! &&
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 32cbc5dd5..8e9ab0ff4 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -6,20 +6,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "orphans", call => \&getsetup);
 	hook(type => "preprocess", id => "orphans", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
@@ -58,6 +58,6 @@ sub preprocess (@) { #{{{
 				"</li>"
 			} sort @orphans).
 		"</ul>\n";
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index ef76d6215..280b19db0 100644
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -7,22 +7,22 @@ use strict;
 use IkiWiki 2.00;
 use open qw{:utf8 :std};
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "otl", call => \&getsetup);
 	hook(type => "filter", id => "otl", call => \&filter);
 	hook(type => "htmlize", id => "otl", call => \&htmlize);
 
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
 		},
-} #}}}
+}
 
-sub filter (@) { #{{{
+sub filter (@) {
 	my %params=@_;
         
 	# Munge up check boxes to look a little bit better. This is a hack.
@@ -34,9 +34,9 @@ sub filter (@) { #{{{
 	$params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;
         
 	return $params{content};
-} # }}}
+}
 
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 
 	# Can't use open2 since otl2html doesn't play nice with buffering.
@@ -95,6 +95,6 @@ sub htmlize (@) { #{{{
 	$ret=~s/<body>.*//s;
 	$ret=~s/<div class="Footer">.*//s;
 	return $ret;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index e059fa618..c08ab3931 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -5,20 +5,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "pagecount", call => \&getsetup);
 	hook(type => "preprocess", id => "pagecount", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
@@ -33,6 +33,6 @@ sub preprocess (@) { #{{{
 		$count++ if pagespec_match($page, $params{pages}, location => $params{page});
 	}
 	return $count;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index de4b7d068..e20d0dac6 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -17,20 +17,20 @@ use IkiWiki 2.00;
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "pagestats", call => \&getsetup);
 	hook(type => "preprocess", id => "pagestats", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	my $style = ($params{style} or 'cloud');
@@ -73,6 +73,6 @@ sub preprocess (@) { #{{{
 
 		return $res;
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/pagetemplate.pm b/IkiWiki/Plugin/pagetemplate.pm
index 99a66ee96..60db8b327 100644
--- a/IkiWiki/Plugin/pagetemplate.pm
+++ b/IkiWiki/Plugin/pagetemplate.pm
@@ -7,21 +7,21 @@ use IkiWiki 2.00;
 
 my %templates;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "pagetemplate", call => \&getsetup);
 	hook(type => "preprocess", id => "pagetemplate", call => \&preprocess);
 	hook(type => "templatefile", id => "pagetemplate", call => \&templatefile);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	if (! exists $params{template} ||
@@ -35,9 +35,9 @@ sub preprocess (@) { #{{{
 	}
 
 	return "";
-} # }}}
+}
 
-sub templatefile (@) { #{{{
+sub templatefile (@) {
 	my %params=@_;
 
 	if (exists $templates{$params{page}}) {
@@ -45,6 +45,6 @@ sub templatefile (@) { #{{{
 	}
 	
 	return undef;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index a8b3641e9..fb41e1c83 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -6,20 +6,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
 	hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub parentlinks ($) { #{{{
+sub parentlinks ($) {
 	my $page=shift;
 
 	my @ret;
@@ -48,9 +48,9 @@ sub parentlinks ($) { #{{{
 		$i++;
 	}
 	return @ret;
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
         my $page=$params{page};
         my $template=$params{template};
@@ -58,6 +58,6 @@ sub pagetemplate (@) { #{{{
 	if ($template->query(name => "parentlinks")) {
 		$template->param(parentlinks => [parentlinks($page)]);
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index e0c0a3b0e..7176f0c33 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -6,14 +6,14 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "passwordauth", "call" => \&getsetup);
         hook(type => "formbuilder_setup", id => "passwordauth", call => \&formbuilder_setup);
         hook(type => "formbuilder", id => "passwordauth", call => \&formbuilder);
 	hook(type => "sessioncgi", id => "passwordauth", call => \&sessioncgi);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -33,10 +33,10 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
 # Checks if a string matches a user's password, and returns true or false.
-sub checkpassword ($$;$) { #{{{
+sub checkpassword ($$;$) {
 	my $user=shift;
 	my $password=shift;
 	my $field=shift || "password";
@@ -74,9 +74,9 @@ sub checkpassword ($$;$) { #{{{
 	}
 
 	return $ret;
-} #}}}
+}
 
-sub setpassword ($$;$) { #{{{
+sub setpassword ($$;$) {
 	my $user=shift;
 	my $password=shift;
 	my $field=shift || "password";
@@ -94,9 +94,9 @@ sub setpassword ($$;$) { #{{{
 	else {
 		IkiWiki::userinfo_set($user, $field, $password);
 	}
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -222,7 +222,7 @@ sub formbuilder_setup (@) { #{{{
 	}
 }
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -313,9 +313,9 @@ sub formbuilder (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -335,6 +335,6 @@ sub sessioncgi ($$) { #{{{
 		IkiWiki::cgi_prefs($q, $session);
 		exit;
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/pingee.pm b/IkiWiki/Plugin/pingee.pm
index c2f21b0cf..fcbe6b57b 100644
--- a/IkiWiki/Plugin/pingee.pm
+++ b/IkiWiki/Plugin/pingee.pm
@@ -5,20 +5,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "pingee", call => \&getsetup);
 	hook(type => "cgi", id => "pingee", call => \&cgi);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub cgi ($) { #{{{
+sub cgi ($) {
 	my $cgi=shift;
 
 	if (defined $cgi->param('do') && $cgi->param("do") eq "ping") {
@@ -37,6 +37,6 @@ sub cgi ($) { #{{{
 		IkiWiki::saveindex();
 		exit 0;
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index 043b074a7..7b4dce586 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -8,15 +8,15 @@ use IkiWiki 2.00;
 my %pages;
 my $pinged=0;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "pinger", call => \&getsetup);
 	hook(type => "needsbuild", id => "pinger", call => \&needsbuild);
 	hook(type => "preprocess", id => "ping", call => \&preprocess);
 	hook(type => "delete", id => "pinger", call => \&ping);
 	hook(type => "change", id => "pinger", call => \&ping);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -29,9 +29,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{pinger}) {
@@ -45,9 +45,9 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	if (! exists $params{from} || ! exists $params{to}) {
 		error gettext("requires 'from' and 'to' parameters");
@@ -60,7 +60,7 @@ sub preprocess (@) { #{{{
 	else {
 		return sprintf(gettext("Ignoring ping directive for wiki %s (this wiki is %s)"), $params{from}, $config{url});
 	}
-} # }}}
+}
 
 sub ping {
 	if (! $pinged && %pages) {
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index fadc1773e..5ac5b818d 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -6,22 +6,22 @@ use strict;
 use IkiWiki 2.00;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "poll", call => \&getsetup);
 	hook(type => "preprocess", id => "poll", call => \&preprocess);
 	hook(type => "sessioncgi", id => "poll", call => \&sessioncgi);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
 my %pagenum;
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=(open => "yes", total => "yes", percent => "yes", @_);
 
 	my $open=IkiWiki::yesno($params{open});
@@ -77,9 +77,9 @@ sub preprocess (@) { #{{{
 		$ret.="<span>".gettext("Total votes:")." $total</span>\n";
 	}
 	return "<div class=poll>$ret</div>";
-} # }}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 	if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {
@@ -152,6 +152,6 @@ sub sessioncgi ($$) { #{{{
 			-url => urlto($page, undef, 1));
 		exit;
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index fa564aa86..a32003778 100644
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -10,20 +10,20 @@ use strict;
 use IkiWiki 2.00;
 use File::Find;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "polygen", call => \&getsetup);
 	hook(type => "preprocess", id => "polygen", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	my $grammar = ($params{grammar} or 'polygen');
 	my $symbol = ($params{symbol} or undef);
@@ -64,6 +64,6 @@ sub preprocess (@) { #{{{
 	# markdown text
 	$res =~ s/\s*$//;
 	return $res;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 1f4c065c1..1753e4cf9 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -5,21 +5,21 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	IkiWiki::loadplugin('sparkline');
 	hook(type => "getsetup", id => "postsparkline", call => \&getsetup);
 	hook(type => "preprocess", id => "postsparkline", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	if (! exists $params{max}) {
@@ -78,7 +78,7 @@ sub preprocess (@) { #{{{
 	delete $params{color};
 	return IkiWiki::Plugin::sparkline::preprocess(%params, 
 		map { $_.$color => "" } reverse @data);
-} # }}}
+}
 
 sub perfoo ($@) {
 	my $sub=shift;
diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 0f02142b0..501f17f5d 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -39,12 +39,12 @@ sub default_timetable {
 	];
 }
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "prettydate", call => \&getsetup);
 	hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -64,9 +64,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (! defined $config{prettydateformat} ||
 	    $config{prettydateformat} eq '%c') {
 	    	$config{prettydateformat}='%X, %B %o, %Y';
@@ -82,9 +82,9 @@ sub checkconfig () { #{{{
 			$config{timetable}[$h] = $config{timetable}[$h - 1];
 		}
 	}
-} #}}}
+}
 
-sub IkiWiki::formattime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) {
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
@@ -122,6 +122,6 @@ sub IkiWiki::formattime ($;$) { #{{{
 
 	$format=~s/\%X/$t/g;
 	return strftime($format, \@t);
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index e536f4e23..75da16d16 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -7,21 +7,21 @@ use IkiWiki 2.00;
 
 my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "progress", call => \&getsetup);
 	hook(type => "preprocess", id => "progress", call => \&preprocess);
 	hook(type => "format",     id => "progress", call => \&format);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	
 	my $fill;
@@ -64,9 +64,9 @@ sub preprocess (@) { #{{{
   <div class="progress-done" style="width: $fill">$fill</div>
 </div>
 EODIV
-} # }}}
+}
 
-sub format(@) { #{{{
+sub format(@) {
 	my %params = @_;
 
 	# If HTMLScrubber has removed the style attribute, then bring it back
@@ -74,6 +74,6 @@ sub format(@) { #{{{
 	$params{content} =~ s!<div class="progress-done">($percentage_pattern)</div>!<div class="progress-done" style="width: $1">$1</div>!g;
 
 	return $params{content};    
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/rawhtml.pm b/IkiWiki/Plugin/rawhtml.pm
index 74ca13f3b..73093439d 100644
--- a/IkiWiki/Plugin/rawhtml.pm
+++ b/IkiWiki/Plugin/rawhtml.pm
@@ -6,17 +6,17 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "rawhtml", call => \&getsetup);
 	$config{wiki_file_prune_regexps} = [ grep { !m/\\\.x\?html\?\$/ } @{$config{wiki_file_prune_regexps}} ];
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => 1, # changes file types
 		},
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 4d7023c1c..12577e9ef 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -7,16 +7,16 @@ use IkiWiki 2.00;
 use Encode;
 use HTML::Entities;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 	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 getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -36,14 +36,14 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	$config{recentchangespage}='recentchanges' unless defined $config{recentchangespage};
 	$config{recentchangesnum}=100 unless defined $config{recentchangesnum};
-} #}}}
+}
 
-sub refresh ($) { #{{{
+sub refresh ($) {
 	my %seen;
 
 	# add new changes
@@ -57,10 +57,10 @@ sub refresh ($) { #{{{
 			unlink($config{srcdir}.'/'.$pagesources{$page});
 		}
 	}
-} #}}}
+}
 
 # Enable the recentchanges link on wiki pages.
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $template=$params{template};
 	my $page=$params{page};
@@ -71,15 +71,15 @@ sub pagetemplate (@) { #{{{
 		$template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
 		$template->param(have_actions => 1);
 	}
-} #}}}
+}
 
 # Pages with extension _change have plain html markup, pass through.
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	return $params{content};
-} #}}}
+}
 
-sub cgi ($) { #{{{
+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
@@ -112,7 +112,7 @@ sub cgi ($) { #{{{
 	}
 }
 
-sub store ($$$) { #{{{
+sub store ($$$) {
 	my $change=shift;
 
 	my $page="$config{recentchangespage}/change_".titlepage($change->{rev});
@@ -192,6 +192,6 @@ sub store ($$$) { #{{{
 	utime $change->{when}, $change->{when}, "$config{srcdir}/$file";
 
 	return $page;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index 08cec3f5a..4dea9c26b 100644
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -8,22 +8,22 @@ use HTML::Entities;
 
 my $maxlines=200;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "recentchangesdiff",
 		call => \&getsetup);
 	hook(type => "pagetemplate", id => "recentchangesdiff",
 		call => \&pagetemplate);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $template=$params{template};
 	if ($config{rcs} && exists $params{rev} && length $params{rev} &&
@@ -46,6 +46,6 @@ sub pagetemplate (@) { #{{{
 			$template->param(diff => $diff);
 		}
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index dc8f7d538..e5fa8e1a5 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -8,22 +8,22 @@ use IkiWiki 2.00;
 use POSIX;
 use Encode;
 
-sub import { #{{{
+sub import {
 	add_underlay("javascript");
 	hook(type => "getsetup", id => "relativedate", call => \&getsetup);
 	hook(type => "format", id => "relativedate", call => \&format);
 	inject(name => "IkiWiki::displaytime", call => \&mydisplaytime);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
         my %params=@_;
 
 	if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
@@ -31,9 +31,9 @@ sub format (@) { #{{{
 		$params{content}=include_javascript($params{page}, 1).$params{content};
 	}
 	return $params{content};
-} # }}}
+}
 
-sub include_javascript ($;$) { #{{{
+sub include_javascript ($;$) {
 	my $page=shift;
 	my $absolute=shift;
 	
@@ -41,9 +41,9 @@ sub include_javascript ($;$) { #{{{
 		'" type="text/javascript" charset="utf-8"></script>'."\n".
 		'<script src="'.urlto("relativedate.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>';
-} #}}}
+}
 
-sub mydisplaytime ($;$) { #{{{
+sub mydisplaytime ($;$) {
 	my $time=shift;
 	my $format=shift;
 
@@ -55,6 +55,6 @@ sub mydisplaytime ($;$) { #{{{
 
 	return '<span class="relativedate" title="'.$gmtime.'">'.
 		IkiWiki::formattime($time, $format).'</span>';
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index c512b3b97..781501662 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -5,23 +5,23 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "remove", call => \&getsetup);
 	hook(type => "formbuilder_setup", id => "remove", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "remove", call => \&formbuilder);
 	hook(type => "sessioncgi", id => "remove", call => \&sessioncgi);
 
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub check_canremove ($$$) { #{{{
+sub check_canremove ($$$) {
 	my $page=shift;
 	my $q=shift;
 	my $session=shift;
@@ -54,9 +54,9 @@ sub check_canremove ($$$) { #{{{
 			error("renaming of attachments is not allowed");
 		}
 	}
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 	my $form=$params{form};
 	my $q=$params{cgi};
@@ -67,9 +67,9 @@ sub formbuilder_setup (@) { #{{{
 		push @{$params{buttons}}, "Remove" if $form->field("do") eq "edit";
 		$form->tmpl_param("field-remove" => '<input name="_submit" type="submit" value="Remove Attachments" />');
 	}
-} #}}}
+}
 
-sub confirmation_form ($$) { #{{{ 
+sub confirmation_form ($$) {
 	my $q=shift;
 	my $session=shift;
 
@@ -90,9 +90,9 @@ sub confirmation_form ($$) { #{{{
 	$f->field(name => "do", type => "hidden", value => "remove", force => 1);
 
 	return $f, ["Remove", "Cancel"];
-} #}}}
+}
 
-sub removal_confirm ($$@) { #{{{
+sub removal_confirm ($$@) {
 	my $q=shift;
 	my $session=shift;
 	my $attachment=shift;
@@ -122,9 +122,9 @@ sub removal_confirm ($$@) { #{{{
 
 	IkiWiki::showform($f, $buttons, $session, $q);
 	exit 0;
-} #}}}
+}
 
-sub postremove ($) { #{{{
+sub postremove ($) {
 	my $session=shift;
 
 	# Load saved form state and return to edit form.
@@ -132,9 +132,9 @@ sub postremove ($) { #{{{
 	$session->clear("postremove");
 	IkiWiki::cgi_savesession($session);
 	IkiWiki::cgi($postremove, $session);
-} #}}}
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	my $form=$params{form};
 
@@ -154,9 +154,9 @@ sub formbuilder (@) { #{{{
 			removal_confirm($q, $session, 1, @selected);
 		}
 	}
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
         my $q=shift;
 
 	if ($q->param("do") eq 'remove') {
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index e4201cc94..b1bb15767 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -5,23 +5,23 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "rename", call => \&getsetup);
 	hook(type => "formbuilder_setup", id => "rename", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "rename", call => \&formbuilder);
 	hook(type => "sessioncgi", id => "rename", call => \&sessioncgi);
 
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub check_canrename ($$$$$$) { #{{{
+sub check_canrename ($$$$$$) {
 	my $src=shift;
 	my $srcfile=shift;
 	my $dest=shift;
@@ -87,9 +87,9 @@ sub check_canrename ($$$$$$) { #{{{
 			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
 		}
 	}
-} #}}}
+}
 
-sub rename_form ($$$) { #{{{ 
+sub rename_form ($$$) {
 	my $q=shift;
 	my $session=shift;
 	my $page=shift;
@@ -145,9 +145,9 @@ sub rename_form ($$$) { #{{{
 	$f->field(name => "attachment", type => "hidden");
 
 	return $f, ["Rename", "Cancel"];
-} #}}}
+}
 
-sub rename_start ($$$$) { #{{{
+sub rename_start ($$$$) {
 	my $q=shift;
 	my $session=shift;
 	my $attachment=shift;
@@ -171,9 +171,9 @@ sub rename_start ($$$$) { #{{{
 	my ($f, $buttons)=rename_form($q, $session, $page);
 	IkiWiki::showform($f, $buttons, $session, $q);
 	exit 0;
-} #}}}
+}
 
-sub postrename ($;$$$) { #{{{
+sub postrename ($;$$$) {
 	my $session=shift;
 	my $src=shift;
 	my $dest=shift;
@@ -204,9 +204,9 @@ sub postrename ($;$$$) { #{{{
 	}
 
 	IkiWiki::cgi_editpage($postrename, $session);
-} #}}}
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	my $form=$params{form};
 
@@ -229,11 +229,11 @@ sub formbuilder (@) { #{{{
 			rename_start($q, $session, 1, $selected[0]);
 		}
 	}
-} #}}}
+}
 
 my $renamesummary;
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 	my $form=$params{form};
 	my $q=$params{cgi};
@@ -248,9 +248,9 @@ sub formbuilder_setup (@) { #{{{
 			$form->tmpl_param(message => $renamesummary);
 		}
 	}
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
         my $q=shift;
 
 	if ($q->param("do") eq 'rename') {
@@ -418,9 +418,9 @@ sub sessioncgi ($$) { #{{{
 
 		exit 0;
 	}
-} #}}}
+}
 
-sub renamepage_hook ($$$$) { #{{{
+sub renamepage_hook ($$$$) {
 	my ($page, $src, $dest, $content)=@_;
 
 	IkiWiki::run_hooks(renamepage => sub {
@@ -433,9 +433,9 @@ sub renamepage_hook ($$$$) { #{{{
 	});
 
 	return $content;
-}# }}}
+}
 			
-sub do_rename ($$$) { #{{{
+sub do_rename ($$$) {
 	my $rename=shift;
 	my $q=shift;
 	my $session=shift;
@@ -460,9 +460,9 @@ sub do_rename ($$$) { #{{{
 		}
 	}
 
-} # }}}
+}
 
-sub fixlinks ($$$) { #{{{
+sub fixlinks ($$$) {
 	my $rename=shift;
 	my $session=shift;
 
@@ -498,6 +498,6 @@ sub fixlinks ($$$) { #{{{
 	}
 
 	return @fixedlinks;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index e40f4888c..cc2130ad5 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -6,16 +6,16 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "search", call => \&getsetup);
 	hook(type => "checkconfig", id => "search", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
 	hook(type => "postscan", id => "search", call => \&index);
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -28,9 +28,9 @@ sub getsetup () { #{{{
 			safe => 0, # external program
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	foreach my $required (qw(url cgiurl)) {
 		if (! length $config{$required}) {
 			error(sprintf(gettext("Must specify %s when using the search plugin"), $required));
@@ -40,10 +40,10 @@ sub checkconfig () { #{{{
 	if (! defined $config{omega_cgi}) {
 		$config{omega_cgi}="/usr/lib/cgi-bin/omega/omega";
 	}
-} #}}}
+}
 
 my $form;
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $template=$params{template};
@@ -58,11 +58,11 @@ sub pagetemplate (@) { #{{{
 
 		$template->param(searchform => $form);
 	}
-} #}}}
+}
 
 my $scrubber;
 my $stemmer;
-sub index (@) { #{{{
+sub index (@) {
 	my %params=@_;
 
 	setupfiles();
@@ -146,17 +146,17 @@ sub index (@) { #{{{
 
 	$doc->add_term($pageterm);
 	$db->replace_document_by_term($pageterm, $doc);
-} #}}}
+}
 
-sub delete (@) { #{{{
+sub delete (@) {
 	my $db=xapiandb();
 	foreach my $page (@_) {
 		my $pageterm=pageterm(pagename($page));
 		$db->delete_document_by_term($pageterm) if defined $pageterm;
 	}
-} #}}}
+}
 
-sub cgi ($) { #{{{
+sub cgi ($) {
 	my $cgi=shift;
 
 	if (defined $cgi->param('P')) {
@@ -169,9 +169,9 @@ sub cgi ($) { #{{{
 			noimageinline => 1, linktext => "Help");
 		exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!");
 	}
-} #}}}
+}
 
-sub pageterm ($) { #{{{
+sub pageterm ($) {
 	my $page=shift;
 
 	# 240 is the number used by omindex to decide when to hash an
@@ -190,10 +190,10 @@ sub pageterm ($) { #{{{
 	else {
 		return "U:".$page;
 	}
-} #}}}
+}
 
 my $db;
-sub xapiandb () { #{{{
+sub xapiandb () {
 	if (! defined $db) {
 		eval q{
 			use Search::Xapian;
@@ -204,11 +204,11 @@ sub xapiandb () { #{{{
 			Search::Xapian::DB_CREATE_OR_OPEN());
 	}
 	return $db;
-} #}}}
+}
 
 {
 my $setup=0;
-sub setupfiles () { #{{{
+sub setupfiles () {
 	if (! $setup and (! -e $config{wikistatedir}."/xapian" || $config{rebuild})) {
 		writefile("omega.conf", $config{wikistatedir}."/xapian",
 			"database_dir .\n".
@@ -218,7 +218,7 @@ sub setupfiles () { #{{{
 				readfile(IkiWiki::template_file("searchquery.tmpl"))));
 		$setup=1;
 	}
-} #}}}
+}
 }
 
 1
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index dec8afdb5..33d158d3e 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -5,21 +5,21 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "shortcut", call => \&getsetup);
 	hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
 	hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (defined $config{srcdir}) {
 		# Preprocess the shortcuts page to get all the available shortcuts
 		# defined before other pages are rendered.
@@ -29,9 +29,9 @@ sub checkconfig () { #{{{
 		}
 		IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 	}
-} # }}}
+}
 
-sub preprocess_shortcut (@) { #{{{
+sub preprocess_shortcut (@) {
 	my %params=@_;
 
 	if (! defined $params{name} || ! defined $params{url}) {
@@ -46,9 +46,9 @@ sub preprocess_shortcut (@) { #{{{
 	#translators: First parameter is the name of the shortcut, the second
 	#translators: is an URL.
 	return sprintf(gettext("shortcut %s points to <i>%s</i>"), $params{name}, $params{url});
-} # }}}
+}
 
-sub shortcut_expand ($$@) { #{{{
+sub shortcut_expand ($$@) {
 	my $url=shift;
 	my $desc=shift;
 	my %params=@_;
@@ -85,6 +85,6 @@ sub shortcut_expand ($$@) { #{{{
 	}
 
 	return "<a href=\"$url\">$desc</a>";
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 9697e1198..746fa93bb 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -8,20 +8,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "sidebar", call => \&getsetup);
 	hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub sidebar_content ($) { #{{{
+sub sidebar_content ($) {
 	my $page=shift;
 	
 	my $sidebar_page=bestlink($page, "sidebar") || return;
@@ -42,9 +42,9 @@ sub sidebar_content ($) { #{{{
 		       IkiWiki::filter($sidebar_page, $page, $content))));
 	}
 
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 
 	my $page=$params{page};
@@ -56,6 +56,6 @@ sub pagetemplate (@) { #{{{
 		        $template->param(sidebar => $content);
 		}
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index ef7b9b428..321c93ed5 100644
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -5,21 +5,21 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "signinedit", call => \&getsetup);
 	hook(type => "canedit", id => "signinedit", call => \&canedit,
 	     last => 1);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub canedit ($$$) { #{{{
+sub canedit ($$$) {
 	my $page=shift;
 	my $cgi=shift;
 	my $session=shift;
@@ -34,6 +34,6 @@ sub canedit ($$$) { #{{{
 	else {
 		return "";
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index f844ddb91..96c4a5d6b 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -8,7 +8,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getopt", id => "skeleton",  call => \&getopt);
 	hook(type => "getsetup", id => "skeleton",  call => \&getsetup);
 	hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
@@ -34,13 +34,13 @@ sub import { #{{{
 	hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "skeleton", call => \&formbuilder);
 	hook(type => "savestate", id => "skeleton", call => \&savestate);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
 	debug("skeleton plugin getopt");
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -53,155 +53,155 @@ sub getsetup () { #{{{
 			safe => 0,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	debug("skeleton plugin checkconfig");
-} #}}}
+}
 
-sub refresh () { #{{{
+sub refresh () {
 	debug("skeleton plugin refresh");
-} #}}}
+}
 
-sub needsbuild () { #{{{
+sub needsbuild () {
 	debug("skeleton plugin needsbuild");
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	return "skeleton plugin result";
-} # }}}
+}
 
-sub filter (@) { #{{{
+sub filter (@) {
 	my %params=@_;
 	
 	debug("skeleton plugin running as filter");
 
 	return $params{content};
-} # }}}
+}
 
-sub linkify (@) { #{{{
+sub linkify (@) {
 	my %params=@_;
 	
 	debug("skeleton plugin running as linkify");
 
 	return $params{content};
-} # }}}
+}
 
 sub scan (@) { #{{{a
 	my %params=@_;
 
 	debug("skeleton plugin running as scan");
-} # }}}
+}
 
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 
 	debug("skeleton plugin running as htmlize");
 
 	return $params{content};
-} # }}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 	
 	debug("skeleton plugin running as a sanitizer");
 
 	return $params{content};
-} # }}}
+}
 
-sub postscan (@) { #{{{
+sub postscan (@) {
 	my %params=@_;
 	
 	debug("skeleton plugin running as postscan");
-} # }}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
 	my %params=@_;
 	
 	debug("skeleton plugin running as a formatter");
 
 	return $params{content};
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $template=$params{template};
 	
 	debug("skeleton plugin running as a pagetemplate hook");
-} # }}}
+}
 
-sub templatefile (@) { #{{{
+sub templatefile (@) {
 	my %params=@_;
 	my $page=$params{page};
 	
 	debug("skeleton plugin running as a templatefile hook");
-} # }}}
+}
 
-sub delete (@) { #{{{
+sub delete (@) {
 	my @files=@_;
 
 	debug("skeleton plugin told that files were deleted: @files");
-} #}}}
+}
 
-sub change (@) { #{{{
+sub change (@) {
 	my @files=@_;
 
 	debug("skeleton plugin told that changed files were rendered: @files");
-} #}}}
+}
 
-sub cgi ($) { #{{{
+sub cgi ($) {
 	my $cgi=shift;
 
 	debug("skeleton plugin running in cgi");
-} #}}}
+}
 
-sub auth ($$) { #{{{
+sub auth ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
 	debug("skeleton plugin running in auth");
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
 	debug("skeleton plugin running in sessioncgi");
-} #}}}
+}
 
-sub canedit ($$$) { #{{{
+sub canedit ($$$) {
 	my $page=shift;
 	my $cgi=shift;
 	my $session=shift;
 
 	debug("skeleton plugin running in canedit");
-} #}}}
+}
 
-sub editcontent ($$$) { #{{{
+sub editcontent ($$$) {
 	my %params=@_;
 
 	debug("skeleton plugin running in editcontent");
 
 	return $params{content};
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 	
 	debug("skeleton plugin running in formbuilder_setup");
-} # }}}
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	
 	debug("skeleton plugin running in formbuilder");
-} # }}}
+}
 
-sub savestate () { #{{{
+sub savestate () {
 	debug("skeleton plugin running in savestate");
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 2633b1ea1..70b8cef74 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -8,13 +8,13 @@ use IkiWiki 2.00;
 my %smileys;
 my $smiley_regexp;
 
-sub import { #{{{
+sub import {
 	add_underlay("smiley");
 	hook(type => "getsetup", id => "smiley", call => \&getsetup);
 	hook(type => "sanitize", id => "smiley", call => \&sanitize);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -22,9 +22,9 @@ sub getsetup () { #{{{
 			# removes the smileys, which would break links
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub build_regexp () { #{{{
+sub build_regexp () {
 	my $list=readfile(srcfile("smileys.mdwn"));
 	while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) {
 		my $smiley=$1;
@@ -50,9 +50,9 @@ sub build_regexp () { #{{{
 	$smiley_regexp='('.join('|', map { quotemeta }
 		reverse sort keys %smileys).')';
 	#debug($smiley_regexp);
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 
 	build_regexp() unless defined $smiley_regexp;
@@ -95,6 +95,6 @@ MATCH:	while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
 	}
 
 	return $_;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 901c2f683..dca755c63 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -14,20 +14,20 @@ my %locmap=(
 	left => 'TEXT_LEFT',
 );
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "sparkline", call => \&getsetup);
 	hook(type => "preprocess", id => "sparkline", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	my $php;
@@ -166,6 +166,6 @@ sub preprocess (@) { #{{{
 	}
 
 	return '<img src="'.urlto($fn, $params{destpage}).'" alt="graph" />';
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index d738720be..fe55e7d08 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -6,7 +6,7 @@ use strict;
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);
 
-sub import { #{{{
+sub import {
 	hook(type => "checkconfig", id => "svn", call => \&checkconfig);
 	hook(type => "getsetup", id => "svn", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -19,9 +19,9 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (! defined $config{svnpath}) {
 		$config{svnpath}="trunk";
 	}
@@ -37,9 +37,9 @@ sub checkconfig () { #{{{
 			wrappermode => (defined $config{svn_wrappermode} ? $config{svn_wrappermode} : "04755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
@@ -87,7 +87,7 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
 # svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
 sub find_lc_ctype() {
@@ -107,27 +107,27 @@ sub find_lc_ctype() {
 
 	# fallback to the current locale
 	return $current;
-} # }}}
+}
 $ENV{LC_CTYPE} = $ENV{LC_CTYPE} || find_lc_ctype();
 
-sub svn_info ($$) { #{{{
+sub svn_info ($$) {
 	my $field=shift;
 	my $file=shift;
 
 	my $info=`LANG=C svn info $file`;
 	my ($ret)=$info=~/^$field: (.*)$/m;
 	return $ret;
-} #}}}
+}
 
-sub rcs_update () { #{{{
+sub rcs_update () {
 	if (-d "$config{srcdir}/.svn") {
 		if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
 			warn("svn update failed\n");
 		}
 	}
-} #}}}
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	# Prepares to edit a file under revision control. Returns a token
 	# that must be passed into rcs_commit when the file is ready
 	# for committing.
@@ -140,9 +140,9 @@ sub rcs_prepedit ($) { #{{{
 		my $rev=svn_info("Revision", "$config{srcdir}/$file");
 		return defined $rev ? $rev : "";
 	}
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -185,7 +185,7 @@ sub rcs_commit ($$$;$$) { #{{{
 		}
 	}
 	return undef # success
-} #}}}
+}
 
 sub rcs_commit_staged ($$$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
@@ -209,7 +209,7 @@ sub rcs_commit_staged ($$$) {
 	return undef # success
 }
 
-sub rcs_add ($) { #{{{
+sub rcs_add ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
 
@@ -224,9 +224,9 @@ sub rcs_add ($) { #{{{
 			warn("svn add failed\n");
 		}
 	}
-} #}}}
+}
 
-sub rcs_remove ($) { #{{{
+sub rcs_remove ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
 
@@ -235,9 +235,9 @@ sub rcs_remove ($) { #{{{
 			warn("svn rm failed\n");
 		}
 	}
-} #}}}
+}
 
-sub rcs_rename ($$) { #{{{
+sub rcs_rename ($$) {
 	# filenames relative to the root of the srcdir
 	my ($src, $dest)=@_;
 	
@@ -258,9 +258,9 @@ sub rcs_rename ($$) { #{{{
 			warn("svn rename failed\n");
 		}
 	}
-} #}}}
+}
 
-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {
 	my $num=shift;
 	my @ret;
 	
@@ -341,14 +341,14 @@ sub rcs_recentchanges ($) { #{{{
 	}
 
 	return @ret;
-} #}}}
+}
 
-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {
 	my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
 	return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
-} #}}}
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	my $file=shift;
 
 	my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
@@ -376,6 +376,6 @@ sub rcs_getctime ($) { #{{{
 	$date=str2time($date);
 	debug("found ctime ".localtime($date)." for $file");
 	return $date;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index e782fc238..b6f53f607 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -6,20 +6,20 @@ use strict;
 use Encode;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "table", call => \&getsetup);
 	hook(type => "preprocess", id => "table", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params =(
 		format	=> 'auto',
 		header	=> 'row',
@@ -102,16 +102,16 @@ sub preprocess (@) { #{{{
 	else {  
 		return $html;
 	}            
-} #}}}
+}
 
-sub is_dsv_data ($) { #{{{
+sub is_dsv_data ($) {
 	my $text = shift;
 
 	my ($line) = split(/\n/, $text);
 	return $line =~ m{.+\|};
 }
 
-sub split_csv ($$) { #{{{
+sub split_csv ($$) {
 	my @text_lines = split(/\n/, shift);
 	my $delimiter = shift;
 
@@ -137,9 +137,9 @@ sub split_csv ($$) { #{{{
 	}
 
 	return @data;
-} #}}}
+}
 
-sub split_dsv ($$) { #{{{
+sub split_dsv ($$) {
 	my @text_lines = split(/\n/, shift);
 	my $delimiter = shift;
 	$delimiter="|" unless defined $delimiter;
@@ -150,9 +150,9 @@ sub split_dsv ($$) { #{{{
 	}
     
 	return @data;
-} #}}}
+}
 
-sub genrow ($@) { #{{{
+sub genrow ($@) {
 	my %params=%{shift()};
 	my $elt = shift;
 	my @data = @_;
@@ -190,6 +190,6 @@ sub genrow ($@) { #{{{
 	push @ret, "\t\t</tr>";
 
 	return @ret;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index d725ef9b3..ecc77cbb1 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -8,22 +8,22 @@ use IkiWiki 2.00;
 
 my %tags;
 
-sub import { #{{{
+sub import {
 	hook(type => "getopt", id => "tag", call => \&getopt);
 	hook(type => "getsetup", id => "tag", call => \&getsetup);
 	hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
 	hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);
 	hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
 	Getopt::Long::Configure('pass_through');
 	GetOptions("tagbase=s" => \$config{tagbase});
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -36,9 +36,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub tagpage ($) { #{{{
+sub tagpage ($) {
 	my $tag=shift;
 			
 	if ($tag !~ m{^\.?/} &&
@@ -48,18 +48,18 @@ sub tagpage ($) { #{{{
 	}
 
 	return $tag;
-} #}}}
+}
 
-sub taglink ($$$;@) { #{{{
+sub taglink ($$$;@) {
 	my $page=shift;
 	my $destpage=shift;
 	my $tag=shift;
 	my %opts=@_;
 
 	return htmllink($page, $destpage, tagpage($tag), %opts);
-} #}}}
+}
 
-sub preprocess_tag (@) { #{{{
+sub preprocess_tag (@) {
 	if (! @_) {
 		return "";
 	}
@@ -77,9 +77,9 @@ sub preprocess_tag (@) { #{{{
 	}
 		
 	return "";
-} # }}}
+}
 
-sub preprocess_taglink (@) { #{{{
+sub preprocess_taglink (@) {
 	if (! @_) {
 		return "";
 	}
@@ -102,9 +102,9 @@ sub preprocess_taglink (@) { #{{{
 	grep {
 		$_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
 	} keys %params);
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $destpage=$params{destpage};
@@ -123,6 +123,6 @@ sub pagetemplate (@) { #{{{
 				sort keys %{$tags{$page}}]);
 		}
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index c980df48f..1b7eb91bf 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -8,20 +8,20 @@ use IkiWiki 2.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "template", call => \&getsetup);
 	hook(type => "preprocess", id => "template", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	if (! exists $params{id}) {
@@ -71,6 +71,6 @@ sub preprocess (@) { #{{{
 	return IkiWiki::preprocess($params{page}, $params{destpage},
 		IkiWiki::filter($params{page}, $params{destpage},
 		$template->output));
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 9f9b50f01..a6e94dbbb 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -5,20 +5,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "testpagespec", call => \&getsetup);
 	hook(type => "preprocess", id => "testpagespec", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	
 	foreach my $param (qw{match pagespec}) {
@@ -37,6 +37,6 @@ sub preprocess (@) { #{{{
 	else {
 		return "no match: $ret";
 	}
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index 661d97b1f..57b23147e 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -21,12 +21,12 @@ EOPREFIX
 
 my $default_postfix = '\\end{document}';
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "teximg", call => \&getsetup);
 	hook(type => "preprocess", id => "teximg", call => \&preprocess);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -52,9 +52,9 @@ sub getsetup () { #{{{
 			safe => 0, # Not sure how secure LaTeX is...
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params = @_;
 	
 	my $height = $params{height};
@@ -76,9 +76,9 @@ sub preprocess (@) { #{{{
 	else {
 		error gettext("code includes disallowed latex commands")
 	}
-} #}}}
+}
 
-sub check_height ($) { #{{{
+sub check_height ($) {
 	# Since latex doesn't support unlimited scaling this function
 	# returns the closest supported size.
 	my $height =shift;
@@ -95,9 +95,9 @@ sub check_height ($) { #{{{
 		}
 	}
 	return $ret;
-} #}}}
+}
 
-sub create ($$$) { #{{{
+sub create ($$$) {
 	# This function calls the image generating function and returns
 	# the <img .. /> for the generated image.
 	my $code = shift;
@@ -127,9 +127,9 @@ sub create ($$$) { #{{{
 	else {
 		error qq{<a href="$logurl">}.gettext("failed to generate image from code")."</a>";
 	}
-} #}}}
+}
 
-sub gen_image ($$$$) { #{{{
+sub gen_image ($$$$) {
 	# Actually creates the image.
 	my $code = shift;
 	my $height = shift;
@@ -180,18 +180,18 @@ sub gen_image ($$$$) { #{{{
 
 		return 0;
 	}
-} #}}}
+}
 
-sub create_tmp_dir ($) { #{{{
+sub create_tmp_dir ($) {
 	# Create a temp directory, it will be removed when ikiwiki exits.
 	my $base = shift;
 
 	my $template = $base.".XXXXXXXXXX";
 	my $tmpdir = tempdir($template, TMPDIR => 1, CLEANUP => 1);
 	return $tmpdir;
-} #}}}
+}
 
-sub check ($) { #{{{
+sub check ($) {
 	# Check if the code is ok
 	my $code = shift;
 
@@ -219,6 +219,6 @@ sub check ($) { #{{{
 		}
 	}
 	return 1;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm
index bbd282f0c..d1b927b74 100644
--- a/IkiWiki/Plugin/textile.pm
+++ b/IkiWiki/Plugin/textile.pm
@@ -9,26 +9,26 @@ use strict;
 use IkiWiki 2.00;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "textile", call => \&getsetup);
 	hook(type => "htmlize", id => "txtl", call => \&htmlize);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
 		},
-} #}}}
+}
 
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	my $content = decode_utf8(encode_utf8($params{content}));
 
 	eval q{use Text::Textile};
 	return $content if $@;
 	return Text::Textile::textile($content);
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index 0a5c161b2..f4b20a6ec 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -5,7 +5,7 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
+sub import {
 	hook(type => "checkconfig", id => "tla", call => \&checkconfig);
 	hook(type => "getsetup", id => "tla", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -18,18 +18,18 @@ sub import { #{{{
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (defined $config{tla_wrapper} && length $config{tla_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{tla_wrapper},
 			wrappermode => (defined $config{tla_wrappermode} ? $config{tla_wrappermode} : "06755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
@@ -63,9 +63,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub quiet_system (@) { #{{{
+sub quiet_system (@) {
 	# See Debian bug #385939.
 	open (SAVEOUT, ">&STDOUT");
 	close STDOUT;
@@ -75,17 +75,17 @@ sub quiet_system (@) { #{{{
 	open (STDOUT, ">&SAVEOUT");
 	close SAVEOUT;
 	return $ret;
-} #}}}
+}
 
-sub rcs_update () { #{{{
+sub rcs_update () {
 	if (-d "$config{srcdir}/{arch}") {
 		if (quiet_system("tla", "replay", "-d", $config{srcdir}) != 0) {
 			warn("tla replay failed\n");
 		}
 	}
-} #}}}
+}
 
-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {
 	my $file=shift;
 
 	if (-d "$config{srcdir}/{arch}") {
@@ -94,9 +94,9 @@ sub rcs_prepedit ($) { #{{{
 		my $rev=`tla tree-id $config{srcdir}`;
 		return defined $rev ? $rev : "";
 	}
-} #}}}
+}
 
-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {
 	my $file=shift;
 	my $message=shift;
 	my $rcstoken=shift;
@@ -135,7 +135,7 @@ sub rcs_commit ($$$;$$) { #{{{
 		}
 	}
 	return undef # success
-} #}}}
+}
 
 sub rcs_commit_staged ($$$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
@@ -145,7 +145,7 @@ sub rcs_commit_staged ($$$) {
 	error("rcs_commit_staged not implemented for tla"); # TODO
 }
 
-sub rcs_add ($) { #{{{
+sub rcs_add ($) {
 	my $file=shift;
 
 	if (-d "$config{srcdir}/{arch}") {
@@ -153,19 +153,19 @@ sub rcs_add ($) { #{{{
 			warn("tla add failed\n");
 		}
 	}
-} #}}}
+}
 
-sub rcs_remove ($) { # {{{
+sub rcs_remove ($) {
 	my $file = shift;
 
 	error("rcs_remove not implemented for tla"); # TODO
-} #}}}
+}
 
 sub rcs_rename ($$) { # {{{a
 	my ($src, $dest) = @_;
 
 	error("rcs_rename not implemented for tla"); # TODO
-} #}}}
+}
 
 sub rcs_recentchanges ($) {
 	my $num=shift;
@@ -239,7 +239,7 @@ sub rcs_recentchanges ($) {
 	return @ret;
 }
 
-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {
 	my $rev=shift;
 	my $logs = `tla logs -d $config{srcdir}`;
 	my @changesets = reverse split(/\n/, $logs);
@@ -251,9 +251,9 @@ sub rcs_diff ($) { #{{{
 
 	my $revminusone = $changesets[$i+1];
 	return `tla diff -d $config{srcdir} $revminusone`;
-} #}}}
+}
 
-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {
 	my $file=shift;
 	eval q{use Date::Parse};
 	error($@) if $@;
@@ -281,6 +281,6 @@ sub rcs_getctime ($) { #{{{
 	my $date=str2time($sdate, 'UTC');
 	debug("found ctime ".localtime($date)." for $file");
 	return $date;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index dff9d9aa5..460837b1d 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -7,23 +7,23 @@ use strict;
 use IkiWiki 2.00;
 use HTML::Parser;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "toc", call => \&getsetup);
 	hook(type => "preprocess", id => "toc", call => \&preprocess);
 	hook(type => "format", id => "toc", call => \&format);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
 my %tocpages;
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	if ($params{page} eq $params{destpage}) {
@@ -40,9 +40,9 @@ sub preprocess (@) { #{{{
 		# right.
 		return "";
 	}
-} # }}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
 	my %params=@_;
 	my $content=$params{content};
 	
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 657d8d3c2..967b07fcc 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -5,7 +5,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	add_underlay("javascript");
 	hook(type => "getsetup", id => "toggle", call => \&getsetup);
 	hook(type => "preprocess", id => "toggle",
@@ -13,17 +13,17 @@ sub import { #{{{
 	hook(type => "preprocess", id => "toggleable",
 		call => \&preprocess_toggleable);
 	hook(type => "format", id => "toggle", call => \&format);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub genid ($$) { #{{{
+sub genid ($$) {
 	my $page=shift;
 	my $id=shift;
 
@@ -35,16 +35,16 @@ sub genid ($$) { #{{{
 		$id="id$id";
 	}
 	return $id;
-} #}}}
+}
 
-sub preprocess_toggle (@) { #{{{
+sub preprocess_toggle (@) {
 	my %params=(id => "default", text => "more", @_);
 
 	my $id=genid($params{page}, $params{id});
 	return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
-} # }}}
+}
 
-sub preprocess_toggleable (@) { #{{{
+sub preprocess_toggleable (@) {
 	my %params=(id => "default", text => "", open => "no", @_);
 
 	# Preprocess the text to expand any preprocessor directives
@@ -61,9 +61,9 @@ sub preprocess_toggleable (@) { #{{{
 	my ($indent)=$params{text}=~/( +)$/;
 	$indent="" unless defined $indent;
 	return "<div class=\"$class\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";
-} # }}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
         my %params=@_;
 
 	if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
@@ -74,9 +74,9 @@ sub format (@) { #{{{
 		}
 	}
 	return $params{content};
-} # }}}
+}
 
-sub include_javascript ($;$) { #{{{
+sub include_javascript ($;$) {
 	my $page=shift;
 	my $absolute=shift;
 	
@@ -84,6 +84,6 @@ sub include_javascript ($;$) { #{{{
 		'" type="text/javascript" charset="utf-8"></script>'."\n".
 		'<script src="'.urlto("toggle.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>';
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index e157bf07e..d65bb2036 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -24,13 +24,13 @@ sub import {
 	}
 }
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
 		},
-} #}}}
+}
 
 # We use filter to convert raw text to HTML
 # (htmlize is called after other plugins insert HTML)
diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index 27089b390..e395b2143 100644
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -6,20 +6,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getopt", id => "typography", call => \&getopt);
 	hook(type => "getsetup", id => "typography", call => \&getsetup);
 	IkiWiki::hook(type => "sanitize", id => "typography", call => \&sanitize);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
 	Getopt::Long::Configure('pass_through');
 	GetOptions("typographyattributes=s" => \$config{typographyattributes});
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	eval q{use Text::Typography};
 	error($@) if $@;
 
@@ -36,9 +36,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 
 	eval q{use Text::Typography};
@@ -46,6 +46,6 @@ sub sanitize (@) { #{{{
 
 	my $attributes=defined $config{typographyattributes} ? $config{typographyattributes} : '3';
 	return Text::Typography::typography($params{content}, $attributes);
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm
index 18e9613ae..3526dafde 100644
--- a/IkiWiki/Plugin/version.pm
+++ b/IkiWiki/Plugin/version.pm
@@ -6,21 +6,21 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "version", call => \&getsetup);
 	hook(type => "needsbuild", id => "version", call => \&needsbuild);
 	hook(type => "preprocess", id => "version", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{version}{shown}) {
@@ -36,11 +36,11 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$pagestate{$params{destpage}}{version}{shown}=$IkiWiki::version;
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 827ee3099..66dacfde3 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -5,15 +5,15 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "websetup", call => \&getsetup);
 	hook(type => "checkconfig", id => "websetup", call => \&checkconfig);
 	hook(type => "sessioncgi", id => "websetup", call => \&sessioncgi);
 	hook(type => "formbuilder_setup", id => "websetup", 
 	     call => \&formbuilder_setup);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -33,15 +33,15 @@ sub getsetup () { #{{{
 			safe => 0,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (! exists $config{websetup_show_unsafe}) {
 		$config{websetup_show_unsafe}=1;
 	}
-} #}}}
+}
 
-sub formatexample ($$) { #{{{
+sub formatexample ($$) {
 	my $example=shift;
 	my $value=shift;
 
@@ -54,9 +54,9 @@ sub formatexample ($$) { #{{{
 	else {
 		return "";
 	}
-} #}}}
+}
 
-sub showfields ($$$@) { #{{{
+sub showfields ($$$@) {
 	my $form=shift;
 	my $plugin=shift;
 	my $enabled=shift;
@@ -207,16 +207,16 @@ sub showfields ($$$@) { #{{{
 	}
 
 	return %enabledfields;
-} #}}}
+}
 
-sub enable_plugin ($) { #{{{
+sub enable_plugin ($) {
 	my $plugin=shift;
 
 	$config{disable_plugins}=[grep { $_ ne $plugin } @{$config{disable_plugins}}];
 	push @{$config{add_plugins}}, $plugin;
 }
 
-sub disable_plugin ($) { #{{{
+sub disable_plugin ($) {
 	my $plugin=shift;
 
 	if (grep { $_ eq $plugin } @{$config{add_plugins}}) {
@@ -227,7 +227,7 @@ sub disable_plugin ($) { #{{{
 	}
 }
 
-sub showform ($$) { #{{{
+sub showform ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
@@ -441,9 +441,9 @@ sub showform ($$) { #{{{
 	}
 
 	IkiWiki::showform($form, $buttons, $session, $cgi);
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
@@ -451,9 +451,9 @@ sub sessioncgi ($$) { #{{{
 		showform($cgi, $session);
 		exit;
 	}
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -464,6 +464,6 @@ sub formbuilder_setup (@) { #{{{
 			exit;
 		}
 	}
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index c47ccb7b1..50571e524 100644
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -6,27 +6,27 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "wiki", call => \&getsetup);
 	hook(type => "htmlize", id => "wiki", call => \&htmlize);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # format plugin
 			rebuild => undef,
 		},
-} #}}}
+}
 
 
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	my $content = $params{content};
 
 	eval q{use Text::WikiFormat};
 	return $content if $@;
 	return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
-} # }}}
+}
 
 1
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 72668d26a..37b6f2a62 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -6,21 +6,21 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub getuser () { #{{{
+sub getuser () {
 	my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
 	if (! defined $user) {
 		error("cannot determine username for $<");
 	}
 	return $user;
-} #}}}
+}
 
-sub trusted () { #{{{
+sub trusted () {
 	my $user=getuser();
 	return ! ref $config{untrusted_committers} ||
 		! grep { $_ eq $user } @{$config{untrusted_committers}};
-} #}}}
+}
 
-sub gen_wrapper () { #{{{
+sub gen_wrapper () {
 	# Test for commits from untrusted committers in the wrapper, to
 	# avoid loading ikiwiki at all for trusted commits.
 
@@ -43,9 +43,9 @@ EOF
 	}
 EOF
 	return $ret;
-} #}}}
+}
 
-sub test () { #{{{
+sub test () {
 	exit 0 if trusted();
 	
 	IkiWiki::lockwiki();
@@ -130,6 +130,6 @@ sub test () { #{{{
 	}
 
 	exit 0;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 389063d46..adae9f0d5 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -10,7 +10,7 @@ use Encode;
 my %backlinks;
 my $backlinks_calculated=0;
 
-sub calculate_backlinks () { #{{{
+sub calculate_backlinks () {
 	return if $backlinks_calculated;
 	%backlinks=();
 	foreach my $page (keys %links) {
@@ -22,9 +22,9 @@ sub calculate_backlinks () { #{{{
 		}
 	}
 	$backlinks_calculated=1;
-} #}}}
+}
 
-sub backlinks ($) { #{{{
+sub backlinks ($) {
 	my $page=shift;
 
 	calculate_backlinks();
@@ -45,9 +45,9 @@ sub backlinks ($) { #{{{
 		push @links, { url => $href, page => pagetitle($p_trimmed) };
 	}
 	return @links;
-} #}}}
+}
 
-sub genpage ($$) { #{{{
+sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
 
@@ -131,9 +131,9 @@ sub genpage ($$) { #{{{
 	});
 
 	return $content;
-} #}}}
+}
 
-sub scan ($) { #{{{
+sub scan ($) {
 	my $file=shift;
 
 	my $type=pagetype($file);
@@ -165,9 +165,9 @@ sub scan ($) { #{{{
 	else {
 		will_render($file, $file, 1);
 	}
-} #}}}
+}
 
-sub fast_file_copy (@) { #{{{
+sub fast_file_copy (@) {
 	my $srcfile=shift;
 	my $destfile=shift;
 	my $srcfd=shift;
@@ -191,7 +191,7 @@ sub fast_file_copy (@) { #{{{
 	}
 }
 
-sub render ($) { #{{{
+sub render ($) {
 	my $file=shift;
 	
 	my $type=pagetype($file);
@@ -233,9 +233,9 @@ sub render ($) { #{{{
 			fast_file_copy($srcfile, $file, $srcfd, @_);
 		});
 	}
-} #}}}
+}
 
-sub prune ($) { #{{{
+sub prune ($) {
 	my $file=shift;
 
 	unlink($file);
@@ -243,9 +243,9 @@ sub prune ($) { #{{{
 	while (rmdir($dir)) {
 		$dir=dirname($dir);
 	}
-} #}}}
+}
 
-sub refresh () { #{{{
+sub refresh () {
 	# security check, avoid following symlinks in the srcdir path by default
 	my $test=$config{srcdir};
 	while (length $test) {
@@ -507,9 +507,9 @@ sub refresh () { #{{{
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });
 	}
-} #}}}
+}
 
-sub commandline_render () { #{{{
+sub commandline_render () {
 	lockwiki();
 	loadindex();
 	unlockwiki();
@@ -532,6 +532,6 @@ sub commandline_render () { #{{{
 
 	print genpage($page, $content);
 	exit 0;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 77afdd608..6ee112096 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -10,7 +10,7 @@ use IkiWiki;
 use open qw{:utf8 :std};
 use File::Spec;
 
-sub load ($) { # {{{
+sub load ($) {
 	my $setup=IkiWiki::possibly_foolish_untaint(shift);
 	$config{setupfile}=File::Spec->rel2abs($setup);
 
@@ -27,7 +27,7 @@ sub load ($) { # {{{
 
 	eval $code;
 	error("$setup: ".$@) if $@;
-} #}}}
+}
 
 sub merge ($) {
 	# Merge setup into existing config and untaint.
@@ -71,9 +71,9 @@ sub merge ($) {
 			wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
 		};
 	}
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	# Gets all available setup data from all plugins. Returns an
 	# ordered list of [plugin, setup] pairs.
 	my @ret;
@@ -105,9 +105,9 @@ sub getsetup () { #{{{
         $config{syslog}=$syslog;
 
 	return @ret;
-} #}}}
+}
 
-sub dump ($) { #{{{
+sub dump ($) {
 	my $file=IkiWiki::possibly_foolish_untaint(shift);
 	
 	require IkiWiki::Setup::Standard;
diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 88e9f3d24..9f2380d52 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -10,20 +10,20 @@ use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;
 
-sub ask ($$) { #{{{
+sub ask ($$) {
 	my ($question, $default)=@_;
 
 	my $r=Term::ReadLine->new("ikiwiki");
 	$r->readline($question." ", $default);
-} #}}}
+}
 
-sub prettydir ($) { #{{{
+sub prettydir ($) {
 	my $dir=shift;
 	$dir=~s/^\Q$ENV{HOME}\E\//~\//;
 	return $dir;
-} #}}}
+}
 
-sub import (@) { #{{{
+sub import (@) {
 	my $this=shift;
 	IkiWiki::Setup::merge({@_});
 
@@ -142,6 +142,6 @@ sub import (@) { #{{{
 	print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
 	print "	ikiwiki -setup ".prettydir($config{dumpsetup})."\n";
 	exit 0;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index e6bff2826..951bcfc56 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -9,11 +9,11 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
+sub import {
 	IkiWiki::Setup::merge($_[1]);
-} #}}}
+}
 
-sub dumpline ($$$$) { #{{{
+sub dumpline ($$$$) {
 	my $key=shift;
 	my $value=shift;
 	my $type=shift;
@@ -55,9 +55,9 @@ sub dumpline ($$$$) { #{{{
 	}
 	
 	return "\t$prefix$key => $dumpedvalue,";
-} #}}}
+}
 
-sub dumpvalues ($@) { #{{{
+sub dumpvalues ($@) {
 	my $setup=shift;
 	my @ret;
 	while (@_) {
@@ -80,9 +80,9 @@ sub dumpvalues ($@) { #{{{
 		}
 	}
 	return @ret;
-} #}}}
+}
 
-sub gendump ($) { #{{{
+sub gendump ($) {
 	my $description=shift;
 	my %setup=(%config);
 	my @ret;
@@ -112,6 +112,6 @@ sub gendump ($) { #{{{
 	push @ret, "}";
 
 	return @ret;
-} #}}}
+}
 
 1
diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index dcf99da09..3423dc923 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -7,12 +7,12 @@ use strict;
 use Storable;
 use IkiWiki;
 
-sub userinfo_retrieve () { #{{{
+sub userinfo_retrieve () {
 	my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
 	return $userinfo;
-} #}}}
+}
 
-sub userinfo_store ($) { #{{{
+sub userinfo_store ($) {
 	my $userinfo=shift;
 	
 	my $newfile="$config{wikistatedir}/userdb.new";
@@ -26,9 +26,9 @@ sub userinfo_store ($) { #{{{
 		}
 	}
 	return $ret;
-} #}}}
+}
 
-sub userinfo_get ($$) { #{{{
+sub userinfo_get ($$) {
 	my $user=shift;
 	my $field=shift;
 
@@ -39,9 +39,9 @@ sub userinfo_get ($$) { #{{{
 		return "";
 	}
 	return $userinfo->{$user}->{$field};
-} #}}}
+}
 
-sub userinfo_set ($$$) { #{{{
+sub userinfo_set ($$$) {
 	my $user=shift;
 	my $field=shift;
 	my $value=shift;
@@ -54,9 +54,9 @@ sub userinfo_set ($$$) { #{{{
 	
 	$userinfo->{$user}->{$field}=$value;
 	return userinfo_store($userinfo);
-} #}}}
+}
 
-sub userinfo_setall ($$) { #{{{
+sub userinfo_setall ($$) {
 	my $user=shift;
 	my $info=shift;
 	
@@ -66,32 +66,32 @@ sub userinfo_setall ($$) { #{{{
 	}
 	$userinfo->{$user}=$info;
 	return userinfo_store($userinfo);
-} #}}}
+}
 
-sub is_admin ($) { #{{{
+sub is_admin ($) {
 	my $user_name=shift;
 
 	return grep { $_ eq $user_name } @{$config{adminuser}};
-} #}}}
+}
 
 # XXX deprecated, should be removed eventually
-sub get_banned_users () { #{{{
+sub get_banned_users () {
 	my @ret;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
 		push @ret, $user if $userinfo->{$user}->{banned};
 	}
 	return @ret;
-} #}}}
+}
 
 # XXX deprecated, should be removed eventually
-sub set_banned_users (@) { #{{{
+sub set_banned_users (@) {
 	my %banned=map { $_ => 1 } @_;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
 		$userinfo->{$user}->{banned} = $banned{$user};
 	}
 	return userinfo_store($userinfo);
-} #}}}
+}
 
 1
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 31e30ad2e..dd9971a34 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -8,7 +8,7 @@ use File::Spec;
 use Data::Dumper;
 use IkiWiki;
 
-sub gen_wrapper () { #{{{
+sub gen_wrapper () {
 	$config{srcdir}=File::Spec->rel2abs($config{srcdir});
 	$config{destdir}=File::Spec->rel2abs($config{destdir});
 	my $this=File::Spec->rel2abs($0);
@@ -173,6 +173,6 @@ EOF
 	#translators: The parameter is a filename.
 	printf(gettext("successfully generated %s"), $wrapper);
 	print "\n";
-} #}}}
+}
 
 1
diff --git a/debian/changelog b/debian/changelog
index b884dd596..f7085169c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * rename: Fix double-escaping of page name in edit box.
   * monotone: When getting the log, tell monotone how many entries
     we want, rather than closing the pipe, which it dislikes. (thm)
+  * Coding style change: Remove explcit vim folding markers.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
diff --git a/doc/bugs/Allow_overriding_of_symlink_restriction.mdwn b/doc/bugs/Allow_overriding_of_symlink_restriction.mdwn
index 07badd646..efdd9004e 100644
--- a/doc/bugs/Allow_overriding_of_symlink_restriction.mdwn
+++ b/doc/bugs/Allow_overriding_of_symlink_restriction.mdwn
@@ -34,9 +34,9 @@ Is there a huge objection to this patch?
     index 990fcaa..0fb78ba 100644
     --- a/IkiWiki/Render.pm
     +++ b/IkiWiki/Render.pm
-    @@ -260,13 +260,15 @@ sub prune ($) { #{{{
+    @@ -260,13 +260,15 @@ sub prune ($) {
      
-     sub refresh () { #{{{
+     sub refresh () {
      	# security check, avoid following symlinks in the srcdir path
     -	my $test=$config{srcdir};
     -	while (length $test) {
@@ -108,7 +108,7 @@ like this being accepted before I bothered.
      use IkiWiki;
     +use File::Spec;
      
-     sub gen_wrapper () { #{{{
+     sub gen_wrapper () {
     -       $config{srcdir}=abs_path($config{srcdir});
     -       $config{destdir}=abs_path($config{destdir});
     -       my $this=abs_path($0);
diff --git a/doc/bugs/Can__39__t_create_root_page.mdwn b/doc/bugs/Can__39__t_create_root_page.mdwn
index 60cbcd530..91c2eae60 100644
--- a/doc/bugs/Can__39__t_create_root_page.mdwn
+++ b/doc/bugs/Can__39__t_create_root_page.mdwn
@@ -33,7 +33,7 @@ This type of page name (with leading slash) also gets created by the aggregate p
 	index 99cead6..23d9616 100644
 	--- a/IkiWiki/CGI.pm
 	+++ b/IkiWiki/CGI.pm
-	@@ -305,9 +305,11 @@ sub cgi_editpage ($$) { #{{{
+	@@ -305,9 +305,11 @@ sub cgi_editpage ($$) {
 	 	my $page=$form->field('page');
 	 	$page=possibly_foolish_untaint($page);
 	 	if (! defined $page || ! length $page ||
@@ -46,7 +46,7 @@ This type of page name (with leading slash) also gets created by the aggregate p
 	 
 	 	my $baseurl=$config{url}."/".htmlpage($page);
 	 	
-	@@ -425,6 +427,7 @@ sub cgi_editpage ($$) { #{{{
+	@@ -425,6 +427,7 @@ sub cgi_editpage ($$) {
 	 			    $from ne $form->field('from') ||
 	 			    file_pruned($from, $config{srcdir}) ||
 	 			    $from=~/^\// ||
diff --git a/doc/bugs/Insecure_dependency_in_eval_while_running_with_-T_switch.mdwn b/doc/bugs/Insecure_dependency_in_eval_while_running_with_-T_switch.mdwn
index 28b48e2c6..c3beb8219 100644
--- a/doc/bugs/Insecure_dependency_in_eval_while_running_with_-T_switch.mdwn
+++ b/doc/bugs/Insecure_dependency_in_eval_while_running_with_-T_switch.mdwn
@@ -53,7 +53,7 @@ I didn't apply your following old patch against `Ikiwiki.pm` file:
     +   }
     +
     +   return eval $newpagespec;
-     } #}}}
+     }
  
      package IkiWiki::PageSpec;
 
@@ -83,7 +83,7 @@ to break the code I distribute in my backport ;)
 	+	my $ret=eval possibly_foolish_untaint(pagespec_translate($spec));
 	 	return IkiWiki::FailReason->new("syntax error") if $@;
 	 	return $ret;
-	 } #}}}
+	 }
 
 >> Thanks a lot, Joey! It works :)
 >>
diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn
index 3d1388312..8687e7983 100644
--- a/doc/bugs/Monotone_rcs_support.mdwn
+++ b/doc/bugs/Monotone_rcs_support.mdwn
@@ -11,7 +11,7 @@ diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
 index cde6029..34f8f96 100644
 --- a/IkiWiki/Rcs/monotone.pm
 +++ b/IkiWiki/Rcs/monotone.pm
-@@ -186,8 +186,9 @@ sub rcs_update () { #{{{
+@@ -186,8 +186,9 @@ sub rcs_update () {
  	check_config();
  
  	if (defined($config{mtnsync}) && $config{mtnsync}) {
diff --git a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn
index 019970899..bb3f92f9c 100644
--- a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn
+++ b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn
@@ -38,19 +38,19 @@ At the moment I see two possible solutions:
         +++ IkiWiki.pm  2008-07-21 20:41:35.000000000 +0200
         @@ -477,13 +477,13 @@
 
-         sub titlepage ($) { #{{{
+         sub titlepage ($) {
                 my $title=shift;
         -       $title=~s/([^-[:alnum:]:+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
         +       $title=~s/([^-[:alnum:]+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
                 return $title;
-         } #}}}
+         }
 
-         sub linkpage ($) { #{{{
+         sub linkpage ($) {
                 my $link=shift;
         -       $link=~s/([^-[:alnum:]:+\/._])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
         +       $link=~s/([^-[:alnum:]+\/._])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
                 return $link;
-         } #}}}
+         }
 
 What do you think about that? Does the patch have any side-effects I didn't see?
 
diff --git a/doc/bugs/Problem_with_toc.pm_plug-in.mdwn b/doc/bugs/Problem_with_toc.pm_plug-in.mdwn
index 8ae347d42..6be5f89b5 100644
--- a/doc/bugs/Problem_with_toc.pm_plug-in.mdwn
+++ b/doc/bugs/Problem_with_toc.pm_plug-in.mdwn
@@ -9,7 +9,7 @@ Here is a patch for toc.pm for producing non-empty 'a' elements.
 
     --- IkiWiki/Plugin/toc.pm.orig	Thu Jun  7 11:53:53 2007
     +++ IkiWiki/Plugin/toc.pm	Thu Jun  7 13:00:00 2007
-    @@ -47,7 +47,7 @@ sub format (@) { #{{{
+    @@ -47,7 +47,7 @@ sub format (@) {
      		if ($tagname =~ /^h(\d+)$/i) {
      			my $level=$1;
      			my $anchor="index".++$anchors{$level}."h$level";
@@ -18,7 +18,7 @@ Here is a patch for toc.pm for producing non-empty 'a' elements.
      	
      			# Take the first header level seen as the topmost level,
      			# even if there are higher levels seen later on.
-    @@ -90,6 +90,16 @@ sub format (@) { #{{{
+    @@ -90,6 +90,16 @@ sub format (@) {
      					"</a>\n";
      				$p->handler(text => undef);
      			}, "dtext");
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
index 9a26e505a..c9f698158 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
@@ -15,7 +15,7 @@ It also generates image URLs relative to the page being rendered, which means th
 
     --- IkiWiki/Plugin/graphviz.pm.orig	2007-07-27 11:35:05.000000000 +0200
     +++ IkiWiki/Plugin/graphviz.pm	2007-07-27 11:36:02.000000000 +0200
-    @@ -69,7 +69,12 @@ sub render_graph (\%) { #{{{
+    @@ -69,7 +69,12 @@ sub render_graph (\%) {
      		}
      	}
      
@@ -26,9 +26,9 @@ It also generates image URLs relative to the page being rendered, which means th
     +	else {
     +		return "<img src=\"".urlto($dest, $params{page})."\" />\n";
     +	}
-     } #}}}
+     }
      
-     sub graph (@) { #{{{
+     sub graph (@) {
 
 
 >> --[[HenrikBrixAndersen]]
@@ -38,7 +38,7 @@ The patch below fixes these two issues.
 
     --- graphviz.pm.orig	Thu Jun  7 15:45:16 2007
     +++ graphviz.pm	Fri Jun  8 12:03:38 2007
-    @@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
+    @@ -41,7 +41,6 @@ sub render_graph (\%) {
      		$pid=open2(*IN, *OUT, "$params{prog} -Tpng");
      
      		# open2 doesn't respect "use open ':utf8'"
@@ -46,7 +46,7 @@ The patch below fixes these two issues.
      		binmode (OUT, ':utf8');
      
      		print OUT $src;
-    @@ -70,7 +69,12 @@ sub render_graph (\%) { #{{{
+    @@ -70,7 +69,12 @@ sub render_graph (\%) {
      		}
      	}
      
@@ -57,6 +57,6 @@ The patch below fixes these two issues.
     +	else {
     +		return "<img src=\"".urlto($dest, $params{page})."\" />\n";
     +	}
-     } #}}}
+     }
      
-     sub graph (@) { #{{{
+     sub graph (@) {
diff --git a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
index 836c39a71..c852df5e9 100644
--- a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
+++ b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
@@ -13,7 +13,7 @@ I can not see why this check is needed in the first place, so here's a patch for
     diff -upr ikiwiki-1.49.orig/IkiWiki/Rcs/svn.pm ikiwiki-1.49/IkiWiki/Rcs/svn.pm
     --- ikiwiki-1.49.orig/IkiWiki/Rcs/svn.pm	Mon Apr 16 15:15:09 2007
     +++ ikiwiki-1.49/IkiWiki/Rcs/svn.pm	Mon Apr 16 15:15:47 2007
-    @@ -176,7 +176,6 @@ sub rcs_recentchanges ($) { #{{{
+    @@ -176,7 +176,6 @@ sub rcs_recentchanges ($) {
      		}
      
      		foreach (keys %{$logentry->{paths}}) {
diff --git a/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn b/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn
index cc53c0aea..f2c60309b 100644
--- a/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn
+++ b/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn
@@ -6,7 +6,7 @@ If I click on "Czars in Russia", I'd like Ikiwiki to create "Czars\_in\_Russia.m
 
 > --- a/IkiWiki.pm
 > +++ b/IkiWiki.pm
-> @@ -584,7 +584,7 @@ sub htmllink ($$$;@) { #{{{
+> @@ -584,7 +584,7 @@ sub htmllink ($$$;@) {
 >  			return "<span class=\"createlink\"><a href=\"".
 >  				cgiurl(
 >  					do => "create",
diff --git a/doc/bugs/Warns_about_use_of_uninitialized_value_if_prefix__95__directives_is_on_and_a_directive_does_not_contain_a_space.mdwn b/doc/bugs/Warns_about_use_of_uninitialized_value_if_prefix__95__directives_is_on_and_a_directive_does_not_contain_a_space.mdwn
index a30f110a4..efb5c70b8 100644
--- a/doc/bugs/Warns_about_use_of_uninitialized_value_if_prefix__95__directives_is_on_and_a_directive_does_not_contain_a_space.mdwn
+++ b/doc/bugs/Warns_about_use_of_uninitialized_value_if_prefix__95__directives_is_on_and_a_directive_does_not_contain_a_space.mdwn
@@ -6,7 +6,7 @@ In `IkiWiki::preprocess`, the last capturing group in the regex used to parse di
     index 241a7c0..d2c35a2 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -1167,7 +1167,8 @@ sub preprocess ($$$;$$) { #{{{
+    @@ -1167,7 +1167,8 @@ sub preprocess ($$$;$$) {
                     }sx;
             }
      
@@ -14,6 +14,6 @@ In `IkiWiki::preprocess`, the last capturing group in the regex used to parse di
     +       # $4 can be undef if the directive was \[[!foo]]
     +       $content =~ s{$regex}{$handle->($1, $2, $3, ($4 or ""))}eg;
             return $content;
-     } #}}}
+     }
  
 [[cherry-picked|done]] --[[Joey]]
diff --git a/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn b/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
index aa13ec339..b7f38fd29 100644
--- a/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
+++ b/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
@@ -3,7 +3,7 @@ When using monotone as revision control system, a "mtn: operation canceled: Brok
     diff -up ikiwiki/IkiWiki/Plugin/monotone.pm.orig ikiwiki/IkiWiki/Plugin/monotone.pm
     --- ikiwiki/IkiWiki/Plugin/monotone.pm.orig	2008-11-12 23:45:24.000000000 +0100
     +++ ikiwiki/IkiWiki/Plugin/monotone.pm	2008-12-16 12:41:38.000000000 +0100
-    @@ -525,13 +525,12 @@ sub rcs_recentchanges ($) { #{{{
+    @@ -525,13 +525,12 @@ sub rcs_recentchanges ($) {
      	my $child = open(MTNLOG, "-|");
      	if (! $child) {
      		exec("mtn", "log", "--root=$config{mtnrootdir}", "--no-graph",
diff --git a/doc/bugs/git_stderr_output_causes_problems.mdwn b/doc/bugs/git_stderr_output_causes_problems.mdwn
index 4146a5869..c25ef6927 100644
--- a/doc/bugs/git_stderr_output_causes_problems.mdwn
+++ b/doc/bugs/git_stderr_output_causes_problems.mdwn
@@ -6,7 +6,7 @@ Ikiwiki's git handling is sending a bunch of output to stderr.  The following pa
     index 425536f..5734bb2 100644
     --- a/IkiWiki/Rcs/git.pm
     +++ b/IkiWiki/Rcs/git.pm
-    @@ -24,6 +24,7 @@ sub _safe_git (&@) { #{{{
+    @@ -24,6 +24,7 @@ sub _safe_git (&@) {
             if (!$pid) {
                     # In child.
                     # Git commands want to be in wc.
diff --git a/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn b/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
index 2e67d6357..f72ecade2 100644
--- a/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
+++ b/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
@@ -26,7 +26,7 @@ And here's a patch to implement it. Will this survive markdown munging? It seems
     index 7226231..3eb1ae7 100644
     --- a/Plugin/img.pm
     +++ b/Plugin/img.pm
-    @@ -93,9 +93,15 @@ sub preprocess (@) { #{{{
+    @@ -93,9 +93,15 @@ sub preprocess (@) {
                     $imgurl="$config{url}/$imglink";
             }
      
@@ -42,7 +42,7 @@ And here's a patch to implement it. Will this survive markdown munging? It seems
     +        $result .= '/></a>';
     +
     +        return $result;
-     } #}}}
+     }
      
      1
     -- 
diff --git a/doc/bugs/inline_sort-by-title_issues.mdwn b/doc/bugs/inline_sort-by-title_issues.mdwn
index 884846b32..ff4555067 100644
--- a/doc/bugs/inline_sort-by-title_issues.mdwn
+++ b/doc/bugs/inline_sort-by-title_issues.mdwn
@@ -23,7 +23,7 @@ And here is a [[patch]] for this.  It makes `sort=title` actually sort on the ti
     index 9c336e7..99f6de3 100644
     --- a/IkiWiki/Plugin/inline.pm
     +++ b/IkiWiki/Plugin/inline.pm
-    @@ -185,9 +185,12 @@ sub preprocess_inline (@) { #{{{
+    @@ -185,9 +185,12 @@ sub preprocess_inline (@) {
      		}
      	}
      
diff --git a/doc/bugs/mercurial_fail_to_add.mdwn b/doc/bugs/mercurial_fail_to_add.mdwn
index dab40d684..3bbf4e5fd 100644
--- a/doc/bugs/mercurial_fail_to_add.mdwn
+++ b/doc/bugs/mercurial_fail_to_add.mdwn
@@ -6,7 +6,7 @@ Here is a patch that's seems to work, although I'm not quite sure what's wrong w
     --- mercurial.pm        2007-03-24 16:14:35.000000000 +0100
     +++ /home/hbernard/mercurial.pm 2007-04-19 19:05:47.000000000 +0200
     @@ -95,7 +95,7 @@
-     sub rcs_add ($) { # {{{
+     sub rcs_add ($) {
             my ($file) = @_;
      
     -       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$file");
diff --git a/doc/bugs/methodResponse_in_add__95__plugins.mdwn b/doc/bugs/methodResponse_in_add__95__plugins.mdwn
index 8a88f4eda..c82b532db 100644
--- a/doc/bugs/methodResponse_in_add__95__plugins.mdwn
+++ b/doc/bugs/methodResponse_in_add__95__plugins.mdwn
@@ -26,7 +26,7 @@
     index e476521..d43abd4 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -471,7 +471,11 @@ sub loadplugins () { #{{{
+    @@ -471,7 +471,11 @@ sub loadplugins () {
                     unshift @INC, possibly_foolish_untaint($config{libdir});
             }
      
diff --git a/doc/bugs/multiple_pages_with_same_name.mdwn b/doc/bugs/multiple_pages_with_same_name.mdwn
index 5ddfb1f6b..20c38c062 100644
--- a/doc/bugs/multiple_pages_with_same_name.mdwn
+++ b/doc/bugs/multiple_pages_with_same_name.mdwn
@@ -28,14 +28,14 @@ Suggestions welcome.
     index 4e4da11..853f905 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -618,7 +618,7 @@ sub pagename ($) { #{{{
+    @@ -618,7 +618,7 @@ sub pagename ($) {
      
      	my $type=pagetype($file);
      	my $page=$file;
     -	$page=~s/\Q.$type\E*$// if defined $type;
     +	$page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{leavesuffix};
      	return $page;
-     } #}}}
+     }
      
     diff --git a/t/pagename.t b/t/pagename.t
     index 96e6a87..58811b9 100755
@@ -61,7 +61,7 @@ I wonder if this patch will also be useful:
     index 752d176..3f1b67b 100644
     --- a/IkiWiki/Render.pm
     +++ b/IkiWiki/Render.pm
-    @@ -279,7 +279,11 @@ sub refresh () { #{{{
+    @@ -279,7 +279,11 @@ sub refresh () {
      				else {
      					$f=~s/^\Q$config{srcdir}\E\/?//;
      					push @files, $f;
diff --git a/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn b/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn
index a2eba694c..78fed0e5d 100644
--- a/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn
+++ b/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn
@@ -54,7 +54,7 @@ case the user is given to rebuilding the wiki by hand. --Ethan
 +	}
  	return IkiWiki::FailReason->new("syntax error") if $@;
  	return $ret;
- } #}}}
+ }
 </pre>
 
 > Thanks, [[done]] --[[Joey]]
diff --git a/doc/bugs/prune_causing_taint_mode_failures.mdwn b/doc/bugs/prune_causing_taint_mode_failures.mdwn
index 1876d9129..5fc1d8b75 100644
--- a/doc/bugs/prune_causing_taint_mode_failures.mdwn
+++ b/doc/bugs/prune_causing_taint_mode_failures.mdwn
@@ -11,7 +11,7 @@ I've no idea what's happening (hey, I'm a C programmer), but I've hacked prune()
 <pre>
 use Scalar::Util qw(tainted);
 
-sub prune ($) { #{{{
+sub prune ($) {
         my $file=shift;
 
         unlink($file);
@@ -25,7 +25,7 @@ sub prune ($) { #{{{
                         $dir = $1;
                 }
         }
-} #}}}
+}
 </pre>
 
 > Old versions of perl are known to have bugs with taint checking.
diff --git a/doc/bugs/quieten_mercurial.mdwn b/doc/bugs/quieten_mercurial.mdwn
index 26f833e5f..3fd75ea1b 100644
--- a/doc/bugs/quieten_mercurial.mdwn
+++ b/doc/bugs/quieten_mercurial.mdwn
@@ -6,7 +6,7 @@ messages which are then taken for CGI output, causing errors and general trouble
     @@ -55,7 +55,7 @@
      }
  
-     sub rcs_update () { #{{{
+     sub rcs_update () {
     -	my @cmdline = ("hg", "-R", "$config{srcdir}", "update");
     +	my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "update");
      	if (system(@cmdline) != 0) {
@@ -22,7 +22,7 @@ messages which are then taken for CGI output, causing errors and general trouble
      	if (system(@cmdline) != 0) {
      		warn "'@cmdline' failed: $!";
     @@ -92,7 +92,7 @@
-     sub rcs_add ($) { # {{{
+     sub rcs_add ($) {
      	my ($file) = @_;
      
     -	my @cmdline = ("hg", "-R", "$config{srcdir}", "add", "$file");
diff --git a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
index 0a2b1efea..dace2ca19 100644
--- a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
+++ b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
@@ -2,7 +2,7 @@ It seems like gettext only searches for locale information in /usr/share/locale,
 
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -1057,6 +1057,7 @@ sub gettext { #{{{
+    @@ -1057,6 +1057,7 @@ sub gettext {
                                     $gettext_obj=undef;
                                     return shift;
                             }
diff --git a/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn b/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn
index ac895896a..db3917d21 100644
--- a/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn
+++ b/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn
@@ -25,12 +25,12 @@ After some digging I found that HTML::Template is being required after the new s
                     filter => sub {
                             my $text_ref = shift;
     @@ -857,6 +856,7 @@
-     } #}}}
+     }
 
-     sub template ($;@) { #{{{
+     sub template ($;@) {
     +       require HTML::Template;
             HTML::Template->new(template_params(@_));
-     } #}}}
+     }
 
 **That** gave me:
 
diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn
index ef2fa122a..c80cc0b49 100644
--- a/doc/plugins/contrib/headinganchors.mdwn
+++ b/doc/plugins/contrib/headinganchors.mdwn
@@ -12,9 +12,9 @@ rst and any other format that produces html. The code is available here:
 	use strict;
 	use IkiWiki 2.00;
 
-	sub import { #{{{
+	sub import {
 	        hook(type => "sanitize", id => "headinganchors", call => \&headinganchors);
-	} # }}}
+	}
 
 	sub text_to_anchor {
 	        my $str = shift;
@@ -26,11 +26,11 @@ rst and any other format that produces html. The code is available here:
 	        return $str;
 	}
 
-	sub headinganchors (@) { #{{{
+	sub headinganchors (@) {
 	        my %params=@_;
 	        my $content=$params{content};
 	        $content=~s{<h([0-9])>([^>]*)</h([0-9])>}{'<h'.$1.' id="'.text_to_anchor($2).'">'.$2.'</h'.$3.'>'}gie;
 	        return $content;
-	} # }}}
+	}
 
 	1
diff --git a/doc/plugins/contrib/siterel2pagerel.mdwn b/doc/plugins/contrib/siterel2pagerel.mdwn
index 956b6728f..9b09657bf 100644
--- a/doc/plugins/contrib/siterel2pagerel.mdwn
+++ b/doc/plugins/contrib/siterel2pagerel.mdwn
@@ -13,11 +13,11 @@ other format that produces html. The code is available here:
 	use strict;
 	use IkiWiki 2.00;
 
-	sub import { #{{{
+	sub import {
 	        hook(type => "sanitize", id => "siterel2pagerel", call => \&siterel2pagerel);
-	} # }}}
+	}
 
-	sub siterel2pagerel (@) { #{{{
+	sub siterel2pagerel (@) {
 	        my %params=@_;
 	        my $baseurl=IkiWiki::baseurl($params{page});
 	        my $content=$params{content};
@@ -25,6 +25,6 @@ other format that produces html. The code is available here:
 	        $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"\/([^"]*)"/$1 src="$baseurl$2"/mig;
 	        # FIXME: do <script and everything else that can have URLs in it
 	        return $content;
-	} # }}}
+	}
 
 	1
diff --git a/doc/plugins/contrib/unixauth.mdwn b/doc/plugins/contrib/unixauth.mdwn
index d91ed45f1..76a847744 100644
--- a/doc/plugins/contrib/unixauth.mdwn
+++ b/doc/plugins/contrib/unixauth.mdwn
@@ -22,7 +22,7 @@ __Security__: [As with passwordauth](/security/#index14h2), be wary of sending u
 
     --- Wrapper.pm.orig 2008-07-29 00:09:10.000000000 -0400
     +++ Wrapper.pm
-    @@ -28,7 +28,7 @@ sub gen_wrapper () { #{{{
+    @@ -28,7 +28,7 @@ sub gen_wrapper () {
         my @envsave;
         push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                        CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
@@ -46,16 +46,16 @@ __Security__: [As with passwordauth](/security/#index14h2), be wary of sending u
     use strict;
     use IkiWiki 2.00;
     
-    sub import { #{{{
+    sub import {
         hook(type => "getsetup", id => "unixauth", call => \&getsetup);
             hook(type => "formbuilder_setup", id => "unixauth",
                 call => \&formbuilder_setup);
             hook(type => "formbuilder", id => "unixauth",
                 call => \&formbuilder);
         hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
-    } # }}}
+    }
     
-    sub getsetup () { #{{{
+    sub getsetup () {
         return
         unixauth_type => {
                 type => "string",
@@ -83,10 +83,10 @@ __Security__: [As with passwordauth](/security/#index14h2), be wary of sending u
                 safe => 0,
                 rebuild => 1,
         },
-    } #}}}
+    }
     
     # Checks if a string matches a user's password, and returns true or false.
-    sub checkpassword ($$;$) { #{{{
+    sub checkpassword ($$;$) {
         my $user=shift;
         my $password=shift;
         my $field=shift || "password";
@@ -131,9 +131,9 @@ __Security__: [As with passwordauth](/security/#index14h2), be wary of sending u
         }
     
         return $ret;
-    } #}}}
+    }
     
-    sub formbuilder_setup (@) { #{{{
+    sub formbuilder_setup (@) {
         my %params=@_;
     
         my $form=$params{form};
@@ -204,7 +204,7 @@ __Security__: [As with passwordauth](/security/#index14h2), be wary of sending u
         }
     }
     
-    sub formbuilder (@) { #{{{
+    sub formbuilder (@) {
         my %params=@_;
     
         my $form=$params{form};
@@ -225,12 +225,12 @@ __Security__: [As with passwordauth](/security/#index14h2), be wary of sending u
                         my $user_name=$form->field('name');
                 }
         }
-    } #}}}
+    }
     
-    sub sessioncgi ($$) { #{{{
+    sub sessioncgi ($$) {
         my $q=shift;
         my $session=shift;
-    } #}}}
+    }
     
     1
 
diff --git a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
index c908f57c8..8ecdf36d0 100644
--- a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
+++ b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
@@ -44,7 +44,7 @@ regenerate this one against that).
 			  %config %links %renderedfiles %pagesources %destsources);
 	 our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
 	 our $version="2.1";my $installdir="/usr";
-	@@ -70,6 +70,7 @@ sub defaultconfig () { #{{{
+	@@ -70,6 +70,7 @@ sub defaultconfig () {
 		plugin => [qw{mdwn inline htmlscrubber passwordauth openid signinedit
 			      lockedit conditional}],
 		timeformat => '%c',
@@ -52,27 +52,27 @@ regenerate this one against that).
 		locale => undef,
 		sslcookie => 0,
 		httpauth => 0,
-	@@ -447,6 +448,15 @@ sub displaytime ($) { #{{{
+	@@ -447,6 +448,15 @@ sub displaytime ($) {
 				$config{timeformat}, localtime($time)));
-	 } #}}}
+	 }
 
-	+sub displaydate ($) { #{{{
+	+sub displaydate ($) {
 	+	my $time=shift;
 	+
 	+	# strftime doesn't know about encodings, so make sure
 	+	# its output is properly treated as utf8
 	+	return decode_utf8(POSIX::strftime(
 	+			$config{dateformat}, localtime($time)));
-	+} #}}}
+	+}
 	+
-	 sub beautify_url ($) { #{{{
+	 sub beautify_url ($) {
 		my $url=shift;
 
 	diff --git a/Plugin/inline.pm b/Plugin/inline.pm
 	index 8f6ab51..7bd6147 100644
 	--- a/Plugin/inline.pm
 	+++ b/Plugin/inline.pm
-	@@ -148,6 +148,7 @@ sub preprocess_inline (@) { #{{{
+	@@ -148,6 +148,7 @@ sub preprocess_inline (@) {
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}));
diff --git a/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn b/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn
index 222cd8c46..6b9fa0535 100644
--- a/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn
+++ b/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn
@@ -12,7 +12,7 @@ This patch allows IkiWiki to work with either of the two:
 
     --- IkiWiki/Plugin/mdwn.pm.orig	2008-03-08 11:33:50.000000000 +0100
     +++ IkiWiki/Plugin/mdwn.pm	2008-03-08 13:37:21.000000000 +0100
-    @@ -28,14 +28,20 @@ sub htmlize (@) { #{{{
+    @@ -28,14 +28,20 @@ sub htmlize (@) {
      			$markdown_sub=\&Markdown::Markdown;
      		}
      		else {
diff --git a/doc/todo/Allow_change_of_wiki_file_types.mdwn b/doc/todo/Allow_change_of_wiki_file_types.mdwn
index 8a398f2e0..19574b175 100644
--- a/doc/todo/Allow_change_of_wiki_file_types.mdwn
+++ b/doc/todo/Allow_change_of_wiki_file_types.mdwn
@@ -12,7 +12,7 @@ I was hoping that the [[plugins/rename]] plugin would allow web uses to change t
     index 527ee88..123b772 100644
     --- a/IkiWiki/Plugin/rename.pm
     +++ b/IkiWiki/Plugin/rename.pm
-    @@ -43,7 +43,7 @@ sub check_canrename ($$$$$$$) { #{{{
+    @@ -43,7 +43,7 @@ sub check_canrename ($$$$$$$) {
      	
      	# Dest checks can be omitted by passing undef.
      	if (defined $dest) {
@@ -21,7 +21,7 @@ I was hoping that the [[plugins/rename]] plugin would allow web uses to change t
      			error(gettext("no change to the file name was specified"));
      		}
      
-    @@ -54,7 +54,7 @@ sub check_canrename ($$$$$$$) { #{{{
+    @@ -54,7 +54,7 @@ sub check_canrename ($$$$$$$) {
      		}
      
      		# Must not be a known source file.
@@ -30,7 +30,7 @@ I was hoping that the [[plugins/rename]] plugin would allow web uses to change t
      			error(sprintf(gettext("%s already exists"),
      				htmllink("", "", $dest, noimageinline => 1)));
      		}
-    @@ -97,6 +97,24 @@ sub rename_form ($$$) { #{{{
+    @@ -97,6 +97,24 @@ sub rename_form ($$$) {
      	$f->field(name => "do", type => "hidden", value => "rename", force => 1);
      	$f->field(name => "page", type => "hidden", value => $page, force => 1);
      	$f->field(name => "new_name", value => IkiWiki::pagetitle($page), size => 60);
@@ -55,7 +55,7 @@ I was hoping that the [[plugins/rename]] plugin would allow web uses to change t
      	$f->field(name => "attachment", type => "hidden");
      
      	return $f, ["Rename", "Cancel"];
-    @@ -223,12 +241,19 @@ sub sessioncgi ($$) { #{{{
+    @@ -223,12 +241,19 @@ sub sessioncgi ($$) {
      			my $dest=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($q->param("new_name")));
      
      			# The extension of dest is the same as src if it's
diff --git a/doc/todo/Allow_edittemplate_to_set_file_type.mdwn b/doc/todo/Allow_edittemplate_to_set_file_type.mdwn
index b49968c18..1b99a4e05 100644
--- a/doc/todo/Allow_edittemplate_to_set_file_type.mdwn
+++ b/doc/todo/Allow_edittemplate_to_set_file_type.mdwn
@@ -14,7 +14,7 @@ edittemplate there. --[[Joey]]
     index 98308de..c381940 100644
     --- a/IkiWiki/Plugin/edittemplate.pm
     +++ b/IkiWiki/Plugin/edittemplate.pm
-    @@ -56,8 +56,14 @@ sub preprocess (@) { #{{{
+    @@ -56,8 +56,14 @@ sub preprocess (@) {
      
      	$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
      
@@ -28,10 +28,10 @@ edittemplate there. --[[Joey]]
     +
     +	return sprintf(gettext("edittemplate: %s registered for %s"),
     +		$linkHTML, $params{match});
-     } # }}}
+     }
      
-     sub formbuilder (@) { #{{{
-    @@ -89,6 +95,9 @@ sub formbuilder (@) { #{{{
+     sub formbuilder (@) {
+    @@ -89,6 +95,9 @@ sub formbuilder (@) {
      					if (pagespec_match($p, $pagespec, location => $registering_page)) {
      						$form->field(name => "editcontent",
      							 value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
diff --git a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
index 73157a326..95c38f794 100644
--- a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
+++ b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
@@ -8,9 +8,9 @@ This patch adds function bestdir() which returns best directory from the directo
     +++ IkiWiki.pm  (working copy)
     @@ -391,6 +391,35 @@
             return "";
-     } #}}}
+     }
     
-    +sub bestdir ($$) { #{{{
+    +sub bestdir ($$) {
     +    my $page=shift;
     +       my $link=shift;
     +       my $cwd=$page;
@@ -37,9 +37,9 @@ This patch adds function bestdir() which returns best directory from the directo
     +       }
     +
     +       return "";
-    +} #}}}
+    +}
     +
-     sub isinlinableimage ($) { #{{{
+     sub isinlinableimage ($) {
             my $file=shift;
     
 ---- 
diff --git a/doc/todo/Default_text_for_new_pages.mdwn b/doc/todo/Default_text_for_new_pages.mdwn
index 4a17bbf8b..a904f8287 100644
--- a/doc/todo/Default_text_for_new_pages.mdwn
+++ b/doc/todo/Default_text_for_new_pages.mdwn
@@ -15,7 +15,7 @@ Inline below is a [[patch]] that implements this:
     index bb21ed2..10c985c 100644
     --- a/IkiWiki/Plugin/editpage.pm
     +++ b/IkiWiki/Plugin/editpage.pm
-    @@ -60,7 +60,7 @@ sub cgi_editpage ($$) { #{{{
+    @@ -60,7 +60,7 @@ sub cgi_editpage ($$) {
      
      	decode_cgi_utf8($q);
      
@@ -24,7 +24,7 @@ Inline below is a [[patch]] that implements this:
      	my @buttons=("Save Page", "Preview", "Cancel");
      	eval q{use CGI::FormBuilder};
      	error($@) if $@;
-    @@ -117,9 +117,20 @@ sub cgi_editpage ($$) { #{{{
+    @@ -117,9 +117,20 @@ sub cgi_editpage ($$) {
      	}
      	else {
      		$type=$form->param('type');
@@ -45,7 +45,7 @@ Inline below is a [[patch]] that implements this:
      		elsif (defined $from && exists $pagesources{$from}) {
      			# favor the type of linking page
      			$type=pagetype($pagesources{$from});
-    @@ -129,7 +140,7 @@ sub cgi_editpage ($$) { #{{{
+    @@ -129,7 +140,7 @@ sub cgi_editpage ($$) {
      		if (! $form->submitted) {
      			$form->field(name => "rcsinfo", value => "", force => 1);
      		}
@@ -58,7 +58,7 @@ Inline below is a [[patch]] that implements this:
     index 8efef3f..075d7d8 100644
     --- a/IkiWiki/Plugin/inline.pm
     +++ b/IkiWiki/Plugin/inline.pm
-    @@ -271,6 +271,7 @@ sub preprocess_inline (@) { #{{{
+    @@ -271,6 +271,7 @@ sub preprocess_inline (@) {
      			$rootpage=$params{page};
      		}
      		$formtemplate->param(rootpage => $rootpage);
diff --git a/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn b/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn
index a644e236b..c71250b3a 100644
--- a/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn
+++ b/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn
@@ -94,7 +94,7 @@ most possible of these pages.
 >        index a6e34fc..bb9dd8d 100644
 >        --- a/IkiWiki/Plugin/template.pm
 >        +++ b/IkiWiki/Plugin/template.pm
->        @@ -57,6 +57,8 @@ sub preprocess (@) { #{{{
+>        @@ -57,6 +57,8 @@ sub preprocess (@) {
 >                       }
 >               }
 >        
diff --git a/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn b/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn
index 9f52a724a..691694009 100644
--- a/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn
+++ b/doc/todo/Inline_plugin_option_to_show_full_page_path.mdwn
@@ -19,7 +19,7 @@ Cheers,
 	index 59eabb6..82913ba 100644
 	--- a/IkiWiki/Plugin/inline.pm
 	+++ b/IkiWiki/Plugin/inline.pm
-	@@ -229,6 +229,7 @@ sub preprocess_inline (@) { #{{{
+	@@ -229,6 +229,7 @@ sub preprocess_inline (@) {
 	 					$template->param(content => $content);
 	 				}
 	 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
diff --git a/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn b/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn
index d94d24ee4..3cedd5ae3 100644
--- a/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn
+++ b/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn
@@ -71,10 +71,10 @@ Happy TeXing.
     +
     +my $default_postfix = '\\end{document}';
     +
-     sub import { #{{{
+     sub import {
      	hook(type => "getsetup", id => "teximg", call => \&getsetup);
      	hook(type => "preprocess", id => "teximg", call => \&preprocess);
-    @@ -21,6 +33,26 @@ sub getsetup () { #{{{
+    @@ -21,6 +33,26 @@ sub getsetup () {
      			safe => 1,
      			rebuild => undef,
      		},
@@ -98,10 +98,10 @@ Happy TeXing.
     +			safe => 0, # Not sure how secure LaTeX is...
     +			rebuild => 1,
     +		},
-     } #}}}
+     }
      
-     sub preprocess (@) { #{{{
-    @@ -105,25 +137,35 @@ sub gen_image ($$$$) { #{{{
+     sub preprocess (@) {
+    @@ -105,25 +137,35 @@ sub gen_image ($$$$) {
      	my $digest = shift;
      	my $imagedir = shift;
      
diff --git a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
index a26433919..89167c084 100644
--- a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
+++ b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
@@ -42,13 +42,13 @@ Longer term plans:
 		 my %cache;
 		 my %linkcache;
 		@@ -32,6 +34,7 @@
-		 sub import { #{{{
+		 sub import {
 			hook(type => "needsbuild", id => "version", call => \&needsbuild);
 			hook(type => "preprocess", id => "calendar", call => \&preprocess);
 		+	hook(type => "preprocess", id => "event", call => \&preprocess_event);
-		 } #}}}
+		 }
 		 
-		 sub is_leap_year (@) { #{{{
+		 sub is_leap_year (@) {
 		@@ -58,6 +61,7 @@
 			my $nmonth   = $params{nmonth};
 			my $pyear    = $params{pyear};
@@ -137,9 +137,9 @@ Longer term plans:
 			# finish off the week
 		@@ -304,6 +333,18 @@
 			return $calendar;
-		 } #}}}
+		 }
 		 
-		+sub preprocess_event (@) { #{{{
+		+sub preprocess_event (@) {
 		+	my %params=@_;
 		+	# if now time is given, use now
 		+	$params{begin} = localtime($time)            unless defined $params{begin};
@@ -151,7 +151,7 @@ Longer term plans:
 		+	return "<!-- $params{begin} -->";
 		+} #}}
 		+
-		 sub preprocess (@) { #{{{
+		 sub preprocess (@) {
 			my %params=@_;
 			$params{pages} = "*"            unless defined $params{pages};
 		@@ -311,6 +352,8 @@
diff --git a/doc/todo/Silence_monotone_warning.mdwn b/doc/todo/Silence_monotone_warning.mdwn
index e3f0224c2..d875900c5 100644
--- a/doc/todo/Silence_monotone_warning.mdwn
+++ b/doc/todo/Silence_monotone_warning.mdwn
@@ -4,7 +4,7 @@ A quick [[patch]] to silence a [[rcs/monotone]] warning I started seeing:
     index 4b9be31..9d4e280 100644
     --- a/IkiWiki/Plugin/monotone.pm
     +++ b/IkiWiki/Plugin/monotone.pm
-    @@ -55,7 +55,7 @@ sub checkconfig () { #{{{
+    @@ -55,7 +55,7 @@ sub checkconfig () {
      		error("Monotone version too old, is $version but required 0.38");
      	}
      
diff --git a/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn b/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn
index 2837634d9..8320f72a6 100644
--- a/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn
+++ b/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn
@@ -20,7 +20,7 @@ That doesn't work in ikiwiki 2.1, but I have it
 	index 38aa46a..cd42e8d 100644
 	--- a/IkiWiki.pm
 	+++ b/IkiWiki.pm
-	@@ -1082,10 +1082,15 @@ sub match_link ($$;@) { #{{{
+	@@ -1082,10 +1082,15 @@ sub match_link ($$;@) {
 	 	my $links = $IkiWiki::links{$page} or return undef;
 	 	return IkiWiki::FailReason->new("$page has no links") unless @$links;
 	 	my $bestlink = IkiWiki::bestlink($from, $link);
@@ -38,7 +38,7 @@ That doesn't work in ikiwiki 2.1, but I have it
 	+		}
 	 	}
 	 	return IkiWiki::FailReason->new("$page does not link to $link");
-	 } #}}}
+	 }
 	-- 
 	1.5.1.1.g6aead
 
diff --git a/doc/todo/Wrapper_config_with_multiline_regexp.mdwn b/doc/todo/Wrapper_config_with_multiline_regexp.mdwn
index c0311bc92..7b4323de1 100644
--- a/doc/todo/Wrapper_config_with_multiline_regexp.mdwn
+++ b/doc/todo/Wrapper_config_with_multiline_regexp.mdwn
@@ -13,12 +13,12 @@ Second, the untainting of $configstring should allow newlines.
     +++ wiki-meta/perl/IkiWiki.pm Mon Jun 11 10:52:07 2007
     @@ -205,7 +205,7 @@
      
-     sub possibly_foolish_untaint ($) { #{{{
+     sub possibly_foolish_untaint ($) {
       my $tainted=shift;
     - my ($untainted)=$tainted=~/(.*)/;
     + my ($untainted)=$tainted=~/(.*)/s;
       return $untainted;
-     } #}}}
+     }
      
     
     Modified: wiki-meta/perl/IkiWiki/Wrapper.pm
diff --git a/doc/todo/add_forward_age_sorting_option_to_inline.mdwn b/doc/todo/add_forward_age_sorting_option_to_inline.mdwn
index 684419f90..e91c5a42f 100644
--- a/doc/todo/add_forward_age_sorting_option_to_inline.mdwn
+++ b/doc/todo/add_forward_age_sorting_option_to_inline.mdwn
@@ -19,7 +19,7 @@ diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
 index d2e5832..9e52712 100644
 --- a/IkiWiki/Plugin/inline.pm
 +++ b/IkiWiki/Plugin/inline.pm
-@@ -194,6 +194,9 @@ sub preprocess_inline (@) { #{{{
+@@ -194,6 +194,9 @@ sub preprocess_inline (@) {
         elsif (! exists $params{sort} || $params{sort} eq 'age') {
                 @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
         }
diff --git a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
index 467ec350e..dc6c0001e 100644
--- a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
+++ b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
@@ -17,13 +17,13 @@ Updated to use fix noted in [[bugs/multiple_pages_with_same_name]].
     
     my %metaheaders;
     
-    sub import { #{{{
+    sub import {
     	hook(type => "getsetup", id => "sourcecode", call => \&getsetup);
     	hook(type => "checkconfig", id => "sourcecode", call => \&checkconfig);
     	hook(type => "pagetemplate", id => "sourcecode", call => \&pagetemplate);
-    } # }}}
+    }
     
-    sub getsetup () { #{{{
+    sub getsetup () {
     	return 
     		plugin => {
     			safe => 1,
@@ -57,9 +57,9 @@ Updated to use fix noted in [[bugs/multiple_pages_with_same_name]].
     			safe => 1,
     			rebuild => 1,
     		},
-    } #}}}
+    }
     
-    sub checkconfig () { #{{{
+    sub checkconfig () {
     	if (! $config{sourcecode_lang}) {
     		error("The sourcecode plugin requires a list of suffixes in the 'sourcecode_lang' config option");
     	}
@@ -97,9 +97,9 @@ Updated to use fix noted in [[bugs/multiple_pages_with_same_name]].
     			error("Your installation of source-highlight cannot handle sourcecode language $lang!");
     		}
     	}
-    } #}}}
+    }
     
-    sub htmlize (@) { #{{{
+    sub htmlize (@) {
     	my %params=@_;
     
     	my $page = $params{page};
@@ -141,9 +141,9 @@ Updated to use fix noted in [[bugs/multiple_pages_with_same_name]].
     	}
     
     	return '<div id="sourcecode">'."\r\n".join("\r\n",@html)."\r\n</div>\n";
-    } # }}}
+    }
     
-    sub pagetemplate (@) { #{{{
+    sub pagetemplate (@) {
     	my %params=@_;
     
     	my $page=$params{page};
@@ -154,6 +154,6 @@ Updated to use fix noted in [[bugs/multiple_pages_with_same_name]].
     		my %seen;
     		$template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
     	}
-    } # }}}
+    }
     
     1
diff --git a/doc/todo/blogpost_plugin.mdwn b/doc/todo/blogpost_plugin.mdwn
index 60b1e2515..bb91ffd02 100644
--- a/doc/todo/blogpost_plugin.mdwn
+++ b/doc/todo/blogpost_plugin.mdwn
@@ -51,13 +51,13 @@ Index: IkiWiki/Plugin/blogpost.pm
 +use POSIX;
 +use IkiWiki 2.00;
 +
-+sub import { #{{{
++sub import {
 +	hook(type => "checkconfig", id => "blogpost", call => \&checkconfig);
 +	hook(type => "authcgi", id => "blogpost", call => \&authcgi);
 +	hook(type => "canedit", id => "blogpost", call => \&canedit);
-+} # }}}
++}
 +
-+sub checkconfig () { #{{{
++sub checkconfig () {
 +	if (! defined $config{blogformat}){
 +		$config{blogformat} = 'posts/%Y/%m/%d/$title';
 +	}
@@ -72,9 +72,9 @@ Index: IkiWiki/Plugin/blogpost.pm
 +	if (! defined $config{blogusers}) {
 +		$config{blogusers} = (); # disallow all posting by default
 +	}
-+} #}}}
++}
 +
-+sub authcgi ($$) { #{{{
++sub authcgi ($$) {
 +	my $cgi=shift;
 +	my $session=shift;
 +
@@ -115,16 +115,16 @@ Index: IkiWiki/Plugin/blogpost.pm
 +		$cgi->param("page", $page);
 +	}
 +
-+} #}}}
++}
 +
-+sub blogpage ($) { #{{{
++sub blogpage ($) {
 +	my $title=shift;
 +	my $page=POSIX::strftime $config{blogformat}, localtime;
 +	$page =~ s/\$title/$title/;
 +	return $page;
-+} #}}}
++}
 +
-+sub canedit ($$$) { #{{{
++sub canedit ($$$) {
 +	my $page=shift;
 +	my $cgi=shift;
 +	my $session=shift;
@@ -136,7 +136,7 @@ Index: IkiWiki/Plugin/blogpost.pm
 +	return "" if ($config{blogusers} eq "*" ||
 +		      grep {$_ eq $user} $config{blogusers});
 +	return ("not allowed to blog, $user");
-+} #}}}
++}
 +
 +1
 Index: IkiWiki.pm
diff --git a/doc/todo/bzr.mdwn b/doc/todo/bzr.mdwn
index 179ea2f24..a50c58d26 100644
--- a/doc/todo/bzr.mdwn
+++ b/doc/todo/bzr.mdwn
@@ -56,15 +56,15 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
             return @ret;
     }
     
-    sub rcs_update () { #{{{
+    sub rcs_update () {
             # Not needed.
-    } #}}}
+    }
     
-    sub rcs_prepedit ($) { #{{{
+    sub rcs_prepedit ($) {
             return "";
-    } #}}}
+    }
     
-    sub rcs_commit ($$$;$$) { #{{{
+    sub rcs_commit ($$$;$$) {
             my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
     
             if (defined $user) {
@@ -95,18 +95,18 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
             system("bzr","whoami",$olduser);
     
             return undef; # success
-    } #}}}
+    }
     
-    sub rcs_add ($) { # {{{
+    sub rcs_add ($) {
             my ($file) = @_;
     
             my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file");
             if (system(@cmdline) != 0) {
                     warn "'@cmdline' failed: $!";
             }
-    } #}}}
+    }
     
-    sub rcs_recentchanges ($) { #{{{
+    sub rcs_recentchanges ($) {
             my ($num) = @_;
     
             eval q{use CGI 'escapeHTML'};
@@ -153,15 +153,15 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
             }
     
             return @ret;
-    } #}}}
+    }
     
-    sub rcs_notify () { #{{{
+    sub rcs_notify () {
             # TODO
-    } #}}}
+    }
     
-    sub rcs_getctime ($) { #{{{
+    sub rcs_getctime ($) {
             # TODO
-    } #}}}
+    }
     
     1
 
diff --git a/doc/todo/cas_authentication.mdwn b/doc/todo/cas_authentication.mdwn
index c8ffe7005..8bf7042df 100644
--- a/doc/todo/cas_authentication.mdwn
+++ b/doc/todo/cas_authentication.mdwn
@@ -43,11 +43,11 @@ follows) ?
 > the use of it: `eval q{use AuthCAS}; error $@ if $@`
 
     +
-    +sub import { #{{{
+    +sub import {
     +    hook(type => "getopt", id => "cas", call => \&getopt);
     +    hook(type => "auth", id => "cas", call => \&auth);
     +    hook(type => "formbuilder_setup", id => "cas", call => \&formbuilder_setup);
-    +} # }}}
+    +}
 
 > Could you please use tabs for indentation of program flow?
 
@@ -61,15 +61,15 @@ follows) ?
 > Why would you want to make other auth plugins not work? Could a site not
 > legitimatly chose to use this and another auth method?
 
-    +sub getopt () { #{{{
+    +sub getopt () {
     +    eval q{use Getopt::Long};
     +    error($@) if $@;
     +    Getopt::Long::Configure('pass_through');
     +    GetOptions("cas_url=s" => \$config{cas_url});
     +    GetOptions("ca_file=s" => \$config{ca_file});
-    +} #}}}
+    +}
     +
-    +sub auth ($$) { #{{{
+    +sub auth ($$) {
     +    my $q=shift;
     +    my $session=shift;
     +
@@ -98,11 +98,11 @@ follows) ?
     +            error("CAS failure: ".&AuthCAS::get_errors());
     +        }
     +    }
-    +} #}}}
+    +}
     +
     +# I use formbuilder_setup and not formbuilder type in order to bypass the
     +# Logout processing done in IkiWiki::CGI::cgi_prefs()
-    +sub formbuilder_setup (@) { #{{{
+    +sub formbuilder_setup (@) {
     +    my %params=@_;
     +    
     +    my $form=$params{form};
diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn
index 69afe837d..19fba3b35 100644
--- a/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@ -132,12 +132,12 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
 	+use strict;
 	+use IkiWiki 2.00;
 	+
-	+sub import { #{{{
+	+sub import {
 	+	hook(type => "preprocess", id => "color", call => \&preprocess);
 	+	hook(type => "format",     id => "color", call => \&format);
-	+} #}}}
+	+}
 	+
-	+sub preserve_style ($$$) { #{{{
+	+sub preserve_style ($$$) {
 	+	my $foreground = shift;
 	+	my $background = shift;
 	+	my $text       = shift;
@@ -162,18 +162,18 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
 	+	
 	+	return $preserved;
 	+
-	+} #}}}
+	+}
 	+
-	+sub replace_preserved_style ($) { #{{{
+	+sub replace_preserved_style ($) {
 	+	my $content = shift;
 	+
 	+	$content =~ s!<span class="color">((color: ([a-z]+|\#[0-9a-f]{3,6})?)?((; )?(background-color: ([a-z]+|\#[0-9a-f]{3,6})?)?)?)</span>!<span class="color" style="$1">!g;
 	+	$content =~ s!<span class="colorend">!!g;
 	+
 	+	return $content;
-	+} #}}}
+	+}
 	+
-	+sub preprocess (@) { #{{{
+	+sub preprocess (@) {
 	+	my %params = @_;
 	+
 	+	# Preprocess the text to expand any preprocessor directives
@@ -182,14 +182,14 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
 	+				IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
 	+
 	+	return preserve_style($params{foreground}, $params{background}, $params{text});
-	+} #}}}
+	+}
 	+
-	+sub format (@) { #{{{
+	+sub format (@) {
 	+	my %params = @_;
 	+
 	+	$params{content} = replace_preserved_style($params{content});
 	+	return $params{content};	
-	+} #}}}
+	+}
 	+
 	+1
 	--- /dev/null	2008-06-21 02:02:15.000000000 +0200
diff --git a/doc/todo/darcs.mdwn b/doc/todo/darcs.mdwn
index e5bf5ee27..882a41379 100644
--- a/doc/todo/darcs.mdwn
+++ b/doc/todo/darcs.mdwn
@@ -219,14 +219,14 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
 	
 	package IkiWiki;
 	
-	sub rcs_update () { #{{{
+	sub rcs_update () {
 		# Do nothing - there's nowhere to update *from*.
-	} #}}}
+	}
 	
-	sub rcs_prepedit ($) { #{{{
-	} #}}}
+	sub rcs_prepedit ($) {
+	}
 	
-	sub rcs_commit ($$$;$$) { #{{{
+	sub rcs_commit ($$$;$$) {
 		my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 	
 		# $user should probably be a name and an email address, by darcs
@@ -257,16 +257,16 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
 	
 		return undef; # success
 		
-	sub rcs_add ($) { # {{{
+	sub rcs_add ($) {
 		my ($file) = @_;
 	
 		my @cmdline = ("darcs", "add", "--repodir", "$config{srcdir}", "-a", "-q", "$file");
 		if (system(@cmdline) != 0) {
 			warn "'@cmdline' failed: $!";
 		}
-	} #}}}
+	}
 	
-	sub rcs_recentchanges ($) { #{{{
+	sub rcs_recentchanges ($) {
 		# TODO: This is horrible code. It doesn't work perfectly, and uses regexes
 		# rather than parsing Darcs' XML output.
 		my $num=shift;
@@ -314,15 +314,15 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
 				}
 		}
 		return @ret;
-	} #}}}
+	}
 	
-	sub rcs_notify () { #{{{
+	sub rcs_notify () {
 		# TODO
-	} #}}}
+	}
 	
-	sub rcs_getctime ($) { #{{{
+	sub rcs_getctime ($) {
 		error gettext("getctime not implemented");
-	} #}}}
+	}
 	
 	1
 
diff --git a/doc/todo/datearchives-plugin.mdwn b/doc/todo/datearchives-plugin.mdwn
index 5a5560d6c..5f33cde4c 100644
--- a/doc/todo/datearchives-plugin.mdwn
+++ b/doc/todo/datearchives-plugin.mdwn
@@ -17,11 +17,11 @@ Index: IkiWiki/Plugin/datearchives.pm
 +use strict;
 +use IkiWiki;
 +
-+sub import { #{{{
++sub import {
 +    hook(type => "pagetemplate", id => "datearchives", call => \&pagetemplate, scan => 1);
-+} # }}}
++}
 +
-+sub pagetemplate (@) { #{{{
++sub pagetemplate (@) {
 +    my %args = @_;
 +    my $dt;
 +    eval {
@@ -37,7 +37,7 @@ Index: IkiWiki/Plugin/datearchives.pm
 +        $template->param(ctime => htmllink( $args{page}, $args{destpage}, $link, 0, 0,
 +                                            $template->param('ctime')));
 +       }
-+} # }}}
++}
 +
 +1
 </pre>
diff --git a/doc/todo/different_search_engine.mdwn b/doc/todo/different_search_engine.mdwn
index 2f309dea5..9d0fc92c9 100644
--- a/doc/todo/different_search_engine.mdwn
+++ b/doc/todo/different_search_engine.mdwn
@@ -126,7 +126,7 @@ Index: IkiWiki/Plugin/search.pm
 +  $PLUCENE_DIR = $config{wikistatedir}.'/plucene';  
 +}
 +
- sub import { #{{{
+ sub import {
 -       hook(type => "getopt", id => "hyperestraier",
 -               call => \&amp;getopt);
 -       hook(type => "checkconfig", id => "hyperestraier",
@@ -142,14 +142,14 @@ Index: IkiWiki/Plugin/search.pm
                 call => \&amp;change);
 -       hook(type => "cgi", id => "hyperestraier",
 -               call => \&amp;cgi);
- } # }}}
+ }
  
--sub getopt () { #{{{
+-sub getopt () {
 -        eval q{use Getopt::Long};
 -       error($@) if $@;
 -        Getopt::Long::Configure('pass_through');
 -        GetOptions("estseek=s" => \$config{estseek});
--} #}}}
+-}
  
 +sub writer {
 +  init();
@@ -165,20 +165,20 @@ Index: IkiWiki/Plugin/search.pm
 +    grep { defined pagetype($_) } @_;
 +}
 +
- sub checkconfig () { #{{{
+ sub checkconfig () {
         foreach my $required (qw(url cgiurl)) {
                 if (! length $config{$required}) {
 @@ -36,112 +58,55 @@
         }
- } #}}}
+ }
  
 -my $form;
--sub pagetemplate (@) { #{{{
+-sub pagetemplate (@) {
 -       my %params=@_;
 -       my $page=$params{page};
 -       my $template=$params{template};
 +#my $form;
-+#sub pagetemplate (@) { #{{{
++#sub pagetemplate (@) {
 +#      my %params=@_;
 +#      my $page=$params{page};
 +#      my $template=$params{template};
@@ -193,7 +193,7 @@ Index: IkiWiki/Plugin/search.pm
 +#
 +#              $template->param(searchform => $form);
 +#      }
-+#} #}}}
++#}
  
 -       # Add search box to page header.
 -       if ($template->query(name => "searchform")) {
@@ -205,9 +205,9 @@ Index: IkiWiki/Plugin/search.pm
 -
 -               $template->param(searchform => $form);
 -       }
--} #}}}
+-}
 -
- sub delete (@) { #{{{
+ sub delete (@) {
 -       debug(gettext("cleaning hyperestraier search index"));
 -       estcmd("purge -cl");
 -       estcfg();
@@ -219,9 +219,9 @@ Index: IkiWiki/Plugin/search.pm
 +    $reader->delete_term( Plucene::Index::Term->new({ field => "id", text => $_ }));
 +  }
 +  $reader->close;
- } #}}}
+ }
  
- sub change (@) { #{{{
+ sub change (@) {
 -       debug(gettext("updating hyperestraier search index"));
 -       estcmd("gather -cm -bc -cl -sd",
 -               map {
@@ -250,9 +250,9 @@ Index: IkiWiki/Plugin/search.pm
 +    $doc->add(Plucene::Document::Field->UnStored('text' => $data));
 +    $writer->add_document($doc);
 +  }
- } #}}}
+ }
 -
--sub cgi ($) { #{{{
+-sub cgi ($) {
 -       my $cgi=shift;
 -
 -       if (defined $cgi->param('phrase') || defined $cgi->param("navi")) {
@@ -260,10 +260,10 @@ Index: IkiWiki/Plugin/search.pm
 -               chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
 -               exec("./".IkiWiki::basename($config{cgiurl})) || error("estseek.cgi failed");
 -       }
--} #}}}
+-}
 -
 -my $configured=0;
--sub estcfg () { #{{{
+-sub estcfg () {
 -       return if $configured;
 -       $configured=1;
 -
@@ -301,9 +301,9 @@ Index: IkiWiki/Plugin/search.pm
 -       unlink($cgi);
 -       my $estseek = defined $config{estseek} ? $config{estseek} : '/usr/lib/estraier/estseek.cgi';
 -       symlink($estseek, $cgi) || error("symlink $estseek $cgi: $!");
--} # }}}
+-}
 -
--sub estcmd ($;@) { #{{{
+-sub estcmd ($;@) {
 -       my @params=split(' ', shift);
 -       push @params, "-cl", "$config{wikistatedir}/hyperestraier";
 -       if (@_) {
@@ -323,7 +323,7 @@ Index: IkiWiki/Plugin/search.pm
 -               open(STDOUT, "/dev/null"); # shut it up (closing won't work)
 -               exec("estcmd", @params) || error("can't run estcmd");
 -       }
--} #}}}
+-}
 -
 -1
 +1;
diff --git a/doc/todo/directive_docs.mdwn b/doc/todo/directive_docs.mdwn
index 1f6307381..2baa61b40 100644
--- a/doc/todo/directive_docs.mdwn
+++ b/doc/todo/directive_docs.mdwn
@@ -40,15 +40,15 @@ defined them:  --[[Joey]]
     index e476521..afe982a 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -493,6 +493,7 @@ sub loadplugins () { #{{{
+    @@ -493,6 +493,7 @@ sub loadplugins () {
      	return 1;
-     } #}}}
+     }
      
     +my $loading_plugin;
-     sub loadplugin ($) { #{{{
+     sub loadplugin ($) {
      	my $plugin=shift;
      
-    @@ -502,14 +503,18 @@ sub loadplugin ($) { #{{{
+    @@ -502,14 +503,18 @@ sub loadplugin ($) {
      	                 "$installdir/lib/ikiwiki") {
      		if (defined $dir && -x "$dir/plugins/$plugin") {
      			require IkiWiki::Plugin::external;
@@ -67,7 +67,7 @@ defined them:  --[[Joey]]
      	if ($@) {
      		error("Failed to load plugin $mod: $@");
      	}
-    @@ -1429,6 +1434,9 @@ sub hook (@) { # {{{
+    @@ -1429,6 +1434,9 @@ sub hook (@) {
      
      	return if $param{no_override} && exists $hooks{$param{type}}{$param{id}};
      	
@@ -76,4 +76,4 @@ defined them:  --[[Joey]]
     +
      	$hooks{$param{type}}{$param{id}}=\%param;
      	return 1;
-     } # }}}
+     }
diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index b3c174fba..e3b295123 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -5,7 +5,7 @@
     @@ -26,7 +26,7 @@
      memoize("file_pruned");
      
-     sub defaultconfig () { #{{{
+     sub defaultconfig () {
     -       wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./,
     +       wiki_file_prune_regexps => [qr/\.\./, qr/^\.(?!htaccess)/, qr/\/\.(?!htaccess)/,
                     qr/\.x?html?$/, qr/\.ikiwiki-new$/,
diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn
index 8dfe05581..574883d1b 100644
--- a/doc/todo/format_escape.mdwn
+++ b/doc/todo/format_escape.mdwn
@@ -141,13 +141,13 @@ Index: IkiWiki/Plugin/rst.pm
  print html[html.find('<body>')+6:html.find('</body>')].strip();
  ";
  
- sub import { #{{{
+ sub import {
  	hook(type => "htmlize", id => "rst", call => \&htmlize);
 +	hook(type => "htmlescape", id => "rst", call => \&htmlescape);
 +	hook(type => "htmlescapelink", id => "rst", call => \&htmlescapelink);
- } # }}}
+ }
  
-+sub htmlescapelink ($$;@) { #{{{
++sub htmlescapelink ($$;@) {
 +	my $url = shift;
 +	my $text = shift;
 +	my %params = @_;
@@ -158,15 +158,15 @@ Index: IkiWiki/Plugin/rst.pm
 +	else {
 +		return "`$text <$url>`_";
 +	}
-+} # }}}
++}
 +
-+sub htmlescape ($) { #{{{
++sub htmlescape ($) {
 +	my $html=shift;
 +	$html=~s/^/  /mg;
 +	return ".. raw:: html\n\n".$html;
-+} # }}}
++}
 +
- sub htmlize (@) { #{{{
+ sub htmlize (@) {
  	my %params=@_;
  	my $content=$params{content};
 Index: doc/plugins/write.mdwn
@@ -272,7 +272,7 @@ Index: IkiWiki.pm
 +	  return $hooks{htmlescapelink}{$type}{call}->($bestlink, $linktext);
 +	}
  	return "<a href=\"$bestlink\">$linktext</a>";
- } #}}}
+ }
  
 @@ -628,6 +640,14 @@
  				preview => $preprocess_preview,
diff --git a/doc/todo/fortune:_select_options_via_environment.mdwn b/doc/todo/fortune:_select_options_via_environment.mdwn
index f906312fe..ddacd91b5 100644
--- a/doc/todo/fortune:_select_options_via_environment.mdwn
+++ b/doc/todo/fortune:_select_options_via_environment.mdwn
@@ -14,9 +14,9 @@
      package IkiWiki::Plugin::fortune;
 
      use warnings;
-    @@ -12,7 +18,13 @@ sub import { #{{{
+    @@ -12,7 +18,13 @@ sub import {
 
-     sub preprocess (@) { #{{{
+     sub preprocess (@) {
             $ENV{PATH}="$ENV{PATH}:/usr/games:/usr/local/games";
     -       my $f = `fortune 2>/dev/null`;
     +       my $f;
diff --git a/doc/todo/index.html_allowed.mdwn b/doc/todo/index.html_allowed.mdwn
index f030f9eea..f5e6f8cd7 100644
--- a/doc/todo/index.html_allowed.mdwn
+++ b/doc/todo/index.html_allowed.mdwn
@@ -91,15 +91,15 @@ page "A/B/index.html" is treated as "A/B".
     +++ ikidev/IkiWiki.pm       2007-02-25 15:05:22.328852000 -0800
     @@ -192,6 +192,12 @@
         return $untainted;
-     } #}}}
+     }
 
-    +sub titlename($;@) { #{{{
+    +sub titlename($;@) {
     +   my $page = shift;
     +   $page =~ s!/index$!!;
     +   return pagetitle(basename($page), @_);
-    +} #}}}
+    +}
     +
-     sub basename ($) { #{{{
+     sub basename ($) {
         my $file=shift;
 
 
@@ -117,7 +117,7 @@ diff -ru ikiwiki-2.4/IkiWiki.pm ikiwiki/IkiWiki.pm
  	$page=~s/\Q.$type\E*$// if defined $type;
 +	$page=~s/\/index$// if $page =~ /\/index$/;
  	return $page;
- } #}}}
+ }
  
 </pre>
 
diff --git a/doc/todo/inline:_numerical_ordering_by_title.mdwn b/doc/todo/inline:_numerical_ordering_by_title.mdwn
index 95511d998..3f6c8b598 100644
--- a/doc/todo/inline:_numerical_ordering_by_title.mdwn
+++ b/doc/todo/inline:_numerical_ordering_by_title.mdwn
@@ -155,11 +155,11 @@ Joey, have you forgotten about that request? ;) --[[Paweł|ptecza]]
                       %config %links %pagestate %renderedfiles
                       %pagesources %destsources);
      our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
-    @@ -835,6 +835,42 @@ sub titlepage ($) { #{{{
+    @@ -835,6 +835,42 @@ sub titlepage ($) {
      	return $title;
-     } #}}}
+     }
      
-    +sub titlecmp ($$) { #{{{
+    +sub titlecmp ($$) {
     +	my $titleA=shift;
     +	my $titleB=shift;
     +	
@@ -193,29 +193,29 @@ Joey, have you forgotten about that request? ;) --[[Paweł|ptecza]]
     +	return -1 if (@listB);
     +	
     +	return 0;
-    +} #}}}
+    +}
     +
-     sub linkpage ($) { #{{{
+     sub linkpage ($) {
      	my $link=shift;
      	my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
     diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
     index 37752dd..ccaa399 100644
     --- a/IkiWiki/Plugin/brokenlinks.pm
     +++ b/IkiWiki/Plugin/brokenlinks.pm
-    @@ -59,7 +59,7 @@ sub preprocess (@) { #{{{
+    @@ -59,7 +59,7 @@ sub preprocess (@) {
      			map {
      				"<li>$_</li>"
      			}
     -			sort @broken)
     +			sort titlecmp @broken)
      		."</ul>\n";
-     } # }}}
+     }
      
     diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
     index 8efef3f..263e7a6 100644
     --- a/IkiWiki/Plugin/inline.pm
     +++ b/IkiWiki/Plugin/inline.pm
-    @@ -192,7 +192,7 @@ sub preprocess_inline (@) { #{{{
+    @@ -192,7 +192,7 @@ sub preprocess_inline (@) {
      	}
      
      	if (exists $params{sort} && $params{sort} eq 'title') {
@@ -228,20 +228,20 @@ Joey, have you forgotten about that request? ;) --[[Paweł|ptecza]]
     index b910758..10a1d87 100644
     --- a/IkiWiki/Plugin/orphans.pm
     +++ b/IkiWiki/Plugin/orphans.pm
-    @@ -56,7 +56,7 @@ sub preprocess (@) { #{{{
+    @@ -56,7 +56,7 @@ sub preprocess (@) {
      				htmllink($params{page}, $params{destpage}, $_,
      					 noimageinline => 1).
      				"</li>"
     -			} sort @orphans).
     +			} sort titlecmp @orphans).
      		"</ul>\n";
-     } # }}}
+     }
      
     diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
     index ceb7c84..00798e1 100644
     --- a/IkiWiki/Render.pm
     +++ b/IkiWiki/Render.pm
-    @@ -89,7 +89,7 @@ sub genpage ($$) { #{{{
+    @@ -89,7 +89,7 @@ sub genpage ($$) {
      		$template->param(have_actions => 1);
      	}
      
diff --git a/doc/todo/language_definition_for_the_meta_plugin.mdwn b/doc/todo/language_definition_for_the_meta_plugin.mdwn
index 33098c601..4ac4e2e25 100644
--- a/doc/todo/language_definition_for_the_meta_plugin.mdwn
+++ b/doc/todo/language_definition_for_the_meta_plugin.mdwn
@@ -54,7 +54,7 @@ This may be useful for sites with a few pages in different languages, but no ful
  my %authorurl;
 +my %lang;
  
- sub import { #{{{
+ sub import {
         hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
 @@ -100,6 +101,11 @@
                 $meta{$page}.='<link href="'.encode_entities($value).
@@ -75,7 +75,7 @@ This may be useful for sites with a few pages in different languages, but no ful
 +       $template->param(lang => $lang{$page})
 +               if exists $lang{$page} && $template->query(name => "lang");
  
- } # }}}
+ }
 </pre>
 
 > Please resolve lang somewhere reusable rather than within meta plugin: It is certainly usable outside
diff --git a/doc/todo/meta_rcsid.mdwn b/doc/todo/meta_rcsid.mdwn
index 81a2c1328..158edea6e 100644
--- a/doc/todo/meta_rcsid.mdwn
+++ b/doc/todo/meta_rcsid.mdwn
@@ -26,7 +26,7 @@ of CVS/SVN-style keywords (like '$Id$', etc.) from the source file in the page t
      my %copyright;
     +my %rcsid;
  
-     sub import { #{{{
+     sub import {
         hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
     @@ -110,6 +111,9 @@
             $meta{$page}.="<link rel=\"copyright\" href=\"#page_copyright\" />\n";
diff --git a/doc/todo/missingparents.pm.mdwn b/doc/todo/missingparents.pm.mdwn
index 0cc7137ba..c5f2ab535 100644
--- a/doc/todo/missingparents.pm.mdwn
+++ b/doc/todo/missingparents.pm.mdwn
@@ -82,15 +82,15 @@ Index: IkiWiki/Plugin/missingparents.pm
 +my %ownfiles;
 +my @pagespecs;
 +
-+sub import { #{{{
++sub import {
 +	hook(type => "checkconfig", id => "missingparents", call => \&checkconfig);
 +	hook(type => "needsdelete", id => "missingparents", call => \&needsdelete);
 +	hook(type => "needsbuild", id => "missingparents", call => \&needsbuild);
 +	hook(type => "savestate", id => "missingparents", call => \&savestate);
 +	hook(type => "preprocess", id => "missingparents", call => \&preprocess_missingparents);
-+} # }}}
++}
 +
-+sub checkconfig () { #{{{
++sub checkconfig () {
 +	IkiWiki::preprocess("missingparents", "missingparents",
 +		readfile(srcfile("missingparents.mdwn")));
 +	loadstate();
@@ -99,9 +99,9 @@ Index: IkiWiki/Plugin/missingparents.pm
 +			unlink $config{srcdir}.'/'.$file;
 +		}
 +	}
-+} #}}}
++}
 +
-+sub preprocess_missingparents (@) { #{{{
++sub preprocess_missingparents (@) {
 +	my %params=@_;
 +
 +	if (! defined $params{pages} || ! defined $params{generate}) {
@@ -115,10 +115,10 @@ Index: IkiWiki/Plugin/missingparents.pm
 +	#translators: is text for pages that match that pagespec.
 +	return sprintf(gettext("missingparents in %s will be %s"), 
 +		       '`'.$params{pages}.'`', '`\\'.$params{generate}.'`');
-+} # }}}
++}
 +
 +my $state_loaded=0;
-+sub loadstate() { #{{{
++sub loadstate() {
 +	my $filename = "$config{wikistatedir}/missingparents";
 +	if (-e $filename) {
 +		open (IN, $filename) ||
@@ -132,9 +132,9 @@ Index: IkiWiki/Plugin/missingparents.pm
 +
 +		$state_loaded=1;
 +	}
-+} #}}}
++}
 +
-+sub savestate() { #{{{
++sub savestate() {
 +	my $filename = "$config{wikistatedir}/missingparents.new";
 +	my $cleanup = sub { unlink ($filename) };
 +	open (OUT, ">$filename") || error("open $filename: $!", $cleanup);
@@ -143,9 +143,9 @@ Index: IkiWiki/Plugin/missingparents.pm
 +	}
 +	rename($filename, "$config{wikistatedir}/missingparents") ||
 +		error("rename $filename: $!", $cleanup);
-+} #}}}
++}
 +
-+sub needsdelete (@) { #{{{
++sub needsdelete (@) {
 +	my $files=shift;
 +	
 +	my @mydel;
@@ -167,9 +167,9 @@ Index: IkiWiki/Plugin/missingparents.pm
 +	foreach my $page (@mydel){
 +		push @{$files}, $page;
 +	}
-+} #}}}
++}
 +
-+sub check_matches($) { #{{{
++sub check_matches($) {
 +	my $page = shift;
 +	return if $IkiWiki::pagesources{$page};
 +
@@ -183,9 +183,9 @@ Index: IkiWiki/Plugin/missingparents.pm
 +		return $output;
 +	}
 +	return "";
-+} #}}}
++}
 +
-+sub needsbuild ($) { #{{{
++sub needsbuild ($) {
 +	my $files=shift;
 +	my @new;
 +
@@ -209,7 +209,7 @@ Index: IkiWiki/Plugin/missingparents.pm
 +		$ownfiles{$file} = 1;
 +		push @{$files}, $file;
 +	}
-+} #}}}
++}
 +
 +1
 Index: IkiWiki.pm
@@ -227,18 +227,18 @@ Index: IkiWiki.pm
  our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 @@ -330,6 +336,30 @@
  		error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
- } #}}}
+ }
  
-+sub newpage($$) { #{{{
++sub newpage($$) {
 +	my $file=shift;
 +	my $page=shift;
 +
 +	$pagemtime{$page} = $pagectime{$page} = time;
 +	$pagesources{$page} = $file;
 +	$pagecase{lc $page} = $page;
-+} #}}}
++}
 +
-+sub delpage($) { #{{{
++sub delpage($) {
 +	my $page=shift;
 +	$links{$page}=[];
 +	$renderedfiles{$page}=[];
@@ -251,10 +251,10 @@ Index: IkiWiki.pm
 +			delete $destsources{$_};
 +			}
 +		}
-+} #}}}
++}
 +
  my %cleared;
- sub will_render ($$;$) { #{{{
+ sub will_render ($$;$) {
  	my $page=shift;
 </pre>
 
diff --git a/doc/todo/modify_page_filename_in_plugin.mdwn b/doc/todo/modify_page_filename_in_plugin.mdwn
index 7c0a909eb..4099487a1 100644
--- a/doc/todo/modify_page_filename_in_plugin.mdwn
+++ b/doc/todo/modify_page_filename_in_plugin.mdwn
@@ -10,7 +10,7 @@ My solution is to allow plugins to provide a hook that sets the pagename. --[[/u
     +++ /usr/share/perl5/IkiWiki.pm 2008-10-07 11:57:26.000000000 -0400
     @@ -196,11 +196,32 @@
 
-     sub pagename ($) { #{{{
+     sub pagename ($) {
             my $file=shift;
 
             my $type=pagetype($file);
@@ -27,7 +27,7 @@ My solution is to allow plugins to provide a hook that sets the pagename. --[[/u
             $page=~s/\Q.$type\E*$// if defined $type;
             return $page;
     +   }
-     } #}}}
+     }
 
-     sub htmlpage ($) { #{{{
+     sub htmlpage ($) {
 
diff --git a/doc/todo/pagespec_relative_to_a_target.mdwn b/doc/todo/pagespec_relative_to_a_target.mdwn
index f7b248670..4757988e0 100644
--- a/doc/todo/pagespec_relative_to_a_target.mdwn
+++ b/doc/todo/pagespec_relative_to_a_target.mdwn
@@ -57,7 +57,7 @@ diff -urNX ignorepats ikiwiki/IkiWiki/Plugin/relative.pm ikidev/IkiWiki/Plugin/r
 +
 +package IkiWiki::PageSpec;
 +
-+sub match_relative($$;@) { #{{{
++sub match_relative($$;@) {
 +	my $parent = shift;
 +	my $spec = shift;
 +	my %params = @_;
@@ -69,21 +69,21 @@ diff -urNX ignorepats ikiwiki/IkiWiki/Plugin/relative.pm ikidev/IkiWiki/Plugin/r
 +		}
 +	}
 +	return IkiWiki::FailReason->new("$parent can't match $spec against anything");
-+} #}}}
++}
 +
-+sub match_has_child($$;@) { #{{{
++sub match_has_child($$;@) {
 +	my $page = shift;
 +	my $childname = shift;
 +	my $spec;
-+	if ($childname) { #{{{
++	if ($childname) {
 +		$spec = "$page/$childname or $page/*/$childname";
-+	} #}}}
-+	else { #{{{
++	}
++	else {
 +		$spec = "$page/*";
-+	} #}}}
++	}
 +
 +	return match_relative($page, $spec, @_);
-+} #}}}
++}
 +
 +1
 </pre>
diff --git a/doc/todo/provide_sha1_for_git_diffurl.mdwn b/doc/todo/provide_sha1_for_git_diffurl.mdwn
index 9c8b340de..01aa512f8 100644
--- a/doc/todo/provide_sha1_for_git_diffurl.mdwn
+++ b/doc/todo/provide_sha1_for_git_diffurl.mdwn
@@ -10,7 +10,7 @@ diffurls of the following form:
     index 5bef928..164210d 100644
     --- a/IkiWiki/Plugin/git.pm
     +++ b/IkiWiki/Plugin/git.pm
-    @@ -518,6 +518,7 @@ sub rcs_recentchanges ($) { #{{{
+    @@ -518,6 +518,7 @@ sub rcs_recentchanges ($) {
      
      			my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
      			$diffurl =~ s/\[\[file\]\]/$file/go;
diff --git a/doc/todo/require_CAPTCHA_to_edit.mdwn b/doc/todo/require_CAPTCHA_to_edit.mdwn
index 110b4167f..83ba07eb0 100644
--- a/doc/todo/require_CAPTCHA_to_edit.mdwn
+++ b/doc/todo/require_CAPTCHA_to_edit.mdwn
@@ -91,15 +91,15 @@ ignored.
 
 --- a/IkiWiki/Plugin/openid.pm
 +++ b/IkiWiki/Plugin/openid.pm
-@@ -18,6 +18,7 @@ sub getopt () { #{{{
+@@ -18,6 +18,7 @@ sub getopt () {
  	error($@) if $@;
  	Getopt::Long::Configure('pass_through');
  	GetOptions("openidsignup=s" => \$config{openidsignup});
 +	GetOptions("openidneedscaptcha=s" => \$config{openidneedscaptcha});
- } #}}}
+ }
  
- sub formbuilder_setup (@) { #{{{
-@@ -61,6 +62,7 @@ sub formbuilder_setup (@) { #{{{
+ sub formbuilder_setup (@) {
+@@ -61,6 +62,7 @@ sub formbuilder_setup (@) {
  			# Skip all other required fields in this case.
  			foreach my $field ($form->field) {
  				next if $field eq "openid_url";
@@ -107,7 +107,7 @@ ignored.
  				$form->field(name => $field, required => 0,
  					validate => '/.*/');
  			}
-@@ -96,6 +98,18 @@ sub validate ($$$;$) { #{{{
+@@ -96,6 +98,18 @@ sub validate ($$$;$) {
  		}
  	}
  
@@ -152,19 +152,19 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "formbuilder_setup", id => "recaptcha", call => \&formbuilder_setup);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
 	Getopt::Long::Configure('pass_through');
 	GetOptions("reCaptchaPubKey=s" => \$config{reCaptchaPubKey});
 	GetOptions("reCaptchaPrivKey=s" => \$config{reCaptchaPrivKey});
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -274,7 +274,7 @@ EOTAGS
 				});
 		}
 	}
-} # }}}
+}
 
 # The following function is borrowed from
 # Captcha::reCAPTCHA by Andy Armstrong and are under the PERL Artistic License
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index 5d6cb89e8..b051361a8 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -31,13 +31,13 @@ I just implemented this.  There is one [[patch]] to the default page template, a
     use IkiWiki;
     use open qw{:utf8 :std};
     
-    sub import { #{{{
+    sub import {
     	hook(type => "getsetup", id => "getsource", call => \&getsetup);
     	hook(type => "pagetemplate", id => "getsource", call => \&pagetemplate);
     	hook(type => "sessioncgi", id => "getsource", call => \&cgi_getsource);
-    } # }}}
+    }
     
-    sub getsetup () { #{{{
+    sub getsetup () {
     	return
     		plugin => {
     			safe => 1,
@@ -50,9 +50,9 @@ I just implemented this.  There is one [[patch]] to the default page template, a
     			safe => 1,
     			rebuild => 0,
     		},
-    } #}}}
+    }
     
-    sub pagetemplate (@) { #{{{
+    sub pagetemplate (@) {
     	my %params=@_;
     
     	my $page=$params{page};
@@ -62,9 +62,9 @@ I just implemented this.  There is one [[patch]] to the default page template, a
     		$template->param(getsourceurl => IkiWiki::cgiurl(do => "getsource", page => $page));
     		$template->param(have_actions => 1);
     	}
-    } # }}}
+    }
     
-    sub cgi_getsource ($$) { #{{{
+    sub cgi_getsource ($$) {
     	my $cgi=shift;
     	my $session=shift;
     
diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
index 2a196ed23..22f67cc0a 100644
--- a/doc/todo/structured_page_data.mdwn
+++ b/doc/todo/structured_page_data.mdwn
@@ -257,21 +257,21 @@ in a large number of other cases.
     use CGI::FormBuilder;
     use IkiWiki 2.00;
     
-    sub import { #{{{
+    sub import {
     	hook(type => "getsetup", id => "form", call => \&getsetup);
     	hook(type => "htmlize", id => "form", call => \&htmlize);
     	hook(type => "sessioncgi", id => "form", call => \&cgi_submit);
-    } # }}}
+    }
     
-    sub getsetup () { #{{{
+    sub getsetup () {
     	return
     		plugin => {
     			safe => 1,
     			rebuild => 1, # format plugin
     		},
-    } #}}}
+    }
     
-    sub makeFormFromYAML ($$$) { #{{{
+    sub makeFormFromYAML ($$$) {
     	my $page = shift;
     	my $YAMLString = shift;
     	my $q = shift;
@@ -350,9 +350,9 @@ in a large number of other cases.
     	# IkiWiki::decode_form_utf8($form);
     	
     	return $form;
-    } #}}}
+    }
     
-    sub htmlize (@) { #{{{
+    sub htmlize (@) {
     	my %params=@_;
     	my $content = $params{content};
     	my $page = $params{page};
@@ -360,9 +360,9 @@ in a large number of other cases.
     	my $form = makeFormFromYAML($page, $content, undef);
     
     	return $form->render(submit => 'Update Form');
-    } # }}}
+    }
     
-    sub cgi_submit ($$) { #{{{
+    sub cgi_submit ($$) {
     	my $q=shift;
     	my $session=shift;
     	
@@ -425,11 +425,11 @@ in a large number of other cases.
     	}
     
     	exit;
-    } #}}}
+    }
     
     package IkiWiki::PageSpec;
     
-    sub match_form_eq ($$;@) { #{{{
+    sub match_form_eq ($$;@) {
     	my $page=shift;
     	my $argSet=shift;
     	my @args=split(/,/, $argSet);
@@ -460,7 +460,7 @@ in a large number of other cases.
     	} else {
     		return IkiWiki::FailReason->new("field value does not match");
     	}
-    } #}}}
+    }
     
     1
 
@@ -476,22 +476,22 @@ in a large number of other cases.
     
     my $inTable = 0;
     
-    sub import { #{{{
+    sub import {
     	hook(type => "getsetup", id => "data", call => \&getsetup);
     	hook(type => "needsbuild", id => "data", call => \&needsbuild);
     	hook(type => "preprocess", id => "data", call => \&preprocess, scan => 1);
     	hook(type => "preprocess", id => "datatable", call => \&preprocess_table, scan => 1);	# does this need scan?
-    } # }}}
+    }
     
-    sub getsetup () { #{{{
+    sub getsetup () {
     	return
     		plugin => {
     			safe => 1,
     			rebuild => 1, # format plugin
     		},
-    } #}}}
+    }
     
-    sub needsbuild (@) { #{{{
+    sub needsbuild (@) {
     	my $needsbuild=shift;
     	foreach my $page (keys %pagestate) {
     		if (exists $pagestate{$page}{data}) {
@@ -506,7 +506,7 @@ in a large number of other cases.
     	}
     }
     
-    sub preprocess (@) { #{{{
+    sub preprocess (@) {
     	my @argslist = @_;
     	my %params=@argslist;
     	
@@ -546,9 +546,9 @@ in a large number of other cases.
     	}
     	
     	return $html;
-    } # }}}
+    }
     
-    sub preprocess_table (@) { #{{{
+    sub preprocess_table (@) {
     	my %params=@_;
     
     	my @lines;
@@ -568,11 +568,11 @@ in a large number of other cases.
     	push @lines, '</table>';
     
     	return join("\n", @lines);
-    } #}}}
+    }
     
     package IkiWiki::PageSpec;
     
-    sub match_data_eq ($$;@) { #{{{
+    sub match_data_eq ($$;@) {
     	my $page=shift;
     	my $argSet=shift;
     	my @args=split(/,/, $argSet);
@@ -592,9 +592,9 @@ in a large number of other cases.
     	} else {
     		return IkiWiki::FailReason->new("value does not match");
     	}
-    } #}}}
+    }
     
-    sub match_data_link ($$;@) { #{{{
+    sub match_data_link ($$;@) {
     	my $page=shift;
     	my $argSet=shift;
     	my @params=@_;
@@ -618,6 +618,6 @@ in a large number of other cases.
     	}
     
     	return IkiWiki::FailReason->new("No data link on page $page with key $key matches glob $value");
-    } #}}}
+    }
     
     1
diff --git a/doc/todo/supporting_comments_via_disussion_pages.mdwn b/doc/todo/supporting_comments_via_disussion_pages.mdwn
index 892db18a9..aae0b3008 100644
--- a/doc/todo/supporting_comments_via_disussion_pages.mdwn
+++ b/doc/todo/supporting_comments_via_disussion_pages.mdwn
@@ -91,14 +91,14 @@ Each comment is processed to something like this:
     use strict;
     use IkiWiki '1.02';
 
-    sub import { #{{{
+    sub import {
         hook(type => "formbuilder_setup", id => "comments",
             call => \&formbuilder_setup);
         hook(type => "preprocess", id => "blogcomment",
             call => \&preprocess);  
-    } # }}}
+    }
 
-    sub formbuilder_setup (@) { #{{{
+    sub formbuilder_setup (@) {
         my %params=@_;
         my $cgi = $params{cgi};
         my $form = $params{form};   
@@ -138,9 +138,9 @@ Each comment is processed to something like this:
         $content.=qq{[[!blogcomment from="""$name""" timestamp="""$timestamp""" subject="""$subject""" text="""$comment"""]]\n\n};
         $content=~s/\n/\r\n/g;
         $form->field(name => "editcontent", value => $content, force => 1);
-    } # }}}
+    }
 
-    sub preprocess (@) { #{{{
+    sub preprocess (@) {
         my %params=@_;
 
         my ($text, $date, $from, $subject, $r);
@@ -159,7 +159,7 @@ Each comment is processed to something like this:
         $r .= "</dl>\n" . $text . "</div>\n";
 
         return $r;
-    } # }}}
+    }
     
     1;
 
diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 2bdeb62be..3de3032b3 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -90,7 +90,7 @@ like this:
     index 8d728c9..1bd46a9 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -618,6 +618,8 @@ sub pagetype ($) { #{{{
+    @@ -618,6 +618,8 @@ sub pagetype ($) {
      	
      	if ($page =~ /\.([^.]+)$/) {
      		return $1 if exists $hooks{htmlize}{$1};
@@ -98,7 +98,7 @@ like this:
     +		return $page;
      	}
      	return;
-     } #}}}
+     }
 
 ## format directive
 
diff --git a/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn b/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn
index aaa040ec7..bfc130d69 100644
--- a/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn
+++ b/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn
@@ -10,6 +10,6 @@
  	+	debug("ctime for '$file': ". localtime($ctime));
  	 
  	 	return $ctime;
- 	 } #}}}
+ 	 }
 
 [[!tag patch done]]
diff --git a/doc/todo/tmplvars_plugin.mdwn b/doc/todo/tmplvars_plugin.mdwn
index f7d06a579..644cf23aa 100644
--- a/doc/todo/tmplvars_plugin.mdwn
+++ b/doc/todo/tmplvars_plugin.mdwn
@@ -11,12 +11,12 @@ A simple plugin to allow per-page customization of a template by passing paramat
 
     my %tmplvars;
 
-    sub import { #{{{
+    sub import {
 	    hook(type => "preprocess", id => "tmplvars", call => \&preprocess);
 	    hook(type => "pagetemplate", id => "tmplvars", call => \&pagetemplate);
-    } # }}}
+    }
 
-    sub preprocess (@) { #{{{
+    sub preprocess (@) {
 	    my %params=@_;
 
 	    if ($params{page} eq $params{destpage}) {
@@ -34,9 +34,9 @@ A simple plugin to allow per-page customization of a template by passing paramat
 		    }
 	    }
     
-    } # }}}
+    }
     
-    sub pagetemplate (@) { #{{{
+    sub pagetemplate (@) {
             my %params=@_;
             my $template = $params{template};
 
@@ -47,6 +47,6 @@ A simple plugin to allow per-page customization of a template by passing paramat
             }
 
             return undef;
-    } # }}}
+    }
 
     1
diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 3af0458bd..2832e37aa 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -194,9 +194,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     index 4e4da11..8b3cdfe 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -1550,7 +1550,16 @@ sub globlist_to_pagespec ($) { #{{{
+    @@ -1550,7 +1550,16 @@ sub globlist_to_pagespec ($) {
      
-     sub is_globlist ($) { #{{{
+     sub is_globlist ($) {
      	my $s=shift;
     -	return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
     +	return ! ($s =~ /
@@ -209,19 +209,19 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +			) |
     +				(\s and \s) | (\s or \s)	# or we find 'and' or 'or' somewhere
     +			/xs);
-     } #}}}
+     }
      
-     sub safequote ($) { #{{{
-    @@ -1631,7 +1640,7 @@ sub pagespec_merge ($$) { #{{{
+     sub safequote ($) {
+    @@ -1631,7 +1640,7 @@ sub pagespec_merge ($$) {
      	return "($a) or ($b)";
-     } #}}}
+     }
      
-    -sub pagespec_translate ($) { #{{{
-    +sub pagespec_makeperl ($) { #{{{
+    -sub pagespec_translate ($) {
+    +sub pagespec_makeperl ($) {
      	my $spec=shift;
      
      	# Support for old-style GlobLists.
-    @@ -1650,12 +1659,14 @@ sub pagespec_translate ($) { #{{{
+    @@ -1650,12 +1659,14 @@ sub pagespec_translate ($) {
      		|
      			\)		# )
      		|
@@ -238,7 +238,7 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      		my $word=$1;
      		if (lc $word eq 'and') {
      			$code.=' &&';
-    @@ -1666,16 +1677,23 @@ sub pagespec_translate ($) { #{{{
+    @@ -1666,16 +1677,23 @@ sub pagespec_translate ($) {
      		elsif ($word eq "(" || $word eq ")" || $word eq "!") {
      			$code.=' '.$word;
      		}
@@ -265,14 +265,14 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      		}
      	}
      
-    @@ -1683,8 +1701,18 @@ sub pagespec_translate ($) { #{{{
+    @@ -1683,8 +1701,18 @@ sub pagespec_translate ($) {
      		$code=0;
      	}
      
     +	return 'sub { my $page=shift; my %params = @_; '.$code.' }';
-    +} #}}}
+    +}
     +
-    +sub pagespec_translate ($) { #{{{
+    +sub pagespec_translate ($) {
     +	my $spec=shift;
     +
     +	my $code = pagespec_makeperl($spec);
@@ -282,19 +282,19 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      	no warnings;
     -	return eval 'sub { my $page=shift; '.$code.' }';
     +	return eval $code;
-     } #}}}
+     }
      
-     sub pagespec_match ($$;@) { #{{{
-    @@ -1699,7 +1727,7 @@ sub pagespec_match ($$;@) { #{{{
+     sub pagespec_match ($$;@) {
+    @@ -1699,7 +1727,7 @@ sub pagespec_match ($$;@) {
      
      	my $sub=pagespec_translate($spec);
      	return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
     -	return $sub->($page, @params);
     +	return $sub->($page, @params, specFuncs => {});
-     } #}}}
+     }
      
-     sub pagespec_valid ($) { #{{{
-    @@ -1748,11 +1776,78 @@ sub new { #{{{
+     sub pagespec_valid ($) {
+    @@ -1748,11 +1776,78 @@ sub new {
      
      package IkiWiki::PageSpec;
      
@@ -361,7 +361,7 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +	}
     +}
     +
-     sub match_glob ($$;@) { #{{{
+     sub match_glob ($$;@) {
      	my $page=shift;
      	my $glob=shift;
      	my %params=@_;
@@ -373,9 +373,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      	my $from=exists $params{location} ? $params{location} : '';
      	
      	# relative matching
-    @@ -1782,11 +1877,12 @@ sub match_internal ($$;@) { #{{{
+    @@ -1782,11 +1877,12 @@ sub match_internal ($$;@) {
      
-     sub match_link ($$;@) { #{{{
+     sub match_link ($$;@) {
      	my $page=shift;
     -	my $link=lc(shift);
     +	my $fulllink=shift;
@@ -388,7 +388,7 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      	# relative matching
      	if ($link =~ m!^\.! && defined $from) {
      		$from=~s#/?[^/]+$##;
-    @@ -1804,19 +1900,32 @@ sub match_link ($$;@) { #{{{
+    @@ -1804,19 +1900,32 @@ sub match_link ($$;@) {
      		}
      		else {
      			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
@@ -397,9 +397,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      		}
      	}
      	return IkiWiki::FailReason->new("$page does not link to $link");
-     } #}}}
+     }
      
-     sub match_backlink ($$;@) { #{{{
+     sub match_backlink ($$;@) {
     -	return match_link($_[1], $_[0], @_);
     +	my $page=shift;
     +	my $backlink=shift;
@@ -410,9 +410,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +	}
     +
     +	return match_link($backlink, $page, @params);
-     } #}}}
+     }
      
-     sub match_created_before ($$;@) { #{{{
+     sub match_created_before ($$;@) {
      	my $page=shift;
      	my $testpage=shift;
     +	my @params=@_;
@@ -423,8 +423,8 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      
      	if (exists $IkiWiki::pagectime{$testpage}) {
      		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
-    @@ -1834,6 +1943,11 @@ sub match_created_before ($$;@) { #{{{
-     sub match_created_after ($$;@) { #{{{
+    @@ -1834,6 +1943,11 @@ sub match_created_before ($$;@) {
+     sub match_created_after ($$;@) {
      	my $page=shift;
      	my $testpage=shift;
     +	my @params=@_;
diff --git a/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn b/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn
index 87e55685c..14bb43782 100644
--- a/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn
+++ b/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn
@@ -8,7 +8,7 @@ I think this (untested) patch might just do the trick:
 
     --- a/IkiWiki/Plugin/edittemplate.pm
     +++ b/IkiWiki/Plugin/edittemplate.pm
-    @@ -46,8 +46,13 @@ sub preprocess (@) { #{{{
+    @@ -46,8 +46,13 @@ sub preprocess (@) {
 
       $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
 
@@ -21,9 +21,9 @@ I think this (untested) patch might just do the trick:
     +       else {
     +               return '';
     +       }
-    } # }}}
+    }
 
-    sub formbuilder (@) { #{{{
+    sub formbuilder (@) {
 
 --[[madduck]]
 
diff --git a/doc/todo/using_meta_titles_for_parentlinks.html b/doc/todo/using_meta_titles_for_parentlinks.html
index d04e5a300..6da40a415 100644
--- a/doc/todo/using_meta_titles_for_parentlinks.html
+++ b/doc/todo/using_meta_titles_for_parentlinks.html
@@ -82,9 +82,9 @@ diff -c /usr/share/perl5/IkiWiki/Plugin/meta.pm.distrib /usr/share/perl5/IkiWiki
 *** 289,294 ****
 --- 290,319 ----
         }
-  } #}}}
+  }
   
-+ sub IkiWiki::pagetitle ($;$) { #{{{
++ sub IkiWiki::pagetitle ($;$) {
 +       my $page=shift;
 +       my $unescaped=shift;
 + 
@@ -106,11 +106,11 @@ diff -c /usr/share/perl5/IkiWiki/Plugin/meta.pm.distrib /usr/share/perl5/IkiWiki
 +       }
 + 
 +       return $page;
-+ } #}}}
++ }
 + 
   package IkiWiki::PageSpec;
   
-  sub match_title ($$;@) { #{{{
+  sub match_title ($$;@) {
 
 
 </pre>
diff --git a/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn b/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
index 492a32b36..b28469993 100644
--- a/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
+++ b/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
@@ -157,9 +157,9 @@ ManojSrivastava
 +=cut
 +
 +
-+sub import { #{{{
++sub import {
 +	hook(type => "pagetemplate", id => "varioki", call => \&pagetemplate);
-+} # }}}
++}
 +
 +
 +=pod
@@ -175,7 +175,7 @@ ManojSrivastava
 +
 +=cut
 +
-+sub pagetemplate (@) { #{{{
++sub pagetemplate (@) {
 +	my %params=@_;
 +	my $page=$params{page};
 +	my $template=$params{template};
@@ -207,7 +207,7 @@ ManojSrivastava
 +             $template->param("$var" =>"$value");
 +           }
 +        }
-+} # }}}
++}
 +
 +1;
 +
diff --git a/ikiwiki.in b/ikiwiki.in
index 473cbdbfd..32a24af84 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -9,12 +9,12 @@ use strict;
 use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
-sub usage () { #{{{
+sub usage () {
 	die gettext("usage: ikiwiki [options] source dest"), "\n",
 	    gettext("       ikiwiki --setup configfile"), "\n";
-} #}}}
+}
 
-sub getconfig () { #{{{
+sub getconfig () {
 	if (! exists $ENV{WRAPPED_OPTIONS}) {
 		%config=defaultconfig();
 		eval q{use Getopt::Long};
@@ -123,9 +123,9 @@ sub getconfig () { #{{{
 		loadplugins();
 		checkconfig();
 	}
-} #}}}
+}
 
-sub main () { #{{{
+sub main () {
 	getconfig();
 	
 	if ($config{setup}) {
@@ -207,6 +207,6 @@ sub main () { #{{{
 		saveindex();
 		debug(gettext("done"));
 	}
-} #}}}
+}
 
 main;
-- 
cgit v1.2.3


From 9b837fd5ed984f0947bc3e1f4478384b3b1691fd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 17:05:49 -0500
Subject: fix default values for config settings

defaults cannot be set in getsetup, do it in checkconfig to avoid
uninitialized value warnings.
---
 IkiWiki/Plugin/comments.pm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6184c6031..83f67869c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -39,7 +39,6 @@ sub getsetup () {
 		comments_shown_pagespec => {
 			type => 'pagespec',
 			example => 'blog/*',
-			default => '',
 			description => 'PageSpec for pages where comments will be shown inline',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
@@ -48,7 +47,6 @@ sub getsetup () {
 		comments_open_pagespec => {
 			type => 'pagespec',
 			example => 'blog/* and created_after(close_old_comments)',
-			default => '',
 			description => 'PageSpec for pages where new comments can be posted',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
@@ -56,7 +54,6 @@ sub getsetup () {
 		},
 		comments_pagename => {
 			type => 'string',
-			example => 'comment_',
 			default => 'comment_',
 			description => 'Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"',
 			safe => 0, # manual page moving required
@@ -64,7 +61,6 @@ sub getsetup () {
 		},
 		comments_allowdirectives => {
 			type => 'boolean',
-			default => 0,
 			example => 0,
 			description => 'Interpret directives in comments?',
 			safe => 1,
@@ -72,7 +68,6 @@ sub getsetup () {
 		},
 		comments_allowauthor => {
 			type => 'boolean',
-			default => 0,
 			example => 0,
 			description => 'Allow anonymous commenters to set an author name?',
 			safe => 1,
@@ -81,7 +76,6 @@ sub getsetup () {
 		comments_commit => {
 			type => 'boolean',
 			example => 1,
-			default => 1,
 			description => 'commit comments to the VCS',
 			# old uncommitted comments are likely to cause
 			# confusion if this is changed
@@ -90,6 +84,17 @@ sub getsetup () {
 		},
 }
 
+sub checkconfig () {
+	$config{comments_commit} = 1
+		unless defined $config{comments_commit};
+	$config{comments_shown_pagespec} = ''
+		unless defined $config{comments_shown_pagespec};
+	$config{comments_open_pagespec} = ''
+		unless defined $config{comments_open_pagespec};
+	$config{comments_pagename} = 'comment_'
+		unless defined $config{comments_pagename};
+}
+
 sub htmlize {
 	my %params = @_;
 	return $params{content};
@@ -208,12 +213,6 @@ sub preprocess {
 	return $content;
 }
 
-sub checkconfig () {
-	$config{comments_commit} = 1 unless defined $config{comments_commit};
-	$config{comments_pagename} = 'comment_'
-		unless defined $config{comments_pagename};
-}
-
 # This is exactly the same as recentchanges_link :-(
 sub linkcgi ($) {
 	my $cgi=shift;
-- 
cgit v1.2.3


From 140c0bacbadc35de93cc685313123e9e51b45704 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 18:50:04 -0500
Subject: change around comments pagespecs

I think it is clearer to have one pagespec that controls all pages with
comments, and a separate pagespec that can be used to close new comments on
a subset of those pages.
---
 IkiWiki/Plugin/comments.pm | 43 ++++++++++++++++++++-----------------------
 doc/plugins/comments.mdwn  | 13 +++++++------
 2 files changed, 27 insertions(+), 29 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 83f67869c..6e257d1d9 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -34,20 +34,18 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
-		# Pages where comments are shown, but new comments are not
-		# allowed, will show "Comments are closed".
-		comments_shown_pagespec => {
+		comments_pagespec => {
 			type => 'pagespec',
-			example => 'blog/*',
-			description => 'PageSpec for pages where comments will be shown inline',
+			example => 'blog/* and *!/Discussion',
+			description => 'PageSpec of pages where comments are allowed',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
 			rebuild => 1,
 		},
-		comments_open_pagespec => {
+		comments_closed_pagespec => {
 			type => 'pagespec',
-			example => 'blog/* and created_after(close_old_comments)',
-			description => 'PageSpec for pages where new comments can be posted',
+			example => 'blog/controversial or blog/flamewar',
+			description => 'PageSpec of pages where posting new comments is not allowed',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
 			rebuild => 1,
@@ -87,10 +85,10 @@ sub getsetup () {
 sub checkconfig () {
 	$config{comments_commit} = 1
 		unless defined $config{comments_commit};
-	$config{comments_shown_pagespec} = ''
-		unless defined $config{comments_shown_pagespec};
-	$config{comments_open_pagespec} = ''
-		unless defined $config{comments_open_pagespec};
+	$config{comments_pagespec} = ''
+		unless defined $config{comments_pagespec};
+	$config{comments_closed_pagespec} = ''
+		unless defined $config{comments_closed_pagespec};
 	$config{comments_pagename} = 'comment_'
 		unless defined $config{comments_pagename};
 }
@@ -371,7 +369,7 @@ sub sessioncgi ($$) {
 			$page));
 	}
 
-	if (not pagespec_match($page, $config{comments_open_pagespec},
+	if (pagespec_match($page, $config{comments_closed_pagespec},
 		location => $page)) {
 		error(sprintf(gettext(
 			"comments on page '%s' are closed"),
@@ -523,22 +521,21 @@ sub pagetemplate (@) {
 		my $comments = undef;
 
 		my $open = 0;
-		my $shown = pagespec_match($page,
-			$config{comments_shown_pagespec},
-			location => $page);
+		my $shown = 0;
+		if (pagespec_match($page,
+				$config{comments_pagespec},
+				location => $page)) {
+			$shown = 1;
+			$open = length $config{cgiurl} > 0;
+		}
 
-		if (pagespec_match($page, "*/$config{comments_pagename}*",
+		if (pagespec_match($page,
+				"$config{comments_closed_pagespec} or */$config{comments_pagename}*",
 				location => $page)) {
 			$shown = 0;
 			$open = 0;
 		}
 
-		if (length $config{cgiurl}) {
-			$open = pagespec_match($page,
-				$config{comments_open_pagespec},
-				location => $page);
-		}
-
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/$config{comments_pagename}*)",
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index a81cab127..afaf2c7ae 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -23,12 +23,13 @@ Individual comments are stored as internal-use pages named something like
 
 There are some global options for the setup file:
 
-* `comments_open_pagespec`: pages where new comments can be posted, e.g.
-  `blog/* and created_after(close_old_comments)` or `!*/discussion`.
-  You need to set this, since the default is to not add comments to any
-  pages.
-* `comments_shown_pagespec`: pages where comments will be displayed inline,
-  e.g. `blog/*` or `!*/discussion`.
+* `comments_pagespec`: [[ikiwiki/PageSpec]] of pages where comments are
+  allowed. The default is not to allow comments on any pages. To allow
+  comments to all posts to a blog, you could use `blog/* and !*/Discussion`.
+* `comments_closed_pagespec`: [[ikiwiki/PageSpec]] of pages where
+  posting of new comments is closed, but any existing comments will still
+  be displayed. Often you will list a set of individual pages here.
+  For example: `blog/controversial or blog/flamewar`
 * `comments_pagename`: if this is e.g. `comment_` (the default), then
   comment pages will be named something like `page/comment_12`
 * `comments_allowdirectives`: if true (default false), comments may
-- 
cgit v1.2.3


From 5feffc8b0b953856052c09dd431984e2e835b439 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 19:06:29 -0500
Subject: fix test when comments_closed_pagespec is empty

---
 IkiWiki/Plugin/comments.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6e257d1d9..0b3007097 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -529,8 +529,13 @@ sub pagetemplate (@) {
 			$open = length $config{cgiurl} > 0;
 		}
 
-		if (pagespec_match($page,
-				"$config{comments_closed_pagespec} or */$config{comments_pagename}*",
+		if (pagespec_match($page, "*/$config{comments_pagename}*",
+				location => $page)) {
+			$shown = 0;
+			$open = 0;
+		}
+		if (length $config{comments_closed_pagespec} &&
+		    pagespec_match($page, $config{comments_closed_pagespec},
 				location => $page)) {
 			$shown = 0;
 			$open = 0;
-- 
cgit v1.2.3


From cd7ac8f72a43a53aeca3b5e8daf906e990420016 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 19:38:02 -0500
Subject: add Comments link when displaying a page inline

This link will supplant the usual Discussion link for pages
that have comments enabled.
---
 IkiWiki/Plugin/comments.pm | 58 ++++++++++++++++++++++++++++------------------
 templates/inlinepage.tmpl  |  4 ++++
 templates/page.tmpl        |  6 ++---
 3 files changed, 41 insertions(+), 27 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0b3007097..cb5a517a1 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -511,6 +511,24 @@ sub sessioncgi ($$) {
 	exit;
 }
 
+sub commentsshown ($) {
+	my $page=shift;
+
+	return ! pagespec_match($page, "*/$config{comments_pagename}*",
+	                        location => $page) &&
+	       pagespec_match($page, $config{comments_pagespec},
+	                      location => $page);
+}
+
+sub commentsopen ($) {
+	my $page = shift;
+
+	return length $config{cgiurl} > 0 &&
+	       (! length $config{comments_closed_pagespec} ||
+	        ! pagespec_match($page, $config{comments_closed_pagespec},
+	                         location => $page));
+}
+
 sub pagetemplate (@) {
 	my %params = @_;
 
@@ -518,29 +536,9 @@ sub pagetemplate (@) {
 	my $template = $params{template};
 
 	if ($template->query(name => 'comments')) {
-		my $comments = undef;
-
-		my $open = 0;
-		my $shown = 0;
-		if (pagespec_match($page,
-				$config{comments_pagespec},
-				location => $page)) {
-			$shown = 1;
-			$open = length $config{cgiurl} > 0;
-		}
-
-		if (pagespec_match($page, "*/$config{comments_pagename}*",
-				location => $page)) {
-			$shown = 0;
-			$open = 0;
-		}
-		if (length $config{comments_closed_pagespec} &&
-		    pagespec_match($page, $config{comments_closed_pagespec},
-				location => $page)) {
-			$shown = 0;
-			$open = 0;
-		}
+		my $shown = commentsshown($page);
 
+		my $comments = undef;
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/$config{comments_pagename}*)",
@@ -558,13 +556,27 @@ sub pagetemplate (@) {
 			$template->param(comments => $comments);
 		}
 
-		if ($open) {
+		if ($shown && commentsopen($page)) {
 			my $commenturl = IkiWiki::cgiurl(do => 'comment',
 				page => $page);
 			$template->param(commenturl => $commenturl);
 		}
 	}
 
+	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
+		# would have to update whenever comments of any inlines
+		# page are added, which is not currently done.
+		if (commentsshown($page)) {
+			$template->param(commentslink =>
+				htmllink($page, $params{destpage}, $page,
+					linktext => gettext("Comments"),
+					anchor => "comments",
+					noimageinline => 1));
+		}
+	}
+
 	if ($template->query(name => 'commentuser')) {
 		$template->param(commentuser =>
 			$pagestate{$page}{comments}{commentuser});
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 984d33cef..3c0b93315 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -58,9 +58,13 @@ License: <TMPL_VAR LICENSE>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="COMMENTSLINK">
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
+</TMPL_IF>
 </ul>
 </div><!--.actions-->
 </TMPL_IF>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index ea50fb722..79c2b8b6e 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -70,18 +70,16 @@
 <TMPL_IF COMMENTS>
 <div id="comments">
 <TMPL_VAR COMMENTS>
-</div>
-
 <TMPL_UNLESS COMMENTURL>
 <div class="addcomment">Comments on this page are closed.</div>
 </TMPL_UNLESS>
-</TMPL_IF>
-
 <TMPL_IF COMMENTURL>
 <div class="addcomment">
 <a href="<TMPL_VAR COMMENTURL>">Add a comment</a>
 </div>
 </TMPL_IF>
+</div>
+</TMPL_IF>
 
 <div id="footer" class="pagefooter">
 <div id="pageinfo">
-- 
cgit v1.2.3


From 339bfbd44a438f7bb712d76f6e7ee9c1f4784254 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 20:22:42 -0500
Subject: typo

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index cb5a517a1..db829f344 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -36,7 +36,7 @@ sub getsetup () {
 		},
 		comments_pagespec => {
 			type => 'pagespec',
-			example => 'blog/* and *!/Discussion',
+			example => 'blog/* and !*/Discussion',
 			description => 'PageSpec of pages where comments are allowed',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
-- 
cgit v1.2.3


From 81165dd2e079fac822eaefacafaaa612524b3aa6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 20:29:55 -0500
Subject: jump to comments anchor after post

Not ideal, it would be nicer to jump to the actual comment posted, but no
anchor is available.
---
 IkiWiki/Plugin/comments.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index db829f344..2ca2d0a1d 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -500,7 +500,8 @@ sub sessioncgi ($$) {
 		error($conflict) if defined $conflict;
 
 		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/$config{comments_pagename}$i";
+		# and jump to the comments anchor.
+		my $anticache = "?updated=$page/$config{comments_pagename}$i#comments";
 		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
 	}
 	else {
-- 
cgit v1.2.3


From f3bec255e4f62f31bf7b2f99d941c79e1fe93559 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 21:27:28 -0500
Subject: aggregate: If a feed fails to be downloaded, try again immediatly
 next time aggregation is run, even if the usual time has not passed. Closes:
 #508622 (Michael Gold)

---
 IkiWiki/Plugin/aggregate.pm | 13 +++++++++----
 debian/changelog            |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 29bc6d0ce..9b531b612 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -245,6 +245,7 @@ sub preprocess (@) {
 	$feed->{template}=$params{template} . ".tmpl";
 	delete $feed->{unseen};
 	$feed->{lastupdate}=0 unless defined $feed->{lastupdate};
+	$feed->{lasttry}=$feed->{lastupdate} unless defined $feed->{lasttry};
 	$feed->{numposts}=0 unless defined $feed->{numposts};
 	$feed->{newposts}=0 unless defined $feed->{newposts};
 	$feed->{message}=gettext("new feed") unless defined $feed->{message};
@@ -390,8 +391,8 @@ sub mergestate () {
 	# fields.
 	foreach my $name (keys %myfeeds) {
 		if (exists $feeds{$name}) {
-			foreach my $field (qw{message lastupdate numposts
-			                      newposts error}) {
+			foreach my $field (qw{message lastupdate lasttry
+			                      numposts newposts error}) {
 				$feeds{$name}->{$field}=$myfeeds{$name}->{$field};
 			}
 		}
@@ -458,10 +459,10 @@ sub aggregate (@) {
 	error($@) if $@;
 
 	foreach my $feed (@_) {
-		$feed->{lastupdate}=time;
+		$feed->{lasttry}=time;
 		$feed->{newposts}=0;
 		$feed->{message}=sprintf(gettext("last checked %s"),
-			displaytime($feed->{lastupdate}));
+			displaytime($feed->{lasttry}));
 		$feed->{error}=0;
 
 		debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));
@@ -483,6 +484,10 @@ sub aggregate (@) {
 			debug($feed->{message});
 			next;
 		}
+
+		# lastupdate is only set if we were able to contact the server
+		$feed->{lastupdate}=$feed->{lasttry};
+
 		if ($res->status == URI::Fetch::URI_GONE()) {
 			$feed->{message}=gettext("feed not found");
 			$feed->{error}=1;
diff --git a/debian/changelog b/debian/changelog
index f7085169c..d8685db09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * monotone: When getting the log, tell monotone how many entries
     we want, rather than closing the pipe, which it dislikes. (thm)
   * Coding style change: Remove explcit vim folding markers.
+  * aggregate: If a feed fails to be downloaded, try again immediatly
+    next time aggregation is run, even if the usual time has not passed.
+    Closes: #508622 (Michael Gold)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
-- 
cgit v1.2.3


From 7521dd6c7571cba4a3b882ecffc02dbcbed2805e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Dec 2008 20:58:16 -0500
Subject: jump to comment after posting

Jumping to the just posted comment was the imputus, but I killed a number
of birds here.

Added a INLINEPAGE template variable, which can be used to add anchors to
any inline template.

To keep that sufficiently general, it is the full page name, so the
comment anchors and links changed form.

Got rid of the FIXMEd hardcoded html anchor div.

More importantly, the anchor is now to the very top of the comment, not the
text below. So you can see the title, and how it attributes you.

Avoid changing the permalink of pages that are not really comments, but
happen to contain the _comment directive. I think that behavior was a bug,
though not a likely one to occur since _comment should only really be used
on comment pages.
---
 IkiWiki/Plugin/comments.pm      | 14 ++++----------
 IkiWiki/Plugin/inline.pm        |  1 +
 doc/todo/comments.mdwn          |  2 ++
 templates/comments_display.tmpl |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 2ca2d0a1d..3b8752894 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -193,12 +193,10 @@ sub preprocess {
 		$pagestate{$page}{meta}{title} = $params{subject};
 	}
 
-	my $baseurl = urlto($params{destpage}, undef, 1);
-	my $anchor = "";
 	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
-		$anchor = $1;
+		$pagestate{$page}{meta}{permalink} = urlto($params{destpage}, undef, 1).
+			"#".$params{page};
 	}
-	$pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";
 
 	eval q{use Date::Parse};
 	if (! $@) {
@@ -206,8 +204,6 @@ sub preprocess {
 		$IkiWiki::pagectime{$page} = $time if defined $time;
 	}
 
-	# FIXME: hard-coded HTML (although it's just to set an ID)
-	return "<div id=\"$anchor\">$content</div>" if $anchor;
 	return $content;
 }
 
@@ -499,10 +495,8 @@ sub sessioncgi ($$) {
 		# breaks it or something
 		error($conflict) if defined $conflict;
 
-		# Bounce back to where we were, but defeat broken caches
-		# and jump to the comments anchor.
-		my $anticache = "?updated=$page/$config{comments_pagename}$i#comments";
-		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
+		# Jump to the new comment on the page.
+		IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location");
 	}
 	else {
 		IkiWiki::showform ($form, \@buttons, $session, $cgi,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d37db97ec..8490b455f 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -340,6 +340,7 @@ sub preprocess_inline (@) {
 					$template->param(content => $content);
 				}
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+				$template->param(inlinepage => $page);
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index c81947e74..2bcec69ba 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -81,5 +81,7 @@ Known issues with the [[plugins/comments]] plugin:
   with id="comment_123" or something. I'll fix this, unless Joey gets there
   first. --[[smcv]]
 
+  > done --[[Joey]] 
+
 * Now that inline has some comments-specific functionality anyway, it would
   be good to output <link rel="comments"> in Atom and the equivalent in RSS.
diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
index bc4b70273..e7e283bbf 100644
--- a/templates/comments_display.tmpl
+++ b/templates/comments_display.tmpl
@@ -1,4 +1,4 @@
-<div class="comments-display">
+<div class="comments-display" id="<TMPL_VAR NAME=INLINEPAGE>">
 
 <div class="comments-header">
 Posted by
-- 
cgit v1.2.3


From f7fc062a12dd18cb153ede4d574fd792bc996218 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 13:55:41 -0500
Subject: replace discussion links on pages with comments link

The thinking here is that having both a Discussion page and comments for
the same page is redundant, and certianly not what you want if you enable
comments for a page. At first I considered making configurable via pagespec
what pages got discussion links. But that would mean testing a new pagespec
for every page, and a redundant config setting to keep in sync. So intead,
take a lead from my previous change to make inlined pages have a comments
link, and change the discussion link at the top of regular pages to link to
their comments.

(Implementation is a bit optimised to avoid redundant pagespec checking.)
---
 IkiWiki/Plugin/comments.pm | 7 ++++---
 templates/page.tmpl        | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3b8752894..fd9f0acb4 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -529,10 +529,11 @@ sub pagetemplate (@) {
 
 	my $page = $params{page};
 	my $template = $params{template};
+	my $shown = ($template->query(name => 'commentslink') ||
+	             $template->query(name => 'comments')) &&
+	            commentsshown($page);
 
 	if ($template->query(name => 'comments')) {
-		my $shown = commentsshown($page);
-
 		my $comments = undef;
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
@@ -563,7 +564,7 @@ sub pagetemplate (@) {
 		# the link. But, to update the number, blog pages
 		# would have to update whenever comments of any inlines
 		# page are added, which is not currently done.
-		if (commentsshown($page)) {
+		if ($shown) {
 			$template->param(commentslink =>
 				htmllink($page, $params{destpage}, $page,
 					linktext => gettext("Comments"),
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 79c2b8b6e..21abc979d 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -49,9 +49,13 @@
 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="COMMENTSLINK">
+<li><TMPL_VAR COMMENTSLINK><br /></li>
+<TMPL_ELSE>
 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK><br /></li>
 </TMPL_IF>
+</TMPL_IF>
 </ul>
 </div>
 </TMPL_IF>
-- 
cgit v1.2.3


From ddabb010b2c45556046fd1ba982893395c7a46f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 14:03:26 -0500
Subject: rename comments_display to comment

---
 IkiWiki/Plugin/comments.pm      |  4 ++--
 doc/tips/comments_feed.mdwn     |  2 +-
 doc/todo/comments.mdwn          |  2 +-
 doc/wikitemplates.mdwn          |  2 +-
 templates/comment.tmpl          | 36 ++++++++++++++++++++++++++++++++++++
 templates/comments_display.tmpl | 36 ------------------------------------
 6 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 templates/comment.tmpl
 delete mode 100644 templates/comments_display.tmpl

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index fd9f0acb4..705ba340b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -447,7 +447,7 @@ sub sessioncgi ($$) {
 					content => $preview);
 			});
 
-		my $template = template("comments_display.tmpl");
+		my $template = template("comment.tmpl");
 		$template->param(content => $preview);
 		$template->param(title => $form->field('subject'));
 		$template->param(ctime => displaytime(time));
@@ -538,7 +538,7 @@ sub pagetemplate (@) {
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/$config{comments_pagename}*)",
-				template => 'comments_display',
+				template => 'comment',
 				show => 0,
 				reverse => 'yes',
 				page => $page,
diff --git a/doc/tips/comments_feed.mdwn b/doc/tips/comments_feed.mdwn
index 68513901e..6f8137256 100644
--- a/doc/tips/comments_feed.mdwn
+++ b/doc/tips/comments_feed.mdwn
@@ -3,7 +3,7 @@ blog can have comments added to them. Pages with comments even have special
 feeds that can be used to subscribe to those comments. But you'd like to
 add a feed that contains all the comments posted to any page. Here's how:
 
-	\[[!inline pages="internal(*/comment_*)" template=comments_display]]
+	\[[!inline pages="internal(*/comment_*)" template=comment]]
 
 The special [[ikiwiki/PageSpec]] matches all comments. The
 [[template|wikitemplates]] causes the comments to be displayed formatted
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 2bcec69ba..ee2ba7ea0 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -46,7 +46,7 @@ Known issues with the [[plugins/comments]] plugin:
   > a good feature to have, though. --[[smcv]]
 
 * One can use inline to set up a feed of all comments posted to any page.
-  Using template=comments_display they are displayed right. Only problem
+  Using template=comment they are displayed right. Only problem
   is there is no indication in that template of what page each comment in the
   feed is a comment on. So, if a comment is inlined into a different page,
   I think it should show a link back to the page commented on.
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 6fb4d5f49..63735193b 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -29,7 +29,7 @@ located in /usr/share/ikiwiki/templates by default.
   form to wiki pages.
 * `searchquery.tmpl` - This is an omega template, used by the
   [[plugins/search]] plugin.
-* `comments_display.tmpl` - This template is used to display a comment
+* `comment.tmpl` - This template is used to display a comment
   by the [[plugins/comments]] plugin.
 * `comments_form.tmpl` - This template is the comment post form for the
   [[plugins/comments]] plugin.
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
new file mode 100644
index 000000000..e7e283bbf
--- /dev/null
+++ b/templates/comment.tmpl
@@ -0,0 +1,36 @@
+<div class="comments-display" id="<TMPL_VAR NAME=INLINEPAGE>">
+
+<div class="comments-header">
+Posted by
+<TMPL_IF NAME="COMMENTUSER">
+<span class="author">
+<TMPL_IF NAME="COMMENTAUTHORURL">
+<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR NAME=AUTHOR>
+</TMPL_IF>
+</span>
+<TMPL_ELSE>
+<TMPL_IF NAME=COMMENTIP>
+<span class="author">
+<TMPL_VAR NAME=COMMENTIP>
+</span>
+<TMPL_ELSE>
+unknown IP address
+</TMPL_IF>
+
+<TMPL_IF NAME=AUTHOR>
+(<span class="claimedauthor"><TMPL_IF NAME="AUTHORURL"><a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a><TMPL_ELSE><TMPL_VAR NAME=AUTHOR></TMPL_IF></span>)
+</TMPL_IF>
+</TMPL_IF>
+
+(<TMPL_VAR CTIME>)
+</div>
+
+<div class="comments-subject"><TMPL_VAR TITLE></div>
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+</div><!--.comments-display-->
diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
deleted file mode 100644
index e7e283bbf..000000000
--- a/templates/comments_display.tmpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="comments-display" id="<TMPL_VAR NAME=INLINEPAGE>">
-
-<div class="comments-header">
-Posted by
-<TMPL_IF NAME="COMMENTUSER">
-<span class="author">
-<TMPL_IF NAME="COMMENTAUTHORURL">
-<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
-<TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
-</TMPL_IF>
-</span>
-<TMPL_ELSE>
-<TMPL_IF NAME=COMMENTIP>
-<span class="author">
-<TMPL_VAR NAME=COMMENTIP>
-</span>
-<TMPL_ELSE>
-unknown IP address
-</TMPL_IF>
-
-<TMPL_IF NAME=AUTHOR>
-(<span class="claimedauthor"><TMPL_IF NAME="AUTHORURL"><a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a><TMPL_ELSE><TMPL_VAR NAME=AUTHOR></TMPL_IF></span>)
-</TMPL_IF>
-</TMPL_IF>
-
-(<TMPL_VAR CTIME>)
-</div>
-
-<div class="comments-subject"><TMPL_VAR TITLE></div>
-
-<div class="inlinecontent">
-<TMPL_VAR CONTENT>
-</div>
-
-</div><!--.comments-display-->
-- 
cgit v1.2.3


From 79a787a4668caf043862197de2b5ba7e41d37102 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 14:07:22 -0500
Subject: rename comments_form to editcomment

---
 IkiWiki/Plugin/comments.pm   |  2 +-
 doc/wikitemplates.mdwn       |  2 +-
 templates/comments_form.tmpl | 34 ----------------------------------
 templates/editcomment.tmpl   | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 templates/comments_form.tmpl
 create mode 100644 templates/editcomment.tmpl

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 705ba340b..a155712fb 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -281,7 +281,7 @@ sub sessioncgi ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => scalar IkiWiki::template_params('comments_form.tmpl'),
+		template => scalar IkiWiki::template_params('editcomment.tmpl'),
 		# wtf does this do in editpage?
 		wikiname => $config{wikiname},
 	);
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 63735193b..dc217cd30 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -31,7 +31,7 @@ located in /usr/share/ikiwiki/templates by default.
   [[plugins/search]] plugin.
 * `comment.tmpl` - This template is used to display a comment
   by the [[plugins/comments]] plugin.
-* `comments_form.tmpl` - This template is the comment post form for the
+* `editcomment.tmpl` - This template is the comment post form for the
   [[plugins/comments]] plugin.
 
 The [[plugins/pagetemplate]] plugin can allow individual pages to use a
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
deleted file mode 100644
index 9a9455f99..000000000
--- a/templates/comments_form.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="comments-form">
-<TMPL_VAR MESSAGE>
-<TMPL_VAR FORM-START>
-<TMPL_VAR FIELD-DO>
-<TMPL_VAR FIELD-SID>
-<TMPL_VAR FIELD-PAGE>
-<TMPL_IF NAME=USERNAME>
-Signed in as <TMPL_VAR NAME=USERNAME ESCAPE=HTML><br />
-<TMPL_ELSE>
-<TMPL_IF NAME=ALLOWAUTHOR>
-Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
-Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
-</TMPL_IF>
-</TMPL_IF>
-Subject: <TMPL_VAR FIELD-SUBJECT><br />
-<TMPL_VAR FIELD-EDITCONTENT><br />
-Page type: <TMPL_VAR FIELD-TYPE><br />
-<TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK><br />
-A subset of HTML is allowed.<br />
-IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
-<TMPL_VAR NAME="FORM-END">
-
-<TMPL_IF NAME="PAGE_PREVIEW">
-<hr />
-<div class="header">
-<span>Comment preview:</span>
-</div><!-- .header -->
-<div id="preview">
-<TMPL_VAR PAGE_PREVIEW>
-</div><!-- #preview -->
-</TMPL_IF>
-
-</div><!-- .comments-form -->
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
new file mode 100644
index 000000000..a08b8964c
--- /dev/null
+++ b/templates/editcomment.tmpl
@@ -0,0 +1,34 @@
+<div class="editcomment">
+<TMPL_VAR MESSAGE>
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
+<TMPL_VAR FIELD-PAGE>
+<TMPL_IF NAME=USERNAME>
+Signed in as <TMPL_VAR NAME=USERNAME ESCAPE=HTML><br />
+<TMPL_ELSE>
+<TMPL_IF NAME=ALLOWAUTHOR>
+Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
+Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
+</TMPL_IF>
+</TMPL_IF>
+Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<TMPL_VAR FIELD-EDITCONTENT><br />
+Page type: <TMPL_VAR FIELD-TYPE><br />
+<TMPL_VAR FORM-SUBMIT><br />
+<TMPL_VAR HELPONFORMATTINGLINK><br />
+A subset of HTML is allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
+<TMPL_VAR NAME="FORM-END">
+
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Comment preview:</span>
+</div><!-- .header -->
+<div id="preview">
+<TMPL_VAR PAGE_PREVIEW>
+</div><!-- #preview -->
+</TMPL_IF>
+
+</div><!-- .editcomment -->
-- 
cgit v1.2.3


From 4bdeec4961b8df9df449b027e37a8b17898f2c86 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 14:09:39 -0500
Subject: remove cruft

wtf does it do? absolutely nothing
---
 IkiWiki/Plugin/comments.pm | 2 --
 IkiWiki/Plugin/editpage.pm | 1 -
 2 files changed, 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index a155712fb..50c048fee 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -282,8 +282,6 @@ sub sessioncgi ($$) {
 		header => 0,
 		table => 0,
 		template => scalar IkiWiki::template_params('editcomment.tmpl'),
-		# wtf does this do in editpage?
-		wikiname => $config{wikiname},
 	);
 
 	IkiWiki::decode_form_utf8($form);
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 9210d6ff8..ed994306f 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -105,7 +105,6 @@ sub cgi_editpage ($$) {
 		header => 0,
 		table => 0,
 		template => scalar template_params("editpage.tmpl"),
-		wikiname => $config{wikiname},
 	);
 	
 	decode_form_utf8($form);
-- 
cgit v1.2.3


From 301733ba13f8fdaf53df0a6058f92d305507a97f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 17:33:40 -0500
Subject: fix comment permalink to always point to comment parent page

---
 IkiWiki/Plugin/comments.pm | 2 +-
 doc/todo/comments.mdwn     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 50c048fee..c50729a34 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -194,7 +194,7 @@ sub preprocess {
 	}
 
 	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
-		$pagestate{$page}{meta}{permalink} = urlto($params{destpage}, undef, 1).
+		$pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
 			"#".$params{page};
 	}
 
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 81c2f2722..aa6b130dc 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -53,9 +53,7 @@ Known issues with the [[plugins/comments]] plugin:
   (BTW, the rss feed in this situation seems ok; there the link element
   points back to the parent page.
 
-  > done
-  > Er, no, I added a link but it does not go back to the parent page of a
-  > comment if the comment is inlined elsewhere. --[[Joey]] 
+  > done --[[Joey]] 
 
 * It would be useful to have a pagespec that always matches all comments on 
   pages matching a glob. Something like `comment(blog/*)`.
-- 
cgit v1.2.3


From 61f8ea7f1d304e3bc35d852e9a401c2cc45d18ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 17:57:09 -0500
Subject: avoid uninitialized value

This can happen when a new field,
such as the new lasttry, is added.
---
 IkiWiki/Plugin/aggregate.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 9b531b612..97dd036f6 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -343,7 +343,8 @@ sub savestate () {
 				push @line, "tag=$_" foreach @{$data->{tags}};
 			}
 			else {
-				push @line, "$field=".$data->{$field};
+				push @line, "$field=".$data->{$field}
+					if defined $data->{$field};
 			}
 		}
 		print OUT join(" ", @line)."\n" || error("write $newfile: $!", $cleanup);
-- 
cgit v1.2.3


From f4e69ed815ca65f38ee9d19219f33dabeb92b97e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Dec 2008 19:56:36 +0000
Subject: _comment directive: if the user looks like an OpenID, store that

---
 IkiWiki/Plugin/comments.pm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index c50729a34..336ed1a82 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -151,11 +151,28 @@ sub preprocess {
 	my $commentip;
 	my $commentauthor;
 	my $commentauthorurl;
+	my $commentopenid;
 
 	if (defined $params{username}) {
 		$commentuser = $params{username};
-		($commentauthorurl, $commentauthor) =
-			linkuser($params{username});
+
+		my $oiduser = eval { IkiWiki::openiduser($commentuser) };
+
+		if (defined $oiduser) {
+			# looks like an OpenID
+			$commentauthorurl = $commentuser;
+			$commentauthor = $oiduser;
+			$commentopenid = $commentuser;
+		}
+		else {
+			$commentauthorurl = IkiWiki::cgiurl(
+				do => 'commenter',
+				page => (length $config{userdir}
+					? "$config{userdir}/$commentuser"
+					: "$commentuser"));
+
+			$commentauthor = $commentuser;
+		}
 	}
 	else {
 		if (defined $params{ip}) {
@@ -165,6 +182,7 @@ sub preprocess {
 	}
 
 	$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;
-- 
cgit v1.2.3


From 8a9f4e225f1c54705fa6d7061724b62fe11ae8fa Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Dec 2008 19:57:03 +0000
Subject: comments: remove linkuser(), it's been integrated into preprocess()
 now

---
 IkiWiki/Plugin/comments.pm | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 336ed1a82..bd09c6b25 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -254,27 +254,6 @@ sub linkcgi ($) {
 	}
 }
 
-# FIXME: basically the same logic as recentchanges
-# returns (author URL, pretty-printed version)
-sub linkuser ($) {
-	my $user = shift;
-	my $oiduser = eval { IkiWiki::openiduser($user) };
-
-	if (defined $oiduser) {
-		return ($user, $oiduser);
-	}
-	# FIXME: it'd be good to avoid having such a link for anonymous
-	# posts
-	else {
-		return (IkiWiki::cgiurl(
-				do => 'commenter',
-				page => (length $config{userdir}
-					? "$config{userdir}/$user"
-					: "$user")
-			), $user);
-	}
-}
-
 # Mostly cargo-culted from IkiWiki::plugin::editpage
 sub sessioncgi ($$) {
 	my $cgi=shift;
-- 
cgit v1.2.3


From 8ed94c0a18435f3a1934e19949153c7ccf8ec78a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Dec 2008 19:57:25 +0000
Subject: comments: pass COMMENTOPENID to templates

---
 IkiWiki/Plugin/comments.pm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index bd09c6b25..d095a00bd 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -573,6 +573,11 @@ sub pagetemplate (@) {
 			$pagestate{$page}{comments}{commentuser});
 	}
 
+	if ($template->query(name => 'commentopenid')) {
+		$template->param(commentopenid =>
+			$pagestate{$page}{comments}{commentopenid});
+	}
+
 	if ($template->query(name => 'commentip')) {
 		$template->param(commentip =>
 			$pagestate{$page}{comments}{commentip});
-- 
cgit v1.2.3


From 9e889c39ed9971e31dc33f4dea73a91d6938b535 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Dec 2008 20:01:08 +0000
Subject: comments: Rename COMMENTURL to ADDCOMMENTURL to avoid confusion with
 COMMENTAUTHORURL

Also refactor page.tmpl to use if/else rather than unless/if.
---
 IkiWiki/Plugin/comments.pm | 4 ++--
 templates/page.tmpl        | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d095a00bd..4f3b76db3 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -548,9 +548,9 @@ sub pagetemplate (@) {
 		}
 
 		if ($shown && commentsopen($page)) {
-			my $commenturl = IkiWiki::cgiurl(do => 'comment',
+			my $addcommenturl = IkiWiki::cgiurl(do => 'comment',
 				page => $page);
-			$template->param(commenturl => $commenturl);
+			$template->param(addcommenturl => $addcommenturl);
 		}
 	}
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 21abc979d..f75491127 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -74,13 +74,12 @@
 <TMPL_IF COMMENTS>
 <div id="comments">
 <TMPL_VAR COMMENTS>
-<TMPL_UNLESS COMMENTURL>
-<div class="addcomment">Comments on this page are closed.</div>
-</TMPL_UNLESS>
-<TMPL_IF COMMENTURL>
+<TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
-<a href="<TMPL_VAR COMMENTURL>">Add a comment</a>
+<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
 </div>
+<TMPL_ELSE>
+<div class="addcomment">Comments on this page are closed.</div>
 </TMPL_IF>
 </div>
 </TMPL_IF>
-- 
cgit v1.2.3


From c53a3a1d3e028e4f27acb661cc19341a13801c2b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 20 Dec 2008 20:55:38 -0500
Subject: avoid storing transient state in pagestate

None of the comment state needs to be stored through the a later run of
ikiwiki, so move it all from pagestate to a more transient storage.

This is assuming that we'll never want to add pagespecs to search against
the comment state. Pagespecs like author() are why the meta plugin does
store its meta data in pagestate -- the data can be needed later to match
against.
---
 IkiWiki/Plugin/comments.pm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4f3b76db3..644ef1be8 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;
 	}
@@ -570,27 +570,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});
 	}
 }
 
-- 
cgit v1.2.3


From c84fcdd32aad7a613bf7bbb501362dffcf5ccdeb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Dec 2008 01:52:08 -0500
Subject: meta: Process meta date during scan pass so that the date will always
 affect sorting in inlines.

---
 IkiWiki/Plugin/meta.pm                              | 16 ++++++++--------
 debian/changelog                                    |  2 ++
 doc/bugs/inline_sort_order_and_meta_date_value.mdwn |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index ea60be507..8c214139f 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -121,6 +121,13 @@ sub preprocess (@) {
 		$pagestate{$page}{meta}{authorurl}=$value if safeurl($value);
 		# fallthrough
 	}
+	elsif ($key eq 'date') {
+		eval q{use Date::Parse};
+		if (! $@) {
+			my $time = str2time($value);
+			$IkiWiki::pagectime{$page}=$time if defined $time;
+		}
+	}
 
 	if (! defined wantarray) {
 		# avoid collecting duplicate data during scan pass
@@ -128,14 +135,7 @@ sub preprocess (@) {
 	}
 
 	# Metadata collection that happens only during preprocessing pass.
-	if ($key eq 'date') {
-		eval q{use Date::Parse};
-		if (! $@) {
-			my $time = str2time($value);
-			$IkiWiki::pagectime{$page}=$time if defined $time;
-		}
-	}
-	elsif ($key eq 'permalink') {
+	if ($key eq 'permalink') {
 		if (safeurl($value)) {
 			$pagestate{$page}{meta}{permalink}=$value;
 			push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
diff --git a/debian/changelog b/debian/changelog
index d8685db09..056fabc7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * aggregate: If a feed fails to be downloaded, try again immediatly
     next time aggregation is run, even if the usual time has not passed.
     Closes: #508622 (Michael Gold)
+  * meta: Process meta date during scan pass so that the date will always
+    affect sorting in inlines.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
diff --git a/doc/bugs/inline_sort_order_and_meta_date_value.mdwn b/doc/bugs/inline_sort_order_and_meta_date_value.mdwn
index 219657753..d4ec8f345 100644
--- a/doc/bugs/inline_sort_order_and_meta_date_value.mdwn
+++ b/doc/bugs/inline_sort_order_and_meta_date_value.mdwn
@@ -309,4 +309,6 @@ available at the time that they are inlined, and the newer unix ctime is
 used. On the second build, the meta data has already been recorded.
 
 This can probably be avoided by processing meta date at scan time.
+
+Verified, fix works. [[done]]
 --[[Joey]] 
-- 
cgit v1.2.3


From bc66a00b90e00971156f1aea5678ce88d006e84d Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 15:07:36 +0000
Subject: comments: linkify and preprocess preview with correct 'page' param

---
 IkiWiki/Plugin/comments.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 644ef1be8..34bbafeed 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -432,8 +432,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)));
-- 
cgit v1.2.3


From 95b3bbbf7c786cc9e1dd7d7925ac75a0f525affd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 15:08:14 +0000
Subject: comments: run pagetemplate hooks

This fixes the bug that comments are always said to be from an anonymous
user at an unknown IP address.
---
 IkiWiki/Plugin/comments.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 34bbafeed..23e089761 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -447,6 +447,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 {
-- 
cgit v1.2.3


From e0cd19f30b5cc66450bdb52bd9840c6d8fa774eb Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 16:32:44 +0000
Subject: openid: in &openiduser, let domain-style providers have arbitrarily
 many subdomains

This leads to better display for OpenIDs like smcv.pseudorandom.co.uk
and thm.id.fedoraproject.org (to take a couple of examples from the
IkiWiki commit history).
---
 IkiWiki/Plugin/openid.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 2933c9ed9..4acfecf5e 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -191,9 +191,10 @@ sub openiduser ($) {
 	    eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
 		my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
 		my $display=$oid->display;
-		# Convert "user.somehost.com" to "user [somehost.com]".
+		# Convert "user.somehost.com" to "user [somehost.com]"
+		# (also "user.somehost.co.uk")
 		if ($display !~ /\[/) {
-			$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
+			$display=~s/^([-a-zA-Z0-9]+?)\.([-.a-zA-Z0-9]+\.[a-z]+)$/$1 [$2]/;
 		}
 		# Convert "http://somehost.com/user" to "user [somehost.com]".
 		if ($display !~ /\[/) {
-- 
cgit v1.2.3


From 801dc76bf0e066558cc6ea179073104fb6a67c92 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 16:35:02 +0000
Subject: openid: in &openiduser, allow subdirectory-style providers to end
 with '/'

This improves the display of OpenIDs like 'http://id.mayfirst.org/jamie/'
(taking an example from the IkiWiki commit log).
---
 IkiWiki/Plugin/openid.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 4acfecf5e..574c42f0e 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -197,8 +197,9 @@ sub openiduser ($) {
 			$display=~s/^([-a-zA-Z0-9]+?)\.([-.a-zA-Z0-9]+\.[a-z]+)$/$1 [$2]/;
 		}
 		# Convert "http://somehost.com/user" to "user [somehost.com]".
+		# (also "https://somehost.com/user/")
 		if ($display !~ /\[/) {
-			$display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
+			$display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/;
 		}
 		$display=~s!^https?://!!; # make sure this is removed
 		eval q{use CGI 'escapeHTML'};
-- 
cgit v1.2.3


From d0d598e429313756192927418757e2869004049e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 17:15:49 +0000
Subject: comments: substitute commentsurl and atomcommentsurl for use in feeds

---
 IkiWiki/Plugin/comments.pm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 23e089761..0ae9eefe3 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -531,6 +531,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);
 
@@ -560,6 +562,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
-- 
cgit v1.2.3


From 05bb65fc687b357a5265f0c378a694b5b02d376d Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 22 Dec 2008 23:02:08 +0000
Subject: recentchanges_link CGI: If the linked page is internal, use its
 permalink

This fixes a bug, that comments appear in recentchanges as broken links.
---
 IkiWiki/Plugin/recentchanges.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 12577e9ef..7071596e6 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -95,6 +95,15 @@ sub cgi ($) {
 
 		IkiWiki::loadindex();
 
+		# If the page is internal (like a comment), see if it has a
+		# permalink. Comments do.
+		if (IkiWiki::isinternal($page) &&
+		    defined $pagestate{$page}{meta}{permalink}) {
+			IkiWiki::redirect($cgi,
+			                  $pagestate{$page}{meta}{permalink});
+			exit;
+		}
+
 		my $link=bestlink("", $page);
 		if (! length $link) {
 			print "Content-type: text/html\n\n";
-- 
cgit v1.2.3


From 14a9e704c1f11510fe8b16e161de69646e869bd0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 23 Dec 2008 16:08:21 -0500
Subject: enable aggregate_internal by default

---
 IkiWiki/Plugin/aggregate.pm |  6 +++++-
 doc/plugins/aggregate.mdwn  | 36 +++++++-----------------------------
 ikiwiki-transition          |  2 --
 3 files changed, 12 insertions(+), 32 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 97dd036f6..d06a648f6 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -46,7 +46,7 @@ sub getsetup () {
 		},
 		aggregateinternal => {
 			type => "boolean",
-			example => 0,
+			example => 1,
 			description => "enable aggregation to internal pages?",
 			safe => 0, # enabling needs manual transition
 			rebuild => 0,
@@ -61,6 +61,10 @@ sub getsetup () {
 }
 
 sub checkconfig () {
+	if (! defined $config{aggregateinternal}) {
+		$config{aggregateinternal}=1;
+	}
+
 	if ($config{aggregate} && ! ($config{post_commit} && 
 	                             IkiWiki::commit_hook_enabled())) {
 		launchaggregation();
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn
index 6fc87853b..e2efcd83f 100644
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@ -5,10 +5,6 @@ This plugin allows content from other feeds to be aggregated into the
 wiki. To specify feeds to aggregate, use the
 [[ikiwiki/directive/aggregate]] [[ikiwiki/directive]].
 
-New users of aggregate should enable the `aggregateinternal => 1` option in the
-.setup file. If you don't do so, you will need to enable the [[html]] plugin
-as well as aggregate itself, since feed entries will be stored as HTML.
-
 The [[meta]] and [[tag]] plugins are also recommended. Either the
 [[htmltidy]] or [[htmlbalance]] plugin is suggested, since feeds can easily
 contain html problems, some of which these plugins can fix.
@@ -27,37 +23,19 @@ visit is `http://whatever/ikiwiki.cgi?do=aggregate_webtrigger`. Anyone
 can visit the url to trigger an aggregation run, but it will only check
 each feed if its `updateinterval` has passed.
 
-## internal pages and `aggregateinternal`
+## aggregated pages
 
 This plugin creates a page for each aggregated item. 
 
 If the `aggregateinternal` option is enabled in the setup file (which is
-recommended), aggregated pages are stored in the source directory with a
+the default), aggregated pages are stored in the source directory with a
 "._aggregated" extension. These pages cannot be edited by web users, and
 do not generate first-class wiki pages. They can still be inlined into a
 blog, but you have to use `internal` in [[PageSpecs|IkiWiki/PageSpec]],
 like `internal(blog/*)`.
 
-For backward compatibility, the default is that these pages have the
-".html" extension, and are first-class wiki pages -- each one generates
-a separate HTML page in the output, and they can even be edited.
-
-That turns out to not be ideal for aggregated content, because publishing
-files for each of those pages is a waste of disk space and CPU, and you
-probably don't want to allow them to be edited. So, there is an alternative
-method that can be used (and is recommended), turned on by the
-`aggregateinternal` option in the setup file.
-
-If you are already using aggregate and want to enable `aggregateinternal`,
-you should follow this process:
-
-1. Update all [[PageSpecs|ikiwiki/PageSpec]] that refer to the aggregated
-   pages -- such as those in inlines. Put "internal()" around globs 
-   in those PageSpecs. For example, if the PageSpec was `foo/*`, it should
-   be changed to `internal(foo/*)`. This has to be done because internal
-   pages are not matched by regular globs.
-2. Turn on `aggregateinternal` in the setup file.
-3. Use [[ikiwiki-transition]] to rename all existing aggregated `.html`
-   files in the srcdir. The command to run is
-   `ikiwiki-transition aggregateinternal $setupfile`,
-4. Refresh the wiki. (`ikiwiki -setup your.setup -refresh`)
+If `aggregateinternal` is disabled, you will need to enable the [[html]]
+plugin as well as aggregate itself, since feed entries will be stored as
+HTML, and as first-class wiki pages -- each one generates
+a separate HTML page in the output, and they can even be edited. This
+option is provided only for backwards compatability.
diff --git a/ikiwiki-transition b/ikiwiki-transition
index e42a5137c..802cd643d 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -113,8 +113,6 @@ sub aggregateinternal {
 	IkiWiki::checkconfig();
 
 	IkiWiki::Plugin::aggregate::migrate_to_internal();
-
-	print "... now add aggregateinternal => 1 to your .setup file\n";
 }
 
 sub setupformat {
-- 
cgit v1.2.3


From 678d467a4080dd549f2b6f276f963eac384e1b4f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 23 Dec 2008 16:34:19 -0500
Subject: finalise version 3.00 of the plugin api

---
 IkiWiki.pm                             |  2 +-
 IkiWiki/Plugin/aggregate.pm            |  2 +-
 IkiWiki/Plugin/amazon_s3.pm            |  2 +-
 IkiWiki/Plugin/anonok.pm               |  2 +-
 IkiWiki/Plugin/attachment.pm           |  2 +-
 IkiWiki/Plugin/autoindex.pm            |  2 +-
 IkiWiki/Plugin/brokenlinks.pm          |  2 +-
 IkiWiki/Plugin/calendar.pm             |  2 +-
 IkiWiki/Plugin/camelcase.pm            |  2 +-
 IkiWiki/Plugin/color.pm                |  2 +-
 IkiWiki/Plugin/comments.pm             |  2 +-
 IkiWiki/Plugin/conditional.pm          |  2 +-
 IkiWiki/Plugin/creole.pm               |  2 +-
 IkiWiki/Plugin/cutpaste.pm             |  2 +-
 IkiWiki/Plugin/ddate.pm                |  2 +-
 IkiWiki/Plugin/editdiff.pm             |  2 +-
 IkiWiki/Plugin/edittemplate.pm         |  2 +-
 IkiWiki/Plugin/embed.pm                |  2 +-
 IkiWiki/Plugin/external.pm             |  2 +-
 IkiWiki/Plugin/favicon.pm              |  2 +-
 IkiWiki/Plugin/filecheck.pm            |  2 +-
 IkiWiki/Plugin/format.pm               |  2 +-
 IkiWiki/Plugin/fortune.pm              |  2 +-
 IkiWiki/Plugin/goodstuff.pm            |  2 +-
 IkiWiki/Plugin/google.pm               |  2 +-
 IkiWiki/Plugin/googlecalendar.pm       |  2 +-
 IkiWiki/Plugin/graphviz.pm             |  2 +-
 IkiWiki/Plugin/haiku.pm                |  2 +-
 IkiWiki/Plugin/hnb.pm                  |  2 +-
 IkiWiki/Plugin/html.pm                 |  2 +-
 IkiWiki/Plugin/htmlbalance.pm          |  2 +-
 IkiWiki/Plugin/htmlscrubber.pm         |  2 +-
 IkiWiki/Plugin/htmltidy.pm             |  2 +-
 IkiWiki/Plugin/httpauth.pm             |  2 +-
 IkiWiki/Plugin/img.pm                  |  2 +-
 IkiWiki/Plugin/inline.pm               |  2 +-
 IkiWiki/Plugin/link.pm                 |  2 +-
 IkiWiki/Plugin/linkmap.pm              |  2 +-
 IkiWiki/Plugin/listdirectives.pm       |  2 +-
 IkiWiki/Plugin/lockedit.pm             |  2 +-
 IkiWiki/Plugin/map.pm                  |  2 +-
 IkiWiki/Plugin/mdwn.pm                 |  2 +-
 IkiWiki/Plugin/meta.pm                 |  2 +-
 IkiWiki/Plugin/mirrorlist.pm           |  2 +-
 IkiWiki/Plugin/more.pm                 |  2 +-
 IkiWiki/Plugin/opendiscussion.pm       |  2 +-
 IkiWiki/Plugin/openid.pm               |  2 +-
 IkiWiki/Plugin/orphans.pm              |  2 +-
 IkiWiki/Plugin/otl.pm                  |  2 +-
 IkiWiki/Plugin/pagecount.pm            |  2 +-
 IkiWiki/Plugin/pagestats.pm            |  2 +-
 IkiWiki/Plugin/pagetemplate.pm         |  2 +-
 IkiWiki/Plugin/parentlinks.pm          |  2 +-
 IkiWiki/Plugin/passwordauth.pm         |  2 +-
 IkiWiki/Plugin/pingee.pm               |  2 +-
 IkiWiki/Plugin/pinger.pm               |  2 +-
 IkiWiki/Plugin/poll.pm                 |  2 +-
 IkiWiki/Plugin/polygen.pm              |  2 +-
 IkiWiki/Plugin/postsparkline.pm        |  2 +-
 IkiWiki/Plugin/prettydate.pm           |  2 +-
 IkiWiki/Plugin/progress.pm             |  2 +-
 IkiWiki/Plugin/rawhtml.pm              |  2 +-
 IkiWiki/Plugin/recentchanges.pm        |  2 +-
 IkiWiki/Plugin/recentchangesdiff.pm    |  2 +-
 IkiWiki/Plugin/relativedate.pm         |  2 +-
 IkiWiki/Plugin/remove.pm               |  2 +-
 IkiWiki/Plugin/rename.pm               |  2 +-
 IkiWiki/Plugin/search.pm               |  2 +-
 IkiWiki/Plugin/shortcut.pm             |  2 +-
 IkiWiki/Plugin/sidebar.pm              |  2 +-
 IkiWiki/Plugin/signinedit.pm           |  2 +-
 IkiWiki/Plugin/smiley.pm               |  2 +-
 IkiWiki/Plugin/sparkline.pm            |  2 +-
 IkiWiki/Plugin/table.pm                |  2 +-
 IkiWiki/Plugin/tag.pm                  |  2 +-
 IkiWiki/Plugin/template.pm             |  2 +-
 IkiWiki/Plugin/testpagespec.pm         |  2 +-
 IkiWiki/Plugin/teximg.pm               |  2 +-
 IkiWiki/Plugin/textile.pm              |  2 +-
 IkiWiki/Plugin/toc.pm                  |  2 +-
 IkiWiki/Plugin/toggle.pm               |  2 +-
 IkiWiki/Plugin/txt.pm                  |  2 +-
 IkiWiki/Plugin/typography.pm           |  2 +-
 IkiWiki/Plugin/version.pm              |  2 +-
 IkiWiki/Plugin/websetup.pm             |  2 +-
 IkiWiki/Plugin/wikitext.pm             |  2 +-
 doc/plugins/write.mdwn                 |  4 ++--
 doc/plugins/write/tutorial.mdwn        |  2 +-
 doc/roadmap.mdwn                       | 12 +++++++-----
 doc/todo/firm_up_plugin_interface.mdwn |  2 ++
 90 files changed, 98 insertions(+), 94 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 127c9e5d7..759bfbc65 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -24,7 +24,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
 		 inject
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
-our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
+our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index d06a648f6..c667ee2a9 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::aggregate;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Parser;
 use HTML::Tagset;
 use HTML::Entities;
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index 93c10b629..10bf358e4 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::amazon_s3;
 use warnings;
 no warnings 'redefine';
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use IkiWiki::Render;
 use Net::Amazon::S3;
 
diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index 1cbdfe4e5..243b98920 100644
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::anonok;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "anonok", call => \&getsetup);
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 87da6cd4e..e1b4d4363 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::attachment;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	add_underlay("javascript");
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index bb08091ae..555856b11 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::autoindex;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 
 sub import {
diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 1c52099bf..bf0d7560d 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "brokenlinks", call => \&getsetup);
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 88303fc44..d473c8348 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -20,7 +20,7 @@ package IkiWiki::Plugin::calendar;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Time::Local;
 use POSIX;
 
diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 6c1fafb7b..bda980d28 100644
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::camelcase;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 # This regexp is based on the one in Text::WikiFormat.
 my $link_regexp=qr{
diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index 53d8389d2..20505893b 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::color;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "preprocess", id => "color", call => \&preprocess);
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0ae9eefe3..c9c7b2ed4 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -7,7 +7,7 @@ package IkiWiki::Plugin::comments;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 use POSIX qw(strftime);
 
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 66253e07d..4f3577b34 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::conditional;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use UNIVERSAL;
 
 sub import {
diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index 3c46a48df..425e71043 100644
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::creole;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "creole", call => \&getsetup);
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index e579c1ea2..417442f34 100644
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::cutpaste;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %savedtext;
 
diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 3470640dc..bb77ce59f 100644
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -2,7 +2,7 @@
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
 
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 no warnings;
 
 sub import {
diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index 068b83b3c..7df6a9ffb 100644
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::editdiff;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Entities;
 use IPC::Open2;
 
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 7c0e7c2f8..0bafc95d0 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::edittemplate;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
diff --git a/IkiWiki/Plugin/embed.pm b/IkiWiki/Plugin/embed.pm
index 664c95763..a7d38358f 100644
--- a/IkiWiki/Plugin/embed.pm
+++ b/IkiWiki/Plugin/embed.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::embed;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $attribr=qr/[^<>"]+/;
 
diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 2d540143f..066f15cf1 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -6,7 +6,7 @@ package IkiWiki::Plugin::external;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use RPC::XML;
 use RPC::XML::Parser;
 use IPC::Open2;
diff --git a/IkiWiki/Plugin/favicon.pm b/IkiWiki/Plugin/favicon.pm
index 68359a4aa..6060914c5 100644
--- a/IkiWiki/Plugin/favicon.pm
+++ b/IkiWiki/Plugin/favicon.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::favicon;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "favicon", call => \&getsetup);
diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 5040a185c..8575ee108 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::filecheck;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %units=( #{{{	# size in bytes
 	B		=> 1,
diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index b4d3a3c5f..bbe3aa9fe 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::format;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "preprocess", id => "format", call => \&preprocess);
diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 6a12f28fd..17e57dea1 100644
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::fortune;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "fortune", call => \&getsetup);
diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index 92bc8200a..46f2380cf 100644
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::goodstuff;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my @bundle=qw{
 	brokenlinks
diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 5394c5a6f..4bba5775c 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::google;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use URI;
 
 my $host;
diff --git a/IkiWiki/Plugin/googlecalendar.pm b/IkiWiki/Plugin/googlecalendar.pm
index 9e09d7dbb..fad2ad78f 100644
--- a/IkiWiki/Plugin/googlecalendar.pm
+++ b/IkiWiki/Plugin/googlecalendar.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::googlecalendar;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "googlecalendar",
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 23631da30..b43e96a73 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::graphviz;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use IPC::Open2;
 
 sub import {
diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index fe68c6eec..5a062a276 100644
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::haiku;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "haiku", call => \&getsetup);
diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm
index d5b5ce3b4..bd2177a06 100644
--- a/IkiWiki/Plugin/hnb.pm
+++ b/IkiWiki/Plugin/hnb.pm
@@ -10,7 +10,7 @@ package IkiWiki::Plugin::hnb;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use File::Temp qw(:mktemp);
 
 sub import {
diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index 9b9547cca..a7d5e8ce9 100644
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::html;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "html", call => \&getsetup);
diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index acbe40a5d..261e273aa 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -9,7 +9,7 @@ package IkiWiki::Plugin::htmlbalance;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::TreeBuilder;
 use HTML::Entities;
 
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 823b3d806..a249cdf7a 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::htmlscrubber;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 # This regexp matches urls that are in a known safe scheme.
 # Feel free to use it from other plugins.
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 02438ebef..6f3379ef4 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,7 +9,7 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use IPC::Open2;
 
 sub import {
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 39edff615..1816c9d74 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::httpauth;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 395890c0e..5c580c03c 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %imgdefaults;
 
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8490b455f..b88efc0ba 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use Encode;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use URI;
 
 my %knownfeeds;
diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 3799209d0..b79273f96 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::link;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $link_regexp;
 
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index cb9f3ef41..941ed5f36 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::linkmap;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use IPC::Open2;
 
 sub import {
diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index be82b0495..d2cebca34 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::listdirectives;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	add_underlay("directives");
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 31a9e70cd..c2c7414c3 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::lockedit;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "lockedit", call => \&getsetup);
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index af14ef5de..328493116 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -9,7 +9,7 @@ package IkiWiki::Plugin::map;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "map", call => \&getsetup);
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 0d5f398a0..0e134c822 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::mdwn;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "mdwn", call => \&getsetup);
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 8c214139f..15bb29b3f 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::meta;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %metaheaders;
 
diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index b726386f6..737dcf767 100644
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::mirrorlist;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "mirrorlist", call => \&getsetup);
diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index f1216ad3d..77d5fb077 100644
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::more;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $linktext = gettext("more");
 
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 95220d7b3..3da01efee 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::opendiscussion;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "opendiscussion", call => \&getsetup);
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 574c42f0e..5424c57e2 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::openid;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getopt", id => "openid", call => \&getopt);
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 8e9ab0ff4..605e6e43a 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "orphans", call => \&getsetup);
diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index 280b19db0..c68fcbbe3 100644
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::otl;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use open qw{:utf8 :std};
 
 sub import {
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index c08ab3931..a143f24d0 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "pagecount", call => \&getsetup);
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index e20d0dac6..dbe69539d 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -12,7 +12,7 @@ package IkiWiki::Plugin::pagestats;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
diff --git a/IkiWiki/Plugin/pagetemplate.pm b/IkiWiki/Plugin/pagetemplate.pm
index 60db8b327..1d8a84ca7 100644
--- a/IkiWiki/Plugin/pagetemplate.pm
+++ b/IkiWiki/Plugin/pagetemplate.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::pagetemplate;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %templates;
 
diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index fb41e1c83..ebf1d449a 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::parentlinks;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 7176f0c33..90e2ca564 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::passwordauth;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "passwordauth", "call" => \&getsetup);
diff --git a/IkiWiki/Plugin/pingee.pm b/IkiWiki/Plugin/pingee.pm
index fcbe6b57b..f5386d0ca 100644
--- a/IkiWiki/Plugin/pingee.pm
+++ b/IkiWiki/Plugin/pingee.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::pingee;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "pingee", call => \&getsetup);
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index 7b4dce586..4a8088661 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::pinger;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %pages;
 my $pinged=0;
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 5ac5b818d..bc1e3501e 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::poll;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 
 sub import {
diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index a32003778..bc21d71c7 100644
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -7,7 +7,7 @@ package IkiWiki::Plugin::polygen;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use File::Find;
 
 sub import {
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 1753e4cf9..ba43561fb 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::postsparkline;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	IkiWiki::loadplugin('sparkline');
diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 501f17f5d..e155dd39b 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 package IkiWiki::Plugin::prettydate;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use warnings;
 no warnings 'redefine';
 use strict;
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 75da16d16..76d994acc 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::progress;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages
 
diff --git a/IkiWiki/Plugin/rawhtml.pm b/IkiWiki/Plugin/rawhtml.pm
index 73093439d..ad8a610c1 100644
--- a/IkiWiki/Plugin/rawhtml.pm
+++ b/IkiWiki/Plugin/rawhtml.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::rawhtml;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "rawhtml", call => \&getsetup);
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 7071596e6..ef108b3f0 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::recentchanges;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 use HTML::Entities;
 
diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index 4dea9c26b..e3ba9b8d8 100644
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::recentchangesdiff;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Entities;
 
 my $maxlines=200;
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index e5fa8e1a5..3e33cd5c3 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::relativedate;
 use warnings;
 no warnings 'redefine';
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use POSIX;
 use Encode;
 
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 781501662..21989aff3 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::remove;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "remove", call => \&getsetup);
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index b1bb15767..54c7faf13 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::rename;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "rename", call => \&getsetup);
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index cc2130ad5..d79e3170e 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::search;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "search", call => \&getsetup);
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 33d158d3e..0e7cbd4d1 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::shortcut;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "shortcut", call => \&getsetup);
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 746fa93bb..41812e1c1 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -6,7 +6,7 @@ package IkiWiki::Plugin::sidebar;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "sidebar", call => \&getsetup);
diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 321c93ed5..032a0034c 100644
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::signinedit;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "signinedit", call => \&getsetup);
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 70b8cef74..1697a37c1 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::smiley;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %smileys;
 my $smiley_regexp;
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index dca755c63..1ed65e5b7 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::sparkline;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use IPC::Open2;
 
 my $match_num=qr/[-+]?[0-9]+(?:\.[0-9]+)?/;
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index b6f53f607..479f3d745 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::table;
 use warnings;
 use strict;
 use Encode;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "table", call => \&getsetup);
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index ecc77cbb1..d43910910 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %tags;
 
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 1b7eb91bf..57bff20ff 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index a6e94dbbb..440fca33b 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::testpagespec;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "testpagespec", call => \&getsetup);
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index 57b23147e..dba5372b5 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -8,7 +8,7 @@ use strict;
 use Digest::MD5 qw(md5_hex);
 use File::Temp qw(tempdir);
 use HTML::Entities;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $default_prefix = <<EOPREFIX;
 \\documentclass{article}
diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm
index d1b927b74..b604aa3c5 100644
--- a/IkiWiki/Plugin/textile.pm
+++ b/IkiWiki/Plugin/textile.pm
@@ -6,7 +6,7 @@ package IkiWiki::Plugin::textile;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 
 sub import {
diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index 460837b1d..a585564e7 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::toc;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Parser;
 
 sub import {
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 967b07fcc..aae8cdf84 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::toggle;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	add_underlay("javascript");
diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index d65bb2036..8599bdc8e 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -8,7 +8,7 @@ package IkiWiki::Plugin::txt;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Entities;
 
 my $findurl=0;
diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm
index e395b2143..f62be82bb 100644
--- a/IkiWiki/Plugin/typography.pm
+++ b/IkiWiki/Plugin/typography.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::typography;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getopt", id => "typography", call => \&getopt);
diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm
index 3526dafde..587cd55fa 100644
--- a/IkiWiki/Plugin/version.pm
+++ b/IkiWiki/Plugin/version.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::version;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "version", call => \&getsetup);
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 66dacfde3..a47c29976 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::websetup;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "websetup", call => \&getsetup);
diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 50571e524..accb03bbe 100644
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "wiki", call => \&getsetup);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index b6fa96f91..cb7571289 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -19,7 +19,7 @@ that can be fleshed out to make a useful plugin.
 `IkiWiki::Plugin::pagecount` is another simple example. All perl plugins
 should `use IkiWiki` to import the ikiwiki plugin interface. It's a good
 idea to include the version number of the plugin interface that your plugin
-expects: `use IkiWiki 2.00`.
+expects: `use IkiWiki 3.00`.
 
 An external plugin is an executable program. It can be written in any
 language. Its interface to ikiwiki is via XML RPC, which it reads from
@@ -431,7 +431,7 @@ describes the plugin as a whole. For example:
 
 To import the ikiwiki plugin interface:
 
-	use IkiWiki '2.00';
+	use IkiWiki '3.00';
 
 This will import several variables and functions into your plugin's
 namespace. These variables and functions are the ones most plugins need,
diff --git a/doc/plugins/write/tutorial.mdwn b/doc/plugins/write/tutorial.mdwn
index e1b34b800..5345f71f2 100644
--- a/doc/plugins/write/tutorial.mdwn
+++ b/doc/plugins/write/tutorial.mdwn
@@ -27,7 +27,7 @@ important one is the IkiWiki module.
 
 	use warnings;
 	use strict;
-	use IkiWiki 2.00;
+	use IkiWiki 3.00;
 
 Ok, boilerplate is out of the way. Now to add the one function that ikiwiki
 expects to find in any module: `import`. The import function is called when
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index c85c6de5b..b2ff626ed 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -36,12 +36,14 @@ really bad bugs will be applied going forward.
 
 # 3.0
 
-Version 3.0 is an opportunity to make significant transitions, and also adds
-many new features.
+Version 3.0 is an opportunity to make significant transitions.
+Read [[tips/upgrade_to_3.0]] for the steps you will need to
+follow when upgrading your wiki to this version.
 
-* See [[tips/upgrade_to_3.0]] for the steps you will need to follow
-  when upgrading to this version.
-* Finalise a new version of the plugin API, exporting additional commonly
+The highlights of the changes in version 3.0 include:
+
+
+* A new version of the plugin API, exporting additional commonly
   used functions from IkiWiki.pm. See [[todo/firm_up_plugin_interface]]
 
 It will include a vast number of new features, bugfixes, and other
diff --git a/doc/todo/firm_up_plugin_interface.mdwn b/doc/todo/firm_up_plugin_interface.mdwn
index c2e190884..c7553f7dd 100644
--- a/doc/todo/firm_up_plugin_interface.mdwn
+++ b/doc/todo/firm_up_plugin_interface.mdwn
@@ -92,3 +92,5 @@ Probably needs to evolve more and be more widely used before being exported.
 
 * %IkiWiki::pagecase (aggregate)
 * %IkiWiki::backlinks (pagestats)
+
+[[done]] (until 4.0)..
-- 
cgit v1.2.3


From c9e65fded187f7160a6345ea7f697402c246be06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 23 Dec 2008 19:11:03 -0500
Subject: camelcase: Add camelcase_ignore setting.

---
 IkiWiki/Plugin/camelcase.pm | 18 +++++++++++++++---
 debian/changelog            |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 6c1fafb7b..f9ee30fe2 100644
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -33,7 +33,14 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-		};
+		},
+		camelcase_ignore => {
+			type => "string",
+			example => [],
+			description => "list of words to not turn into links",
+			safe => 1,
+			rebuild => undef, # might change links
+		},
 }
 
 sub linkify (@) {
@@ -42,7 +49,7 @@ sub linkify (@) {
 	my $destpage=$params{destpage};
 
 	$params{content}=~s{$link_regexp}{
-		htmllink($page, $destpage, linkpage($1))
+		ignored($1) ? $1 : htmllink($page, $destpage, linkpage($1))
 	}eg;
 
 	return $params{content};
@@ -54,8 +61,13 @@ sub scan (@) {
         my $content=$params{content};
 
 	while ($content =~ /$link_regexp/g) {
-		push @{$links{$page}}, linkpage($1);
+		push @{$links{$page}}, linkpage($1) unless ignored($1)
 	}
 }
 
+sub ignored ($) {
+	my $word=lc shift;
+	grep { $word eq lc $_ } @{$config{'camelcase_ignore'}}
+}
+
 1
diff --git a/debian/changelog b/debian/changelog
index 2c8931735..7a8985171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (2.72) UNRELEASED; urgency=low
 
   * Avoid comments in recentchanges being broken links (smcv)
   * Add deprecation warning for GlobLists, which will stop working in 3.0.
+  * camelcase: Add camelcase_ignore setting.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 
-- 
cgit v1.2.3


From 7ba65e7f4bd53c4cbd865fa35a515ef12c183757 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Dec 2008 16:16:03 -0500
Subject: remove deprecated admin prefs

A new ikiwiki-transition moveprefs subcommand can pull the old data out of
the userdb and inject it into the setup file.

Note that it leaves the old values behind in the userdb too. I did this
because I didn't want to lose data if it fails writing the setup file for
some reason, and the old data in the userdb will only use a small amount of
space. Running the command multiple times will mostly not change anything.
---
 IkiWiki/CGI.pm               | 32 +-----------------------
 IkiWiki/Plugin/attachment.pm | 50 --------------------------------------
 IkiWiki/Plugin/lockedit.pm   | 58 --------------------------------------------
 IkiWiki/UserInfo.pm          | 20 ---------------
 doc/ikiwiki-transition.mdwn  | 29 +++++++++++++---------
 doc/tips/upgrade_to_3.0.mdwn | 34 ++++++++++++--------------
 ikiwiki-transition           | 52 ++++++++++++++++++++++++++++++++++++++-
 7 files changed, 85 insertions(+), 190 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 81cb42d13..3fadc462e 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -203,25 +203,9 @@ sub cgi_prefs ($$) {
 	
 	my $user_name=$session->param("name");
 
-	# XXX deprecated, should be removed eventually
-	$form->field(name => "banned_users", size => 50, fieldset => "admin");
-	if (! is_admin($user_name)) {
-		$form->field(name => "banned_users", type => "hidden");
-	}
 	if (! $form->submitted) {
 		$form->field(name => "email", force => 1,
 			value => userinfo_get($user_name, "email"));
-		if (is_admin($user_name)) {
-			my $value=join(" ", get_banned_users());
-			if (length $value) {
-				$form->field(name => "banned_users", force => 1,
-					value => join(" ", get_banned_users()),
-					comment => "deprecated; please move to banned_users in setup file");
-			}
-			else {
-				$form->field(name => "banned_users", type => "hidden");
-			}
-		}
 	}
 	
 	if ($form->submitted eq 'Logout') {
@@ -239,17 +223,6 @@ sub cgi_prefs ($$) {
 				error("failed to set email");
 		}
 
-		# XXX deprecated, should be removed eventually
-		if (is_admin($user_name)) {
-			set_banned_users(grep { ! is_admin($_) }
-					split(' ',
-						$form->field("banned_users"))) ||
-				error("failed saving changes");
-			if (! length $form->field("banned_users")) {
-				$form->field(name => "banned_users", type => "hidden");
-			}
-		}
-
 		$form->text(gettext("Preferences saved."));
 	}
 	
@@ -262,10 +235,7 @@ sub check_banned ($$) {
 
 	my $name=$session->param("name");
 	if (defined $name) {
-		# XXX banned in userinfo is deprecated, should be removed
-		# eventually, and only banned_users be checked.
-		if (userinfo_get($session->param("name"), "banned") ||
-		    grep { $name eq $_ } @{$config{banned_users}}) {
+		if (grep { $name eq $_ } @{$config{banned_users}}) {
 			print $q->header(-status => "403 Forbidden");
 			$session->delete();
 			print gettext("You are banned.");
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index e1b4d4363..087c315a9 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -61,23 +61,6 @@ sub check_canattach ($$;$) {
 		);
 	}
 
-	# XXX deprecated, should be removed eventually
-	if ($allowed) {
-		foreach my $admin (@{$config{adminuser}}) {
-			my $allowed_attachments=IkiWiki::userinfo_get($admin, "allowed_attachments");
-			if (defined $allowed_attachments &&
-			    length $allowed_attachments) {
-				$allowed=pagespec_match($dest,
-					$allowed_attachments,
-					file => $file,
-					user => $session->param("name"),
-					ip => $ENV{REMOTE_ADDR},
-				);
-				last if $allowed;
-			}
-		}
-	}
-
 	if (! $allowed) {
 		error(gettext("prohibited by allowed_attachments")." ($allowed)");
 	}
@@ -120,39 +103,6 @@ sub formbuilder_setup (@) {
 			$form->tmpl_param("attachments-class" => "toggleable-open");
 		}
 	}
-	elsif ($form->title eq "preferences") {
-		# XXX deprecated, should remove eventually
-		my $session=$params{session};
-		my $user_name=$session->param("name");
-
-		$form->field(name => "allowed_attachments", size => 50,
-			fieldset => "admin",
-			comment => "deprecated; please move to allowed_attachments in setup file",
-		);
-		if (! IkiWiki::is_admin($user_name)) {
-			$form->field(name => "allowed_attachments", type => "hidden");
-		}
-                if (! $form->submitted) {
-			my $value=IkiWiki::userinfo_get($user_name, "allowed_attachments");
-			if (length $value) {
-				$form->field(name => "allowed_attachments", force => 1,
-					value => IkiWiki::userinfo_get($user_name, "allowed_attachments"));
-			}
-			else {
-				$form->field(name => "allowed_attachments", type => "hidden");
-			}
-                }
-		if ($form->submitted && $form->submitted eq 'Save Preferences') {
-			if (defined $form->field("allowed_attachments")) {
-				IkiWiki::userinfo_set($user_name, "allowed_attachments",
-				$form->field("allowed_attachments")) ||
-					error("failed to set allowed_attachments");
-				if (! length $form->field("allowed_attachments")) {
-					$form->field(name => "allowed_attachments", type => "hidden");
-				}
-			}
-		}
-	}
 }
 
 sub formbuilder (@) {
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index c2c7414c3..0fa329251 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -8,8 +8,6 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "lockedit", call => \&getsetup);
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
-	hook(type => "formbuilder_setup", id => "lockedit",
-	     call => \&formbuilder_setup);
 }
 
 sub getsetup () {
@@ -52,63 +50,7 @@ sub canedit ($$) {
 		}
 	}
 
-	# XXX deprecated, should be removed eventually
-	foreach my $admin (@{$config{adminuser}}) {
-		if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"),
-		    user => $session->param("name"),
-		    ip => $ENV{REMOTE_ADDR},
-		)) {
-			if (! defined $user ||
-			    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
-				return sub { IkiWiki::needsignin($cgi, $session) };
-			}
-			else {
-				return sprintf(gettext("%s is locked and cannot be edited"),
-					htmllink("", "", $page, noimageinline => 1));
-			}
-		}
-	}
-
 	return undef;
 }
 
-sub formbuilder_setup (@) {
-	my %params=@_;
-
-	# XXX deprecated, should be removed eventually	
-	my $form=$params{form};
-	if ($form->title eq "preferences") {
-		my $session=$params{session};
-		my $cgi=$params{cgi};
-		my $user_name=$session->param("name");
-
-		$form->field(name => "locked_pages", size => 50,
-			fieldset => "admin",
-			comment => "deprecated; please move to locked_pages in setup file"
-		);
-		if (! IkiWiki::is_admin($user_name)) {
-			$form->field(name => "locked_pages", type => "hidden");
-		}
-		if (! $form->submitted) {
-			my $value=IkiWiki::userinfo_get($user_name, "locked_pages");
-			if (length $value) {
-				$form->field(name => "locked_pages", force => 1, value => $value);
-			}
-			else {
-				$form->field(name => "locked_pages", type => "hidden");
-			}
-		}
-		if ($form->submitted && $form->submitted eq 'Save Preferences') {
-			if (defined $form->field("locked_pages")) {
-				IkiWiki::userinfo_set($user_name, "locked_pages",
-					$form->field("locked_pages")) ||
-						error("failed to set locked_pages");
-				if (! length $form->field("locked_pages")) {
-					$form->field(name => "locked_pages", type => "hidden");
-				}
-			}
-		}
-	}
-}
-
 1
diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 3423dc923..0bf100a95 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -74,24 +74,4 @@ sub is_admin ($) {
 	return grep { $_ eq $user_name } @{$config{adminuser}};
 }
 
-# XXX deprecated, should be removed eventually
-sub get_banned_users () {
-	my @ret;
-	my $userinfo=userinfo_retrieve();
-	foreach my $user (keys %{$userinfo}) {
-		push @ret, $user if $userinfo->{$user}->{banned};
-	}
-	return @ret;
-}
-
-# XXX deprecated, should be removed eventually
-sub set_banned_users (@) {
-	my %banned=map { $_ => 1 } @_;
-	my $userinfo=userinfo_retrieve();
-	foreach my $user (keys %{$userinfo}) {
-		$userinfo->{$user}->{banned} = $banned{$user};
-	}
-	return userinfo_store($userinfo);
-}
-
 1
diff --git a/doc/ikiwiki-transition.mdwn b/doc/ikiwiki-transition.mdwn
index 8b7c3579f..3a3529454 100644
--- a/doc/ikiwiki-transition.mdwn
+++ b/doc/ikiwiki-transition.mdwn
@@ -8,11 +8,11 @@ ikiwiki-transition type ...
 
 # DESCRIPTION
 
-`ikiwiki-transition` aids in converting wiki pages when
-there's a major change in ikiwiki syntax. It also handles other transitions
-not involving wiki pages.
+`ikiwiki-transition` aids in converting wiki pages when there's a major
+change in ikiwiki syntax. It also handles other transitions not involving
+wiki pages.
 
-# prefix_directives
+# prefix_directives file ...
 
 The `prefix_directives` mode converts the specified ikiwiki page from
 the old preprocessor directive syntax, requiring a space, to the new
@@ -25,7 +25,7 @@ Note that if the page contains wiki links with spaces, which some
 older versions of ikiwiki accepted, the prefix_directives transition will
 treat these as preprocessor directives and convert them.
 
-# setupformat
+# setupformat your.setup
 
 The `setupformat` mode converts a setup file from using a single `wrappers` block
 to using `cgi_wrapper`, `git_wrapper`, etc.
@@ -33,25 +33,30 @@ to using `cgi_wrapper`, `git_wrapper`, etc.
 Note that all comments and any unusual stuff like perl code in the setup
 file will be lost, as it is entirely rewritten by the transition.
 
-# aggregateinternal
+# aggregateinternal your.setup
 
 The `aggregateinternal` mode moves pages aggregated by the aggregate plugin
 so that the `aggregateinternal` option can be enabled.
 
-# indexdb
+# moveprefs your.setup
+
+Moves values that used to be admin preferences into the setup file.
+
+Note that all comments and any unusual stuff like perl code in the setup
+file will be lost, as it is entirely rewritten by the move.
+
+# indexdb srcdir
 
 The `indexdb` mode handles converting a plain text `.ikiwiki/index` file to
-a binary `.ikiwiki/indexdb`. In this mode, you should specify the srcdir of
-the wiki as the second parameter. You do not normally need to run
+a binary `.ikiwiki/indexdb`. You do not normally need to run
 `ikiwiki-transition indexdb`; ikiwiki will automatically run it as
 necessary.
 
-# hashpassword
+# hashpassword srcdir
 
 The `hashpassword` mode forces any plaintext passwords stored in the
 `.ikiwiki/userdb` file to be replaced with password hashes. (The
-Authen::Passphrase perl module is needed to do this.) In this mode, you
-should specify the srcdir of the wiki as the second parameter. 
+Authen::Passphrase perl module is needed to do this.)
 
 If this is not done explicitly, a user's plaintext password will be
 automatically converted to a hash when a user logs in for the first time
diff --git a/doc/tips/upgrade_to_3.0.mdwn b/doc/tips/upgrade_to_3.0.mdwn
index cf33f4d1c..ef9933583 100644
--- a/doc/tips/upgrade_to_3.0.mdwn
+++ b/doc/tips/upgrade_to_3.0.mdwn
@@ -1,32 +1,30 @@
-Version 3.0 of ikiwiki makes some significant configuration changes, which
+Version 3.0 of ikiwiki makes some significant changes, which
 you will need to deal with when upgrading from ikiwiki 2.x.
 
 [[!toc ]]
 
-# moving settings from Preferences page
-
-The admin preferences page used to have settings for allowed attachments,
-locked pages, and banned users. These three settings have moved to the
-setup file:
-
-	allowed_attachments => "",
-	locked_pages => "",
-	banned_users => "",
-
-If you have not yet upgraded to ikiwiki 3.0, you can look at the admin
-preferences page to see if any of these values is shown there, and copy
-them into the setup file.
-
 ## setup file format change
 
 The layout of the setup file changed in a significant way in version 2.60
 of ikiwiki. If you have not changed yours to the new format, now would be a
-good time to do so. Some new features, like the [[plugins/websetup]] interface,
-need the new format setup file.
+good time to do so. Some new features, like the [[plugins/websetup]]
+interface, need the new format setup file.
   
 You can convert old setup files into the new format by running
 `ikiwiki-transition setupformat your.setup`
 
+# moving settings from Preferences page
+
+The admin preferences page used to have settings for allowed attachments,
+locked pages, and banned users. These three settings have moved to the
+setup file, and will no longer appear on the admin preferences page once
+your wiki is upgraded to 3.0.
+
+You can move these preferences into the setup file by running
+`ikiwiki-transition moveprefs your.setup`
+
+(Make sure you have converted the setuop file to the new format first.)
+
 ## prefix directives
 
 In 3.0, the syntax ikiwiki uses for [[directives|ikiwiki/directive]] has
@@ -70,7 +68,7 @@ about any GlobLists it sees.
 ## aggregateinternal
 
 If your wiki uses the [[aggregate|plugins/aggregate]] plugin, it will start
-to aggregate feeds to special "internal" pages. 
+to aggregate feeds to special "internal" pages.
 
 If you don't want this change, you can add the following to your setup
 file:
diff --git a/ikiwiki-transition b/ikiwiki-transition
index 802cd643d..9a5dd1362 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -159,14 +159,49 @@ sub setupformat {
 	IkiWiki::Setup::dump($setup);
 }
 
+sub moveprefs {
+	my $setup=shift;
+	if (! defined $setup) {
+		usage();
+	}
+
+	require IkiWiki::Setup;
+
+	%config = IkiWiki::defaultconfig();
+	IkiWiki::Setup::load($setup);
+	IkiWiki::checkconfig();
+
+	eval q{use IkiWiki::UserInfo};
+	error $@ if $@;
+
+	foreach my $field (qw{allowed_attachments locked_pages}) {
+		my $orig=$config{$field};
+		foreach my $admin (@{$config{adminuser}}) {
+			my $a=IkiWiki::userinfo_get($admin, $field);
+			if (defined $a && length $a &&
+			    $a ne $orig && # might already have been moved
+			    defined $config{$field} &&
+			    length $config{$field}) {
+				 $config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
+			}
+		}
+	}
+
+	my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
+	$config{banned_users}=[sort keys %banned];
+
+	IkiWiki::Setup::dump($setup);
+}
+
 sub usage {
 	print STDERR "Usage: ikiwiki-transition type ...\n";
 	print STDERR "Currently supported transition subcommands:\n";
-	print STDERR "\tprefix_directives file\n";
+	print STDERR "\tprefix_directives file ...\n";
 	print STDERR "\tindexdb srcdir\n";
 	print STDERR "\thashpassword srcdir\n";
 	print STDERR "\taggregateinternal setupfile\n";
 	print STDERR "\tsetupformat setupfile\n";
+	print STDERR "\tmoveprefs setupfile\n";
 	exit 1;
 }
 
@@ -188,6 +223,9 @@ elsif ($mode eq 'aggregateinternal') {
 elsif ($mode eq 'setupformat') {
 	setupformat(@ARGV);
 }
+elsif ($mode eq 'moveprefs') {
+	moveprefs(@ARGV);
+}
 else {
 	usage();
 }
@@ -245,3 +283,15 @@ sub oldloadindex {
 	
 	return close($in);
 }
+
+# Used to be in IkiWiki/UserInfo, but only used here now.
+sub get_banned_users () {
+	my @ret;
+	my $userinfo=userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		push @ret, $user if $userinfo->{$user}->{banned};
+	}
+	return @ret;
+}
+
+1
-- 
cgit v1.2.3


From 3fbe2569ff39c8e280a48c7623e325ef42ebedce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Dec 2008 16:22:35 -0500
Subject: remove deprecated googlecalendar plugin

---
 IkiWiki/Plugin/googlecalendar.pm | 55 ----------------------------------------
 doc/plugins/discussion.mdwn      |  9 -------
 doc/plugins/googlecalendar.mdwn  | 20 ---------------
 doc/tips/upgrade_to_3.0.mdwn     |  5 ++++
 4 files changed, 5 insertions(+), 84 deletions(-)
 delete mode 100644 IkiWiki/Plugin/googlecalendar.pm
 delete mode 100644 doc/plugins/googlecalendar.mdwn

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/googlecalendar.pm b/IkiWiki/Plugin/googlecalendar.pm
deleted file mode 100644
index fad2ad78f..000000000
--- a/IkiWiki/Plugin/googlecalendar.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/perl
-package IkiWiki::Plugin::googlecalendar;
-
-use warnings;
-use strict;
-use IkiWiki 3.00;
-
-sub import {
-	hook(type => "getsetup", id => "googlecalendar",
-		call => \&getsetup);
-	hook(type => "preprocess", id => "googlecalendar",
-		call => \&preprocess);
-	hook(type => "format", id => "googlecalendar",
-		call => \&format);
-}
-
-sub getsetup () {
-	return
-		plugin => {
-			safe => 1,
-			rebuild => undef,
-		},
-}
-
-sub preprocess (@) {
-	my %params=@_;
-
-	# Parse the html, looking for the url to embed for the calendar.
-	# Avoid XSS attacks..
-	my ($url)=$params{html}=~m#iframe\s+src="http://www\.google\.com/calendar/embed\?([^"<>]+)"#;
-	if (! defined $url || ! length $url) {
-		error gettext("failed to find url in html")
-	}
-	my ($height)=$params{html}=~m#height="(\d+)"#;
-	my ($width)=$params{html}=~m#width="(\d+)"#;
-
-	return "<div class=\"googlecalendar\" src=\"$url\" height=\"$height\" width=\"$width\"></div>";
-}
-
-sub format (@) {
-        my %params=@_;
-
-	$params{content}=~s/<div class=\"googlecalendar" src="([^"]+)" height="([^"]+)" width="([^"]+)"><\/div>/gencal($1,$2,$3)/eg;
-
-        return $params{content};
-}
-
-sub gencal ($$$) {
-	my $url=shift;
-	my $height=shift;
-	my $width=shift;
-	return qq{<iframe src="http://www.google.com/calendar/embed?$url" style=" border-width:0 " width="$width" frameborder="0" height="$height"></iframe>};
-}
-
-1
diff --git a/doc/plugins/discussion.mdwn b/doc/plugins/discussion.mdwn
index 70157f1e2..854307a98 100644
--- a/doc/plugins/discussion.mdwn
+++ b/doc/plugins/discussion.mdwn
@@ -34,12 +34,3 @@ Any objections to listing plugins alphabetically rather than by creation date?
 >> "recently changed" list with the 10 most recently changed plugins
 >> at the top.  That would allow what you suggested, but still allow
 >> the main list to be alphabetical. -- [[Will]]
-
-How about adding a deprecated tag in order to clean up the plugin list?
-
-> AFAIK it's currently the only one. --[[Joey]]
- 
-For instance [[googlecalendar]] is listed as plugin but should probably be removed from Ikiwiki in a future major version (v3?).
-
--- [[AlexandreDupas]]
-
diff --git a/doc/plugins/googlecalendar.mdwn b/doc/plugins/googlecalendar.mdwn
deleted file mode 100644
index bca2ae74f..000000000
--- a/doc/plugins/googlecalendar.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-[[!template id=plugin name=googlecalendar author="[[Joey]]"]]
-[[!tag type/special-purpose]]
-
-*Note*: This plugin is deprecated. Please switch to the [[embed]] plugin.
-
-This plugin allows embedding a google calendar iframe in the wiki.
-Normally, if the [[htmlscrubber]] is enabled, such iframes are scrubbed out
-of the wiki content since they're not very safe if created by malicious
-users. But some iframes are legitimate, and safe, if you trust the embedded
-content. This plugin is an example of how to deal with this in ikiwiki.
-
-Example use:
-
-	\[[!googlecalendar html="""
-	<iframe src="http://www.google.com/calendar/embed?src=adkrdken8mupngh13jshlbenoc%40group.calendar.google.com&title=OSEL%20Calendar&chrome=NAVIGATION&bgcolor=%2371d873&height=588" style=" border-width:0 " width="480" frameborder="0"	height="588"></iframe>
-	"""]]
-
-The iframe should be the one provided by google. Note that it's used in a
-way that avoids cross-site scripting attacks, assuming you trust google's
-content.
diff --git a/doc/tips/upgrade_to_3.0.mdwn b/doc/tips/upgrade_to_3.0.mdwn
index ef9933583..50c420103 100644
--- a/doc/tips/upgrade_to_3.0.mdwn
+++ b/doc/tips/upgrade_to_3.0.mdwn
@@ -86,3 +86,8 @@ Otherwise, follow this procedure to upgrade a wiki using the aggregate plugin:
    files in the srcdir. The command to run is
    `ikiwiki-transition aggregateinternal your.setup`,
 3. Refresh the wiki. (`ikiwiki -setup your.setup -refresh`)
+
+## googlecalendar
+
+This plugin has been deprecated for a long time, and is removed in 3.0. If
+your wiki used it, you should enable the [[plugins/embed]] plugin, instead.
-- 
cgit v1.2.3


From 0d406010ff8ffb8d891318bbaf6b6de1e2cb2578 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Dec 2008 16:31:58 -0500
Subject: googlecalendar: Add runtime deprecation warning.

---
 IkiWiki/Plugin/googlecalendar.pm | 2 ++
 debian/changelog                 | 1 +
 2 files changed, 3 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/googlecalendar.pm b/IkiWiki/Plugin/googlecalendar.pm
index 9e09d7dbb..24c2e1527 100644
--- a/IkiWiki/Plugin/googlecalendar.pm
+++ b/IkiWiki/Plugin/googlecalendar.pm
@@ -5,6 +5,8 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
+print STDERR "warning: the googlecalendar plugin is deprecated and will be removed in ikiwiki 3.0 (use the embed plugin instead)\n";
+
 sub import {
 	hook(type => "getsetup", id => "googlecalendar",
 		call => \&getsetup);
diff --git a/debian/changelog b/debian/changelog
index 7a8985171..19b8cbdf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (2.72) UNRELEASED; urgency=low
   * Avoid comments in recentchanges being broken links (smcv)
   * Add deprecation warning for GlobLists, which will stop working in 3.0.
   * camelcase: Add camelcase_ignore setting.
+  * googlecalendar: Add runtime deprecation warning.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 
-- 
cgit v1.2.3


From 9db06329c98e1a390bbb6323de02dc7e2f45f1f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Dec 2008 14:07:19 -0500
Subject: comments: Deal with users entering unqualified or partial urls.

People seem to be able to expect to enter www.foo.com and get away with it.
The resulting my.wiki/www.foo.com link was not ideal.

To fix it, use URI::Heuristic to expand such things into a real url. It
even looks up hostnames in the DNS if necessary.
---
 IkiWiki/Plugin/comments.pm | 13 +++++++++++--
 debian/changelog           |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0ae9eefe3..d8318d3e3 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -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 {
diff --git a/debian/changelog b/debian/changelog
index 19b8cbdf7..96a70fcc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (2.72) UNRELEASED; urgency=low
   * Add deprecation warning for GlobLists, which will stop working in 3.0.
   * camelcase: Add camelcase_ignore setting.
   * googlecalendar: Add runtime deprecation warning.
+  * comments: Deal with users entering unqualified or partial urls.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 
-- 
cgit v1.2.3


From 7da319efc69089662f9635216bbcc48ca53fe606 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Dec 2008 16:08:33 -0500
Subject: inline: Run format hook first

inline has a format hook that is an optimisation hack. Until this hook
runs, the inlined content is not present on the page. This can prevent
other format hooks, that process that content, from acting on inlined
content. In bug ##509710, we discovered this happened commonly for the
embed plugin, but it could in theory happen for many other plugins (color,
cutpaste, etc) that use format to fill in special html after sanitization.

The ordering was essentially random (hash key order). That's kinda a good
thing, because hooks should be independent of other hooks and able to run
in any order. But for things like inline, that just doesn't work.

To fix the immediate problem, let's make hooks able to be registered as
running "first". There was already the ability to make them run "last".

Now, this simple first/middle/last ordering is obviously not going to work
if a lot of things need to run first, or last, since then we'll be back to
being unable to specify ordering inside those sets. But before worrying about
that too much, and considering dependency ordering, etc, observe how few
plugins use last ordering: Exactly one needs it. And, so far, exactly one
needs first ordering. So for now, KISS.

Another implementation note: I could have sorted the plugins with
first/last/middle as the primary key, and plugin name secondary, to get a
guaranteed stable order. Instead, I chose to preserve hash order. Two
opposing things pulled me toward that decision:

1. Since has order is randomish, it will ensure that no accidental
   ordering assumptions are made.
2. Assume for a minute that ordering matters a lot more than expected.
   Drastically changing the order a particular configuration uses could
   result in a lot of subtle bugs cropping up. (I hope this assumption is
   false, partly due to #1, but can't rule it out.)
---
 IkiWiki.pm               | 16 ++++++++++------
 IkiWiki/Plugin/inline.pm |  4 ++--
 debian/changelog         |  2 ++
 doc/plugins/write.mdwn   |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cc1e89acc..54e00ec7b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1536,15 +1536,19 @@ sub run_hooks ($$) {
 	my $sub=shift;
 
 	if (exists $hooks{$type}) {
-		my @deferred;
+		my (@first, @middle, @last);
 		foreach my $id (keys %{$hooks{$type}}) {
-			if ($hooks{$type}{$id}{last}) {
-				push @deferred, $id;
-				next;
+			if ($hooks{$type}{$id}{first}) {
+				push @first, $id;
+			}
+			elsif ($hooks{$type}{$id}{last}) {
+				push @last, $id;
+			}
+			else {
+				push @middle, $id;
 			}
-			$sub->($hooks{$type}{$id}{call});
 		}
-		foreach my $id (@deferred) {
+		foreach my $id (@first, @middle, @last) {
 			$sub->($hooks{$type}{$id}{call});
 		}
 	}
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8490b455f..58da0beb8 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+!/usr/bin/perl
 # Page inlining and blogging.
 package IkiWiki::Plugin::inline;
 
@@ -22,7 +22,7 @@ sub import {
 		call => \&IkiWiki::preprocess_inline);
 	hook(type => "pagetemplate", id => "inline",
 		call => \&IkiWiki::pagetemplate_inline);
-	hook(type => "format", id => "inline", call => \&format);
+	hook(type => "format", id => "inline", call => \&format, first => 1);
 	# Hook to change to do pinging since it's called late.
 	# This ensures each page only pings once and prevents slow
 	# pings interrupting page builds.
diff --git a/debian/changelog b/debian/changelog
index 96a70fcc9..0fa6590f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (2.72) UNRELEASED; urgency=low
   * camelcase: Add camelcase_ignore setting.
   * googlecalendar: Add runtime deprecation warning.
   * comments: Deal with users entering unqualified or partial urls.
+  * inline: Run format hook first, to ensure other format hooks can affect
+    inlined content.  Closes: #509710
 
  -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index b6fa96f91..9b5cf27f7 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -55,8 +55,8 @@ plugin, and a "call" parameter, which tells what function to call for the
 hook.
 
 An optional "last" parameter, if set to a true value, makes the hook run
-after all other hooks of its type. Useful if the hook depends on some other
-hook being run first.
+after all other hooks of its type, and an optional "first" parameter makes
+it run first. Useful if the hook depends on some other hook being run first.
 
 ## Types of hooks
 
-- 
cgit v1.2.3


From 25879952b1359bcd62dba33f2364c77442358832 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Dec 2008 21:45:12 -0500
Subject: typo

---
 IkiWiki/Plugin/inline.pm |  2 +-
 po/bg.po                 | 83 ++++++++++++++++++++++++------------------------
 po/cs.po                 | 81 +++++++++++++++++++++++-----------------------
 po/da.po                 | 81 +++++++++++++++++++++++-----------------------
 po/de.po                 | 81 +++++++++++++++++++++++-----------------------
 po/es.po                 | 83 ++++++++++++++++++++++++------------------------
 po/fr.po                 | 81 +++++++++++++++++++++++-----------------------
 po/gu.po                 | 81 +++++++++++++++++++++++-----------------------
 po/ikiwiki.pot           | 78 +++++++++++++++++++++------------------------
 po/pl.po                 | 83 ++++++++++++++++++++++++------------------------
 po/sv.po                 | 83 ++++++++++++++++++++++++------------------------
 po/vi.po                 | 83 ++++++++++++++++++++++++------------------------
 12 files changed, 443 insertions(+), 457 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 26bb120a2..d8b5f8548 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -1,4 +1,4 @@
-!/usr/bin/perl
+#!/usr/bin/perl
 # Page inlining and blogging.
 package IkiWiki::Plugin::inline;
 
diff --git a/po/bg.po b/po/bg.po
index 37e249012..0103a110a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -24,7 +24,7 @@ msgstr "Първо трябва да влезете."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr ""
 
@@ -41,88 +41,88 @@ msgstr "Предпочитанията са запазени."
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Грешка"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, fuzzy, perl-format
 msgid "missing %s parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "нов източник"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "съобщения"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "ново"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "премахване на „%s” (на %s дни)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "премахване на „%s”"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "проверка на източника „%s”"
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "не е намерен източник на адрес „%s”"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 #, fuzzy
 msgid "feed not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "данните от източника предизвикаха грешка в модула XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "създаване на нова страницa „%s”"
@@ -159,15 +159,15 @@ msgstr "грешка при запис на файла „%s”: %s"
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr ""
 
@@ -191,12 +191,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -204,45 +204,45 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 #, fuzzy
 msgid "missing page"
 msgstr "липсващ параметър „id” на шаблона"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -336,11 +336,6 @@ msgstr "При използване на приеставката „search” 
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-#, fuzzy
-msgid "failed to find url in html"
-msgstr "приставката „googlecalendar” не намери URL в HTML-кода"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -419,7 +414,7 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "failed to run dot"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -1043,7 +1038,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr ""
 
@@ -1067,6 +1062,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to find url in html"
+#~ msgstr "приставката „googlecalendar” не намери URL в HTML-кода"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "е обработен нормално от %s"
 
diff --git a/po/cs.po b/po/cs.po
index 7ea726c5a..fc6684a5a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -23,7 +23,7 @@ msgstr "Nejprve se musíte přihlásit."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr ""
 
@@ -39,87 +39,87 @@ msgstr "Předvolby"
 msgid "Admin"
 msgstr "Správce"
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Chyba"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 msgid "missing %s parameter"
 msgstr "chybí parametr %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "nový zdroj"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "příspěvky"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "nový"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "expiruji %s (stará %s dnů)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "expiruji %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "kontroluji zdroj %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "nemohu najít zdroj na %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 msgid "feed not found"
 msgstr "zdroj nebyl nalezen"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(neplatné UTF-8 bylo ze zdroje odstraněno)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "zdroj shodil XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "vytvářím novou stránku %s"
@@ -156,15 +156,15 @@ msgstr "nelze změnit velikost: %s"
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr ""
 
@@ -188,12 +188,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -201,45 +201,45 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 #, fuzzy
 msgid "missing page"
 msgstr "chybí hodnoty"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -333,10 +333,6 @@ msgstr "Při používání vyhledávacího modulu musíte zadat %s"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-msgid "failed to find url in html"
-msgstr "v html se nepodařilo nalézt url"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "nepodařilo se spustit graphviz"
@@ -411,7 +407,7 @@ msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 msgid "failed to run dot"
 msgstr "nepodařilo se spustit dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "Stránka %s je zamknutá uživatelem %s a nelze ji měnit"
@@ -1022,7 +1018,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr ""
 
@@ -1046,6 +1042,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "failed to find url in html"
+#~ msgstr "v html se nepodařilo nalézt url"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "zpracováno ok %s"
 
diff --git a/po/da.po b/po/da.po
index 4a016233a..48a4c7744 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2008-10-22 19:13+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -27,7 +27,7 @@ msgstr "Du skal først logge på."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
@@ -43,87 +43,87 @@ msgstr "Indstillinger"
 msgid "Admin"
 msgstr "Admin"
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Indstillinger gemt"
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Fejl"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr "Indsamling udløst via web."
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr "Intet at gøre lige nu, alle fødninger er tidssvarende!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 msgid "missing %s parameter"
 msgstr "mangler parametren %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "ny fødning"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "indlæg"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "nyt"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "udløber %s (%s dage gammel)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "udløber %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "undersøger fødning %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "kunne ikke finde fødning ved %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 msgid "feed not found"
 msgstr "fødning ikke fundet"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(defekt UTF-8 fjernet fra fødning)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(fødningselementer omgået (escaped))"
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "fødning fik XML::Feed til at bryde sammen!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "opretter ny side %s"
@@ -158,15 +158,15 @@ msgstr "Sletning af fil fra S3 mislykkedes: "
 msgid "there is already a page named %s"
 msgstr "der er allerede en side ved navn %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr "forhindret af allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
@@ -190,12 +190,12 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, fuzzy, perl-format
 msgid "unsupported page format %s"
 msgstr "revisionskontrolsystem %s ikke understøttet"
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -203,45 +203,45 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 msgid "missing page"
 msgstr "manglende side"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Siden %s eksisterer ikke."
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 #, fuzzy
 msgid "bad page name"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -333,10 +333,6 @@ msgstr "Skal angive %s når google søgeudvidelsen bruges"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-msgid "failed to find url in html"
-msgstr "lokalisering af url i html mislykkedes"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "graphviz-kørsel mislykkedes"
@@ -408,7 +404,7 @@ msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 msgid "failed to run dot"
 msgstr "dot-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s er låst og kan ikke redigeres"
@@ -1021,7 +1017,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr "ja"
 
@@ -1045,5 +1041,8 @@ msgstr "Hvilken wiki bruger (eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er domænenavnet på webserveren?"
 
+#~ msgid "failed to find url in html"
+#~ msgstr "lokalisering af url i html mislykkedes"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "korrekt dannet ved %s"
diff --git a/po/de.po b/po/de.po
index b0db15a6a..e6f6bfa1e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.70\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2008-11-20 19:58+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -23,7 +23,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr "Ihre Anmeldung für die aktuelle Sitzung ist abgelaufen."
 
@@ -39,87 +39,87 @@ msgstr "Einstellungen"
 msgid "Admin"
 msgstr "Administrator"
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Fehler"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr "Feed-Erstellung wurde über das Web ausgelöst."
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr "Derzeit nichts zu tun, alle Feeds sind auf dem neusten Stand!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 msgid "missing %s parameter"
 msgstr "Parameter %s fehlt"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "neuer Feed"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "Beiträge"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "neu"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "%s läuft aus (%s Tage alt)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "%s läuft aus"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr "zuletzt überprüft am %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "überprüfe Feed %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "konnte Feed unter %s nicht finden"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 msgid "feed not found"
 msgstr "Feed nicht gefunden"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(ungültiges UTF-8-Zeichen wurde aus dem Feed entfernt)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(Feed-Entitäten maskiert)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "Feed führte zum Absturz von XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "erstelle neue Seite %s"
@@ -154,15 +154,15 @@ msgstr "Konnte Datei nicht bei S3 löschen: "
 msgid "there is already a page named %s"
 msgstr "eine Seite mit dem Namen %s existiert bereits"
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr "durch allowed_attachements verboten"
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr "fehlerhafter Dateiname für Anhang"
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr "Anhang hochladen"
 
@@ -186,12 +186,12 @@ msgstr "%s von %s"
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Links!"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nicht unterstütztes Seitenformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -199,44 +199,44 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 msgid "missing page"
 msgstr "fehlende Seite"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Die Seite %s existiert nicht."
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -329,10 +329,6 @@ msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 "Verarbeiten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen"
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-msgid "failed to find url in html"
-msgstr "URL in HTML nicht gefunden"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "konnte graphviz nicht ausführen"
@@ -406,7 +402,7 @@ msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 msgid "failed to run dot"
 msgstr "dot konnte nicht ausgeführt werden"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s wurde gesperrt und kann nicht bearbeitet werden"
@@ -1025,7 +1021,7 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr "ja"
 
@@ -1050,3 +1046,6 @@ msgstr ""
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
+
+#~ msgid "failed to find url in html"
+#~ msgstr "URL in HTML nicht gefunden"
diff --git a/po/es.po b/po/es.po
index 7966d94f9..953e9ee8b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2008-12-19 08:10+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -24,7 +24,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr "Su registro en el sistema ha expirado."
 
@@ -40,88 +40,88 @@ msgstr "Preferencias"
 msgid "Admin"
 msgstr "Administración"
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Error"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr "Contenido añadido activado vía web."
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 msgid "missing %s parameter"
 msgstr "falta el parámetro %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "nueva entrada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "entradas"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "nuevo"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "%s caducada (%s días de antigüedad)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "%s caducada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr "última comprobación el %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "comprobando fuente de datos %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "no puedo encontrar la fuente de datos en %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 msgid "feed not found"
 msgstr "fuente de datos no encontrada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(los caracteres especiales de la fuente de datos están exceptuados)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "creando nueva página %s"
@@ -156,15 +156,15 @@ msgstr "No puedo borrar archivo en S3: "
 msgid "there is already a page named %s"
 msgstr "ya existe una página de nombre %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr "prohibido por la claúsula allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr "nombre de archivo adjunto erróneo"
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
@@ -188,12 +188,12 @@ msgstr "%s desde la página %s"
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato de página %s no soportado"
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr "Un comentario debe tener algún contenido"
 
@@ -201,44 +201,44 @@ msgstr "Un comentario debe tener algún contenido"
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 msgid "missing page"
 msgstr "página no encontrada"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, perl-format
 msgid "commenting on %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -332,11 +332,6 @@ msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 "Error en el análisis del URL, no puedo determinar el nombre del dominio"
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-msgid "failed to find url in html"
-msgstr ""
-"El complemento googlecalendar no ha encontrado un URL en el código html "
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "no he podido ejecutar el programa graphviz "
@@ -410,7 +405,7 @@ msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna
 msgid "failed to run dot"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "La página %s está bloqueada y no puede modificarse"
@@ -1032,7 +1027,7 @@ msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr "si"
 
@@ -1058,6 +1053,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "failed to find url in html"
+#~ msgstr ""
+#~ "El complemento googlecalendar no ha encontrado un URL en el código html "
+
 #~ msgid "processed ok at %s"
 #~ msgstr "proceso completado con éxito a %s"
 
diff --git a/po/fr.po b/po/fr.po
index e45d19cc2..68ebeebfc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.70 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2008-11-19 21:53+0100\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -25,7 +25,7 @@ msgstr "Vous devez d'abord vous identifier."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Échec de l'identification, vous devez autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
@@ -41,87 +41,87 @@ msgstr "Préférences"
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Les préférences ont été enregistrées."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Erreur"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr "Agrégation déclenchée par le web"
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr "Rien à faire pour le moment, tous les flux sont à jour !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 msgid "missing %s parameter"
 msgstr "Paramètre %s manquant"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "Nouveau flux"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "Articles"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "Nouveau"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "Fin de validité de %s (date de %s jours)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "Fin de validité de %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr "dernière vérification : %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "Vérification du flux %s..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "Impossible de trouver de flux à %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 msgid "feed not found"
 msgstr "Flux introuvable "
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(chaîne UTF-8 non valable supprimée du flux)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(échappement des entités de flux)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "Plantage du flux XML::Feed !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "Création de la nouvelle page %s"
@@ -156,15 +156,15 @@ msgstr "Échec lors de la suppression du fichier sur S3 :"
 msgid "there is already a page named %s"
 msgstr "il existe déjà une page nommée %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr "action interdite par allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr "Nom de la pièce jointe incorrect"
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr "envoi de la pièce jointe"
 
@@ -188,12 +188,12 @@ msgstr "%s sur %s"
 msgid "There are no broken links!"
 msgstr "Il n'existe pas de lien cassé !"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "format de page non reconnu %s"
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -201,44 +201,44 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 msgid "missing page"
 msgstr "Page manquante"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "La page %s n'existe pas."
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr "nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -329,10 +329,6 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « google »."
 msgid "Failed to parse url, cannot determine domain name"
 msgstr "Impossible d'analyser l'url, pas de nom de domaine"
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-msgid "failed to find url in html"
-msgstr "Impossible de trouver une URL dans le code HTML"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "Échec du lancement de graphviz"
@@ -406,7 +402,7 @@ msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 msgid "failed to run dot"
 msgstr "Échec du lancement de dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s est verrouillé et ne peut être modifié"
@@ -1027,7 +1023,7 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "une boucle de pré traitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr "oui"
 
@@ -1051,6 +1047,9 @@ msgstr "Identifiant de l'administrateur (utilisateur ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "failed to find url in html"
+#~ msgstr "Impossible de trouver une URL dans le code HTML"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "A été correctement traité à %s"
 
diff --git a/po/gu.po b/po/gu.po
index d31260c71..a070344fd 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -23,7 +23,7 @@ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશ
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr ""
 
@@ -40,87 +40,87 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "ક્ષતિ"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 msgid "missing %s parameter"
 msgstr "ખોવાયેલ %s વિકલ્પ"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "નવું ફીડ"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "પોસ્ટ"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "નવું"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "જુનું કરે છે %s (%s દિવસો જુનું)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "જુનું કરે છે %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "ફીડ %s ચકાસે છે ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "%s પર ફીડ મળી શક્યું નહી"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 msgid "feed not found"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, fuzzy, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે"
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "ફીડ ભાંગી ગયું XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "નવું પાનું %s બનાવે છે"
@@ -157,15 +157,15 @@ msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr ""
 
@@ -189,12 +189,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -202,45 +202,45 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 #, fuzzy
 msgid "missing page"
 msgstr "ખોવાયેલ કિંમતો"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -334,10 +334,6 @@ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કર
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-msgid "failed to find url in html"
-msgstr "htmlમાં યુઆરએલ શોધવામાં નિષ્ફળ"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
@@ -412,7 +408,7 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "failed to run dot"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી"
@@ -1022,7 +1018,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr ""
 
@@ -1046,6 +1042,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "failed to find url in html"
+#~ msgstr "htmlમાં યુઆરએલ શોધવામાં નિષ્ફળ"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "આના પર બરાબર છે %s"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 43663b5b9..bfbaaf0fa 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr ""
 
@@ -40,87 +40,87 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 msgid "missing %s parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 msgid "feed not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr ""
@@ -155,15 +155,15 @@ msgstr ""
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr ""
 
@@ -187,12 +187,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -200,44 +200,44 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 msgid "missing page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -328,10 +328,6 @@ msgstr ""
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-msgid "failed to find url in html"
-msgstr ""
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 msgid "failed to run graphviz"
 msgstr ""
@@ -403,7 +399,7 @@ msgstr ""
 msgid "failed to run dot"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -1005,7 +1001,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 8951b65ce..322d6f070 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są "
 "ciasteczka (ang. cookies)"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr ""
 
@@ -43,88 +43,88 @@ msgstr "Preferencje zapisane."
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Preferencje zapisane."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Błąd"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, fuzzy, perl-format
 msgid "missing %s parameter"
 msgstr "brakujący parametr %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "nowy kanał RSS"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "wpisy"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "nowy wpis"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "wygasający wpis %s (ma już %s dni)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "wygasający wpis %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "sprawdzanie kanału RSS %s..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "nie znaleziono kanału RSS pod adresem %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 #, fuzzy
 msgid "feed not found"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, fuzzy, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS"
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "awaria kanału RSS w module XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "tworzenie nowej strony %s"
@@ -161,15 +161,15 @@ msgstr "awaria w trakcie zmiany rozmiaru: %s"
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr ""
 
@@ -193,12 +193,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -206,45 +206,45 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 #, fuzzy
 msgid "missing page"
 msgstr "brakujące wartości"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -338,11 +338,6 @@ msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-#, fuzzy
-msgid "failed to find url in html"
-msgstr "awaria w trakcie wyszukiwania adresu URL na stronie HTML"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -421,7 +416,7 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "failed to run dot"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -1049,7 +1044,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr ""
 
@@ -1073,6 +1068,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to find url in html"
+#~ msgstr "awaria w trakcie wyszukiwania adresu URL na stronie HTML"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "kanał RSS przetworzony w dniu %s"
 
diff --git a/po/sv.po b/po/sv.po
index 3b1dc3625..1ae6bdad8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -23,7 +23,7 @@ msgstr "Du måste logga in först."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr ""
 
@@ -40,88 +40,88 @@ msgstr "Inställningar sparades."
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Fel"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, fuzzy, perl-format
 msgid "missing %s parameter"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "ny kanal"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "inlägg"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "ny"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "låter %s gå ut (%s dagar gammal)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "låter %s gå ut"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "kontrollerar kanalen %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "kunde inte hitta kanalen på %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 #, fuzzy
 msgid "feed not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "kanalen kraschade XML::Feed!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "skapar nya sidan %s"
@@ -158,15 +158,15 @@ msgstr "misslyckades med att skriva %s: %s"
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr ""
 
@@ -190,12 +190,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -203,45 +203,45 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 #, fuzzy
 msgid "missing page"
 msgstr "mall saknar id-parameter"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -335,11 +335,6 @@ msgstr "Måste ange %s när sökinsticket används"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-#, fuzzy
-msgid "failed to find url in html"
-msgstr "googlecalendar misslyckades med att hitta url i html"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -416,7 +411,7 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "failed to run dot"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s är låst av %s och kan inte redigeras"
@@ -1036,7 +1031,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr ""
 
@@ -1060,6 +1055,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to find url in html"
+#~ msgstr "googlecalendar misslyckades med att hitta url i html"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "behandlad ok på %s"
 
diff --git a/po/vi.po b/po/vi.po
index 896d3037b..f7491b305 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-20 18:07-0500\n"
+"POT-Creation-Date: 2008-12-26 21:41-0500\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -24,7 +24,7 @@ msgstr "Trước tiên bạn cần phải đăng nhập."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
 msgid "Your login session has expired."
 msgstr ""
 
@@ -41,88 +41,88 @@ msgstr "Tùy thích đã được lưu."
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:253
+#: ../IkiWiki/CGI.pm:226
 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 
-#: ../IkiWiki/CGI.pm:271
+#: ../IkiWiki/CGI.pm:241
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Lỗi"
 
-#: ../IkiWiki/Plugin/aggregate.pm:80
+#: ../IkiWiki/Plugin/aggregate.pm:84
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:89
+#: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:216
+#: ../IkiWiki/Plugin/aggregate.pm:220
 #, fuzzy, perl-format
 msgid "missing %s parameter"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:255
 msgid "new feed"
 msgstr "nguồn tin mới"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:269
 msgid "posts"
 msgstr "bài"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:271
 msgid "new"
 msgstr "mới"
 
-#: ../IkiWiki/Plugin/aggregate.pm:431
+#: ../IkiWiki/Plugin/aggregate.pm:435
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "đang mãn hạn %s (cũ %s ngày)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:438
+#: ../IkiWiki/Plugin/aggregate.pm:442
 #, perl-format
 msgid "expiring %s"
 msgstr "đang mãn hạn %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:465
+#: ../IkiWiki/Plugin/aggregate.pm:469
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:473
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "đang kiểm tra nguồn tin %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:474
+#: ../IkiWiki/Plugin/aggregate.pm:478
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "không tìm thấy nguồn tin ở %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:497
 #, fuzzy
 msgid "feed not found"
 msgstr "không tìm thấy mẫu %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:504
+#: ../IkiWiki/Plugin/aggregate.pm:508
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:512
+#: ../IkiWiki/Plugin/aggregate.pm:516
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:520
+#: ../IkiWiki/Plugin/aggregate.pm:524
 msgid "feed crashed XML::Feed!"
 msgstr "nguồn tin đã gây ra XML::Feed sụp đổ."
 
-#: ../IkiWiki/Plugin/aggregate.pm:601
+#: ../IkiWiki/Plugin/aggregate.pm:605
 #, perl-format
 msgid "creating new page %s"
 msgstr "đang tạo trang mới %s"
@@ -159,15 +159,15 @@ msgstr "lỗi ghi %s: %s"
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:65
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:140
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:182
 msgid "attachment upload"
 msgstr ""
 
@@ -191,12 +191,12 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/comments.pm:125
 msgid "comment must have content"
 msgstr ""
 
@@ -204,45 +204,45 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101
+#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
 #, fuzzy
 msgid "missing page"
 msgstr "mẫu thiếu tham số id"
 
-#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103
+#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
 #, perl-format
 msgid "The page %s does not exist."
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:341
+#: ../IkiWiki/Plugin/comments.pm:350
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/comments.pm:359
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:366
+#: ../IkiWiki/Plugin/comments.pm:375
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:468
+#: ../IkiWiki/Plugin/comments.pm:483
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:487
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:598
 msgid "Comments"
 msgstr ""
 
@@ -336,11 +336,6 @@ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
 msgid "Failed to parse url, cannot determine domain name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/googlecalendar.pm:32
-#, fuzzy
-msgid "failed to find url in html"
-msgstr "googlecalendar không tìm thấy địa chỉ URL trong mã HTML"
-
 #: ../IkiWiki/Plugin/graphviz.pm:67
 #, fuzzy
 msgid "failed to run graphviz"
@@ -419,7 +414,7 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 msgid "failed to run dot"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:47
 #, fuzzy, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s bị %s khoá nên không thể sửa được"
@@ -1037,7 +1032,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1688
+#: ../IkiWiki.pm:1661
 msgid "yes"
 msgstr ""
 
@@ -1061,6 +1056,10 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to find url in html"
+#~ msgstr "googlecalendar không tìm thấy địa chỉ URL trong mã HTML"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "đã xử lý được ở %s"
 
-- 
cgit v1.2.3


From 0711c0c548ce1a345b4e3456e2e31be6e27ab339 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Dec 2008 22:20:22 -0500
Subject: comments: Add cache avoidance.

This got lost when we added the jump-to-comment anchor.
---
 IkiWiki/Plugin/comments.pm | 5 ++++-
 debian/changelog           | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ddaa70732..1c10417c3 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -506,7 +506,10 @@ sub sessioncgi ($$) {
 		error($conflict) if defined $conflict;
 
 		# Jump to the new comment on the page.
-		IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location");
+		# The trailing question mark tries to avoid broken
+		# caches and get the most recent version of the page.
+		IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location?updated");
+
 	}
 	else {
 		IkiWiki::showform ($form, \@buttons, $session, $cgi,
diff --git a/debian/changelog b/debian/changelog
index cba0276c3..8449e9ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ikiwiki (3.00) UNRELEASED; urgency=low
   * Replace blank OpenID placeholder logo with an unofficial OpenID
     logo developed by Anna Hess. The official logo does not seem destined to
     be free.
+  * comments: Add cache avoidance.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
 
-- 
cgit v1.2.3


From f34dc3d8bdfce58a628c8af75f3f3e09b604b1aa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Dec 2008 15:08:18 -0500
Subject: htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test
 suite if it is not present.

---
 IkiWiki/Plugin/htmlbalance.pm | 3 ++-
 debian/changelog              | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 261e273aa..26f8e494b 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -10,7 +10,6 @@ package IkiWiki::Plugin::htmlbalance;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-use HTML::TreeBuilder;
 use HTML::Entities;
 
 sub import {
@@ -30,6 +29,8 @@ sub sanitize (@) {
 	my %params=@_;
 	my $ret = '';
 
+	eval q{use HTML::TreeBuilder};
+	error $@ if $@;
 	my $tree = HTML::TreeBuilder->new();
 	$tree->ignore_unknown(0);
 	$tree->ignore_ignorable_whitespace(0);
diff --git a/debian/changelog b/debian/changelog
index 8449e9ce7..3c52bed3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ ikiwiki (3.00) UNRELEASED; urgency=low
     logo developed by Anna Hess. The official logo does not seem destined to
     be free.
   * comments: Add cache avoidance.
+  * htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test suite
+    if it is not present.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
 
-- 
cgit v1.2.3


From 0daa4eb521a32b9ed00e99a2155416a312d478de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 31 Dec 2008 00:08:46 -0500
Subject: make sure value is defined before using it as an array

---
 IkiWiki/Plugin/websetup.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index a47c29976..2d978c5b4 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -138,7 +138,8 @@ sub showfields ($$$@) {
 
 		my $value=$config{$key};
 
-		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
+		if ($info{safe} && defined $value &&
+		    (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
 			$value=[@{$value}, "", ""]; # blank items for expansion
 		}
 
-- 
cgit v1.2.3


From 3e8b7a6b196767d2c7d21790b6ed7c3fb5f70d31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 31 Dec 2008 00:44:54 -0500
Subject: websetup: Avoid a crash when a new array setup item has been added in
  a new ikiwiki release, and is thus not present in the setup file yet.

This happened with camelcase_ignore. The code tried to convert the undef
value for it into an array.
---
 IkiWiki/Plugin/websetup.pm | 5 ++---
 debian/changelog           | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 2d978c5b4..95d044c08 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -138,9 +138,8 @@ sub showfields ($$$@) {
 
 		my $value=$config{$key};
 
-		if ($info{safe} && defined $value &&
-		    (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-			$value=[@{$value}, "", ""]; # blank items for expansion
+		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
+			$value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion
 		}
 
 		if ($info{type} eq "string") {
diff --git a/debian/changelog b/debian/changelog
index 13ceb875f..51c9617f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ ikiwiki (3.00) UNRELEASED; urgency=low
   * htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test suite
     if it is not present.
   * French translation update from Philippe Batailler. Closes: #510216
+  * websetup: Avoid a crash when a new array setup item has been added in 
+    a new ikiwiki release, and is thus not present in the setup file yet.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
 
-- 
cgit v1.2.3


From bc0de40c3c71206c927ec08ee78e8a726abc7995 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 18:26:09 -0500
Subject: A recent change to gitweb removed support for the form of diffurl 
 that many ikiwiki setups use. Document how to use the new url form.

---
 IkiWiki/Plugin/git.pm |  4 ++--
 debian/NEWS           | 15 +++++++++++++++
 debian/changelog      |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 6a7f6c3ae..3085a3b67 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -94,8 +94,8 @@ sub getsetup () {
 		},
 		diffurl => {
 			type => "string",
-			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-			description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], [[sha1_commit]] and [[file]] substituted)",
+			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]",
+			description => "gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)",
 			safe => 1,
 			rebuild => 1,
 		},
diff --git a/debian/NEWS b/debian/NEWS
index 6fe70c9e4..22513cc4a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,18 @@
+ikiwiki (3.01) unstable; urgency=low
+
+  If your wiki uses git, and you have a `diffurl` configured in
+  its setup file, you should be aware that gitweb has stopped
+  supporting the url form commonly used for the `diffurl`.
+
+  You can change your setup to use the newer gitweb url form:
+
+    http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]
+
+  The changes from the old form are the addition of the `hpb` parameter,
+  and the change to the value used for the `hb` parameter.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Jan 2009 18:18:05 -0500
+
 ikiwiki (3.00) unstable; urgency=low
 
   The 3.0 release of ikiwiki changes several defaults and finishes
diff --git a/debian/changelog b/debian/changelog
index f892dc524..afaccc2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.01) UNRELEASED; urgency=low
   * Fix documentation about git hook to use right name. Closes: #510393
   * yesno: Always accept English even when localised.
   * yesno: Also accept 1 and 0 as input.
+  * A recent change to gitweb removed support for the form of diffurl 
+    that many ikiwiki setups use. Document how to use the new url form.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 02 Jan 2009 14:12:16 -0500
 
-- 
cgit v1.2.3


From da166e74227d084fd15878ce9a3099e07ebcc2c2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 15:05:09 -0500
Subject: table: Fix misparsed links in external files

linkify data from external files at the same time as data from an inlined
table would be linkified.
---
 IkiWiki/Plugin/table.pm                    | 20 ++++++++------------
 debian/changelog                           |  6 ++++++
 doc/bugs/links_misparsed_in_CSV_files.mdwn |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 479f3d745..dd124929d 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -50,22 +50,18 @@ sub preprocess (@) {
 			defined $params{delimiter} ? $params{delimiter} : ",",);
 		# linkify after parsing since html link quoting can
 		# confuse CSV parsing
-		if (! exists $params{file}) {
-			@data=map {
-				[ map {
-					IkiWiki::linkify($params{page},
-						$params{destpage}, $_);
-				} @$_ ]
-			} @data;
-		}
+		@data=map {
+			[ map {
+				IkiWiki::linkify($params{page},
+					$params{destpage}, $_);
+			} @$_ ]
+		} @data;
 	}
 	elsif (lc $params{format} eq 'dsv') {
 		# linkify before parsing since wikilinks can contain the
 		# delimiter
-		if (! exists $params{file}) {
-			$params{data} = IkiWiki::linkify($params{page},
-				$params{destpage}, $params{data});
-		}
+		$params{data} = IkiWiki::linkify($params{page},
+			$params{destpage}, $params{data});
 		@data=split_dsv($params{data},
 			defined $params{delimiter} ? $params{delimiter} : "|",);
 	}
diff --git a/debian/changelog b/debian/changelog
index f8eb49030..bf47fda04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.02) UNRELEASED; urgency=low
+
+  * table: Fix misparsed links in external files.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
+
 ikiwiki (3.01) unstable; urgency=low
 
   * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories.
diff --git a/doc/bugs/links_misparsed_in_CSV_files.mdwn b/doc/bugs/links_misparsed_in_CSV_files.mdwn
index 4dae4aeab..27d2b7b1e 100644
--- a/doc/bugs/links_misparsed_in_CSV_files.mdwn
+++ b/doc/bugs/links_misparsed_in_CSV_files.mdwn
@@ -17,7 +17,7 @@ Oh, wait, I see the problem. IkiWiki::linkify is only called if the external fil
 > 
 > Why is linkify not called for external files? Well, I checked the
 > history, and it's probably best to say "for historical reasons that no
-> longer apply".
+> longer apply". So, changed as you suggest. [[done]] --[[Joey]] 
 
 I am rather confused what this check does, and the fact the comments are very different for CSV and DSV when the code is the same doesn't seem to help.
 
-- 
cgit v1.2.3


From e45f13c2a4fcf7db4d1e4b59eb7b563085cc2dd4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 15:26:46 -0500
Subject: typo

---
 IkiWiki/Plugin/skeleton.pm.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 96c4a5d6b..78d358cda 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -89,7 +89,7 @@ sub linkify (@) {
 	return $params{content};
 }
 
-sub scan (@) { #{{{a
+sub scan (@) {
 	my %params=@_;
 
 	debug("skeleton plugin running as scan");
-- 
cgit v1.2.3


From 4ce73f2d88e9a177ad84e19b48a17b2d604a808b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 15:35:53 -0500
Subject: table: Find links in external files in scan pass.

---
 IkiWiki/Plugin/table.pm                 | 22 ++++++++++++++++++++--
 debian/changelog                        |  1 +
 doc/bugs/table_external_file_links.mdwn |  2 ++
 docwiki.setup                           |  2 ++
 po/ikiwiki.pot                          |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index dd124929d..96d63f455 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -8,7 +8,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "table", call => \&getsetup);
-	hook(type => "preprocess", id => "table", call => \&preprocess);
+	hook(type => "preprocess", id => "table", call => \&preprocess, scan => 1);
 }
 
 sub getsetup () {
@@ -27,13 +27,31 @@ sub preprocess (@) {
 	);
 
 	if (exists $params{file}) {
-		if (! $pagesources{$params{file}}) {
+		if (! exists $pagesources{$params{file}}) {
 			error gettext("cannot find file");
 		}
 		$params{data} = readfile(srcfile($params{file}));
 		add_depends($params{page}, $params{file});
 	}
 
+	if (! defined wantarray) {
+		# scan mode --	if the table uses an external file, need to
+		# scan that file too.
+		return unless exists $params{file};
+
+		IkiWiki::run_hooks(scan => sub {
+			shift->(
+				page => $params{page},
+				content => $params{data},
+			);
+		});
+
+		# Preprocess in scan-only mode.
+		IkiWiki::preprocess($params{page}, $params{page}, $params{data}, 1);
+
+		return;
+	}
+
 	if (lc $params{format} eq 'auto') {
 		# first try the more simple format
 		if (is_dsv_data($params{data})) {
diff --git a/debian/changelog b/debian/changelog
index bf47fda04..e79ad04cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.02) UNRELEASED; urgency=low
 
   * table: Fix misparsed links in external files.
+  * table: Find links in external files in scan pass.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/bugs/table_external_file_links.mdwn b/doc/bugs/table_external_file_links.mdwn
index f86808c77..7b35383c5 100644
--- a/doc/bugs/table_external_file_links.mdwn
+++ b/doc/bugs/table_external_file_links.mdwn
@@ -5,3 +5,5 @@ table when the pages the links point to change (are added, removed, etc).
 There seem only two solutions to that bug -- either really make wikilinks
 in an external table file not work (probably by escaping them), 
 or run the preprocess code also in scan (expensive!). --[[Joey]]
+
+[[done]]
diff --git a/docwiki.setup b/docwiki.setup
index 6d732fd6b..ffb4a7c16 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -15,5 +15,7 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
+	cgiurl => "http://me",
+	url => "http://me",
 	add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 560a5b2a1..957c9eea3 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 18:53-0500\n"
+"POT-Creation-Date: 2009-01-06 14:31-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3


From e4b7f6badfdc26afc0b6a86a11404e3d8c82170e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 17:28:26 -0500
Subject: refactor

---
 IkiWiki/Plugin/rename.pm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 54c7faf13..fa0358843 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -390,22 +390,8 @@ sub sessioncgi ($$) {
 				$template->param(error => $rename->{error});
 				if ($rename->{src} ne $rename->{dest}) {
 					$template->param(brokenlinks_checked => 1);
-					$template->param(brokenlinks => [
-						map {
-							{
-								page => htmllink($rename->{dest}, $rename->{dest}, $_,
-										noimageinline => 1)
-							}
-						} @{$rename->{brokenlinks}}
-					]);
-					$template->param(fixedlinks => [
-						map {
-							{
-								page => htmllink($rename->{dest}, $rename->{dest}, $_,
-										noimageinline => 1)
-							}
-						} @{$rename->{fixedlinks}}
-					]);
+					$template->param(brokenlinks => linklist($rename->{dest}, $rename->{brokenlinks}));
+					$template->param(fixedlinks => linklist($rename->{dest}, $rename->{fixedlinks}));
 				}
 				$renamesummary.=$template->output;
 			}
@@ -419,6 +405,22 @@ sub sessioncgi ($$) {
 		exit 0;
 	}
 }
+						
+sub linklist {
+	# generates a list of links in a form suitable for FormBuilder
+	my $dest=shift;
+	my $list=shift;
+	# converts a list of pages into a list of links
+	# in a form suitable for FormBuilder.
+
+	[map {
+		{
+			page => htmllink($dest, $dest, $_,
+					noimageinline => 1,
+				)
+		}
+	} @{$list}]
+}
 
 sub renamepage_hook ($$$$) {
 	my ($page, $src, $dest, $content)=@_;
-- 
cgit v1.2.3


From 72ca231fd0d7f98e85848855be852d1ae6eaa8cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 17:29:12 -0500
Subject: rename: Show full names of affected pages.

---
 IkiWiki/Plugin/rename.pm                                                | 1 +
 debian/changelog                                                        | 1 +
 ...f_successful_rename_should_list_the_full_path_to_affected_pages.mdwn | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index fa0358843..41af3ca4d 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -417,6 +417,7 @@ sub linklist {
 		{
 			page => htmllink($dest, $dest, $_,
 					noimageinline => 1,
+					linktext => pagetitle($_),
 				)
 		}
 	} @{$list}]
diff --git a/debian/changelog b/debian/changelog
index e79ad04cc..55eb4be0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low
 
   * table: Fix misparsed links in external files.
   * table: Find links in external files in scan pass.
+  * rename: Show full names of affected pages.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn b/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn
index 2d9677e7f..132d23463 100644
--- a/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn
+++ b/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn
@@ -10,3 +10,5 @@ The following pages have been automatically modified to update their links to us
 <li><a href="./../../tips/convert_mediawiki_to_ikiwiki/discussion/">discussion</a></li><li><a href="./../../tips/untrusted_git_push/discussion/">discussion</a></li></ul>...
 
 In this situation I think the link to pages should be expanded to show the entire path, since there is quite likely to be a lot of things like "discussion". -- [[users/Jon]]
+
+[[done]]
-- 
cgit v1.2.3


From 551544663db939c8eb32dd78ad74e1514589be25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Jan 2009 11:12:32 -0500
Subject: comments: Fix cache avoidance hack.

The ?updated needs to come before the #anchor or browsers will not follow
the anchor.
---
 IkiWiki/Plugin/comments.pm | 2 +-
 debian/changelog           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 1c10417c3..3a0465dbb 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -508,7 +508,7 @@ sub sessioncgi ($$) {
 		# Jump to the new comment on the page.
 		# The trailing question mark tries to avoid broken
 		# caches and get the most recent version of the page.
-		IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location?updated");
+		IkiWiki::redirect($cgi, urlto($page, undef, 1)."?updated#$location");
 
 	}
 	else {
diff --git a/debian/changelog b/debian/changelog
index 55eb4be0b..f4f9df041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low
   * table: Fix misparsed links in external files.
   * table: Find links in external files in scan pass.
   * rename: Show full names of affected pages.
+  * comments: Fix cache avoidance hack.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
-- 
cgit v1.2.3


From e1e1d37753d357acc6e1128594ea8704777658ff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Jan 2009 15:01:43 -0500
Subject: increment interface version

---
 IkiWiki/Plugin/skeleton.pm.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 78d358cda..4d7b4e717 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -6,7 +6,7 @@ package IkiWiki::Plugin::skeleton;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getopt", id => "skeleton",  call => \&getopt);
-- 
cgit v1.2.3


From 81b088866be5f55433c12e09c90e2ae404a8ed89 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Jan 2009 15:48:07 -0500
Subject: repolist: New plugin to support the rel=vcs-* microformat.

* repolist: New plugin to support the rel=vcs-* microformat.
* goodstuff: Include repolist by default. (But it does nothing until
  configured with the repository locations.)
---
 IkiWiki/Plugin/goodstuff.pm |  1 +
 IkiWiki/Plugin/repolist.pm  | 51 +++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog            |  3 +++
 doc/pagehistory.mdwn        |  3 +++
 doc/plugins/goodstuff.mdwn  |  1 +
 doc/plugins/repolist.mdwn   | 17 +++++++++++++++
 templates/page.tmpl         |  1 +
 7 files changed, 77 insertions(+)
 create mode 100644 IkiWiki/Plugin/repolist.pm
 create mode 100644 doc/plugins/repolist.mdwn

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index 46f2380cf..451cd6f84 100644
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -22,6 +22,7 @@ my @bundle=qw{
 	template
 	toc
 	toggle
+	repolist
 };
 
 sub import {
diff --git a/IkiWiki/Plugin/repolist.pm b/IkiWiki/Plugin/repolist.pm
new file mode 100644
index 000000000..f69ec3988
--- /dev/null
+++ b/IkiWiki/Plugin/repolist.pm
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::repolist;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "repolist",  call => \&getsetup);
+	hook(type => "checkconfig", id => "repolist", call => \&checkconfig);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		repositories => {
+			type => "string",
+			example => ["svn://svn.example.org/wiki/trunk"],
+			description => "URIs of repositories containing the wiki's source",
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+my $relvcs;
+
+sub checkconfig () {
+	if (defined $config{rcs} && $config{repositories}) {
+		$relvcs=join("\n", map {
+			s/"//g; # avoid quotes just in case
+			qq{<link rel="vcs-$config{rcs}" href="$_" title="wiki $config{rcs} repository" />}
+		} @{$config{repositories}});
+		
+		hook(type => "pagetemplate", id => "repolist", call => \&pagetemplate);
+	}
+}
+
+sub pagetemplate (@) {
+	my %params=@_;
+	my $page=$params{page};
+	my $template=$params{template};
+	
+        if (defined $relvcs && $template->query(name => "relvcs")) {
+		$template->param(relvcs => $relvcs);
+	}
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index f4f9df041..74556906e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ikiwiki (3.02) UNRELEASED; urgency=low
   * table: Find links in external files in scan pass.
   * rename: Show full names of affected pages.
   * comments: Fix cache avoidance hack.
+  * repolist: New plugin to support the rel=vcs-* microformat.
+  * goodstuff: Include repolist by default. (But it does nothing until
+    configured with the repository locations.)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/pagehistory.mdwn b/doc/pagehistory.mdwn
index fc2a3f543..465062736 100644
--- a/doc/pagehistory.mdwn
+++ b/doc/pagehistory.mdwn
@@ -3,3 +3,6 @@ revison history of a page. This is enabled by the `historyurl` setting,
 which is used to specify the URL to a web interface such as [[ViewVC]]
 (for Subversion) or [[Gitweb]]. In that url, "\[[file]]" is replaced with
 the name of the file to view.
+
+The [[plugins/repolist]] plugin can suppliment this information with
+urls to the underlying repository of the wiki.
diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
index ed57c0f01..ee1bffcfa 100644
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@@ -24,5 +24,6 @@ Currently included:
 * [[template]]
 * [[toc]]
 * [[toggle]]
+* [[repolist]]
 
 New plugins will be added to this bundle from time to time.
diff --git a/doc/plugins/repolist.mdwn b/doc/plugins/repolist.mdwn
new file mode 100644
index 000000000..9b3a7575e
--- /dev/null
+++ b/doc/plugins/repolist.mdwn
@@ -0,0 +1,17 @@
+[[!template id=plugin name=repolist author="[[Joey]]"]]
+[[!tag type/useful]]
+
+This plugin allows you to configure ikiwiki with the location of
+[[rcs]] repositories for your wiki's source. This is done via the
+"repositories" setting in the setup file. Once you tell it where the source
+to your wiki can be downloaded from, this information can be published on
+your wiki in various ways.
+
+This plugin supports the [rel-vcs-*](http://kitenet.net/~joey/rfc/rel-vcs/)
+microformat, and uses it to embed the repository location information in
+every wiki page.
+
+By using this plugin, you will make [[Joey]] very happy, as he will be able
+to easily check out the source of your wiki, for purposes of debugging and
+general curiosity. More generally, making it easy for others to find the
+repository for your wiki is just a Plain Good Idea(TM).
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f75491127..29ba688c7 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -13,6 +13,7 @@
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
 <TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
 <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
 </head>
 <body>
-- 
cgit v1.2.3


From d70b05971f6491df83940834ca169c86e426af97 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 10 Jan 2009 11:29:56 +0000
Subject: comments: only try to insert commentuser etc. into templates if the
 page contained [[!_comment]]

---
 IkiWiki/Plugin/comments.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3a0465dbb..89410bb70 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -604,6 +604,12 @@ sub pagetemplate (@) {
 		}
 	}
 
+	# everything below this point is only relevant to the comments
+	# themselves
+	if (!exists $commentstate{$page}) {
+		return;
+	}
+
 	if ($template->query(name => 'commentuser')) {
 		$template->param(commentuser =>
 			$commentstate{$page}{commentuser});
-- 
cgit v1.2.3


From 79676ca44561a412a2d4d1b98f28c14b55048125 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 10 Jan 2009 11:31:24 +0000
Subject: comments: if the remove plugin is enabled, append a "Remove comment"
 link

---
 IkiWiki/Plugin/comments.pm |  8 ++++++++
 templates/comment.tmpl     | 11 +++++++++++
 2 files changed, 19 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 89410bb70..1c4ab4895 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -634,6 +634,14 @@ sub pagetemplate (@) {
 		$template->param(commentauthorurl =>
 			$commentstate{$page}{commentauthorurl});
 	}
+
+	if ($template->query(name => 'removeurl') &&
+	    IkiWiki::Plugin::remove->can("check_canremove") &&
+	    length $config{cgiurl}) {
+		$template->param(removeurl => IkiWiki::cgiurl(do => 'remove',
+			page => $page));
+		$template->param(have_actions => 1);
+	}
 }
 
 package IkiWiki::PageSpec;
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 6f2b1619e..582efccb8 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -39,4 +39,15 @@ Comment by
 
 &mdash; <TMPL_VAR CTIME>
 </div>
+
+<TMPL_IF NAME="HAVE_ACTIONS">
+<div class="actions">
+<ul>
+<TMPL_IF NAME="REMOVEURL">
+<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
+</TMPL_IF>
+</ul>
+</div><!--.actions-->
+</TMPL_IF>
+
 </div><!--.comment-->
-- 
cgit v1.2.3


From 7a8ea68fc0bba9f75ba81a9547d359f42e31caa4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Jan 2009 14:36:03 -0500
Subject: Consistently allow use of relative paths in all PageSpecs that take a
 page name parameter. Previously, match_created_before(),
 match_created_after(), match_sourcepage(), and match_destpage() did not
 support that, and the docs were not clear.

---
 IkiWiki.pm                                 | 6 ++++++
 IkiWiki/Plugin/conditional.pm              | 4 ++++
 debian/changelog                           | 4 ++++
 doc/todo/relative_pagespec_deficiency.mdwn | 2 ++
 4 files changed, 16 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 892b5b5a8..4601d8590 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1880,6 +1880,9 @@ sub match_backlink ($$;@) {
 sub match_created_before ($$;@) {
 	my $page=shift;
 	my $testpage=shift;
+	my %params=@_;
+	
+	$testpage=derel($testpage, $params{location});
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
@@ -1897,6 +1900,9 @@ sub match_created_before ($$;@) {
 sub match_created_after ($$;@) {
 	my $page=shift;
 	my $testpage=shift;
+	my %params=@_;
+	
+	$testpage=derel($testpage, $params{location});
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 4f3577b34..7445dbdad 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -87,6 +87,8 @@ sub match_sourcepage ($$;@) {
 	shift;
 	my $glob=shift;
 	my %params=@_;
+	
+	$glob=derel($glob, $params{location});
 
 	return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
 	if (match_glob($params{sourcepage}, $glob, @_)) {
@@ -102,6 +104,8 @@ sub match_destpage ($$;@) {
 	my $glob=shift;
 	my %params=@_;
 	
+	$glob=derel($glob, $params{location});
+
 	return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
 	if (match_glob($params{destpage}, $glob, @_)) {
 		return IkiWiki::SuccessReason->new("destpage matches $glob");
diff --git a/debian/changelog b/debian/changelog
index 61aee299d..13ef9afed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ ikiwiki (3.02) UNRELEASED; urgency=low
   * goodstuff: Include repolist by default. (But it does nothing until
     configured with the repository locations.)
   * comments: Add support for removing comments via web interface. (smcv)
+  * Consistently allow use of relative paths in all PageSpecs
+    that take a page name parameter. Previously, match_created_before(),
+    match_created_after(), match_sourcepage(), and match_destpage()
+    did not support that, and the docs were not clear.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/todo/relative_pagespec_deficiency.mdwn b/doc/todo/relative_pagespec_deficiency.mdwn
index 9fdfe74b1..4500581c7 100644
--- a/doc/todo/relative_pagespec_deficiency.mdwn
+++ b/doc/todo/relative_pagespec_deficiency.mdwn
@@ -4,3 +4,5 @@ such as `bdale/blog`, you cannot do
 references.
 
 The other pagespec functions should too, where appropriate.
+
+[[done]]
-- 
cgit v1.2.3


From 85dcc2958a6f092a2841b4bb232a327dbf5c30b5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Jan 2009 14:27:27 -0500
Subject: pinger: Get whole url, don't just head.

Asking for only the head worked in my tests, but I've found a site where it
didn't -- apparently ikiwiki didn't get a chance to do or finish the
refresh when HEADed. Getting the whole url, waiting for ikiwiki to finish,
avoided the update problem.
---
 IkiWiki/Plugin/pinger.pm | 2 +-
 debian/changelog         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index 4a8088661..c20ecb5d4 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -106,7 +106,7 @@ sub ping {
 			# will still be avoided.
 			next if $url=~/^\Q$config{cgiurl}\E/;
 			
-			$ua->head($url);
+			$ua->get($url);
 		}
 		
 		exit 0;
diff --git a/debian/changelog b/debian/changelog
index 13ef9afed..6772aded9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low
     that take a page name parameter. Previously, match_created_before(),
     match_created_after(), match_sourcepage(), and match_destpage()
     did not support that, and the docs were not clear.
+  * pinger: Get whole url, don't just head.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
-- 
cgit v1.2.3


From 362a3295563a11ae93370d365d9b0369d0726199 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Jan 2009 19:34:50 -0500
Subject: remove xxx comment

IIRC I analised this and the code is right
---
 IkiWiki/Plugin/comments.pm | 2 --
 1 file changed, 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 1c4ab4895..16f9a873f 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -343,8 +343,6 @@ sub sessioncgi ($$) {
 		error(gettext("bad page name"));
 	}
 
-	# FIXME: is this right? Or should we be using the candidate subpage
-	# (whatever that might mean) as the base URL?
 	my $baseurl = urlto($page, undef, 1);
 
 	$form->title(sprintf(gettext("commenting on %s"),
-- 
cgit v1.2.3


From f7b2cfcf50f12ad6ce7358f74e8db9d6083aa284 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Jan 2009 20:46:55 -0500
Subject: checkcontent: New hook, can be used to implement arbitrary content
 filters, including spam filters.

---
 IkiWiki/Plugin/comments.pm | 13 ++++++++++--
 IkiWiki/Plugin/editpage.pm | 53 ++++++++++++++++++++++++++++++++++++++++------
 debian/changelog           |  2 ++
 doc/plugins/write.mdwn     | 22 ++++++++++++++++++-
 4 files changed, 80 insertions(+), 10 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 16f9a873f..14e785c8f 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -467,9 +467,18 @@ sub sessioncgi ($$) {
 	}
 
 	if ($form->submitted eq POST_COMMENT && $form->validate) {
-		my $file = "$location._comment";
-
 		IkiWiki::checksessionexpiry($cgi, $session);
+		
+		IkiWiki::check_content(content => $form->field('editcontent'),
+			subject => $form->field('subject'),
+			$config{comments_allowauthor} ? (
+				author => $form->field('author'),
+				url => $form->field('url'),
+			) : (),
+			page => $location,
+			cgi => $cgi, session => $session);
+		
+		my $file = "$location._comment";
 
 		# FIXME: could probably do some sort of graceful retry
 		# on error? Would require significant unwinding though
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index ed994306f..bba52e4fd 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -78,7 +78,43 @@ sub check_canedit ($$$;$) {
 			}
 		}
 	});
-	return $canedit;
+	return defined $canedit ? $canedit : 1;
+}
+
+sub check_content (@) {
+	my %params=@_;
+	
+	return 1 if ! exists $hooks{checkcontent}; # optimisation
+
+	if (exists $pagesources{$params{page}}) {
+		my @diff;
+		my %old=map { $_ => 1 }
+		        split("\n", readfile(srcfile($pagesources{$params{page}})));
+		foreach my $line (split("\n", $params{content})) {
+			push @diff, $line if ! exists $old{$_};
+		}
+		$params{content}=join("\n", @diff);
+	}
+
+	my $ok;
+	run_hooks(checkcontent => sub {
+		return if defined $ok;
+		my $ret=shift->(%params);
+		if (defined $ret) {
+			if ($ret eq "") {
+				$ok=1;
+			}
+			elsif (ref $ret eq 'CODE') {
+				$ret->();
+				$ok=0;
+			}
+			elsif (defined $ret) {
+				error($ret);
+			}
+		}
+
+	});
+	return defined $ok ? $ok : 1;
 }
 
 sub cgi_editpage ($$) {
@@ -368,8 +404,17 @@ sub cgi_editpage ($$) {
 			showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
 			exit;
 		}
+			
+		my $message="";
+		if (defined $form->field('comments') &&
+		    length $form->field('comments')) {
+			$message=$form->field('comments');
+		}
 		
 		my $content=$form->field('editcontent');
+		check_content(content => $content, page => $page,
+			cgi => $q, session => $session,
+			subject => $message);
 		run_hooks(editcontent => sub {
 			$content=shift->(
 				content => $content,
@@ -403,12 +448,6 @@ sub cgi_editpage ($$) {
 		
 		my $conflict;
 		if ($config{rcs}) {
-			my $message="";
-			if (defined $form->field('comments') &&
-			    length $form->field('comments')) {
-				$message=$form->field('comments');
-			}
-			
 			if (! $exists) {
 				rcs_add($file);
 			}
diff --git a/debian/changelog b/debian/changelog
index f35606148..b75fe6afc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ ikiwiki (3.02) UNRELEASED; urgency=low
     behave better.
   * Add auto-blog.setup, which will set up an ikiwiki instance tuned for use
     in blogging.
+  * checkcontent: New hook, can be used to implement arbitrary content
+    filters, including spam filters.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 405876d58..99eea3d16 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -303,7 +303,7 @@ can check if the session object has a "name" parameter set.
 
 ### canedit
 
-	hook(type => "canedit", id => "foo", call => \&pagelocked);
+	hook(type => "canedit", id => "foo", call => \&canedit);
 
 This hook can be used to implement arbitrary access methods to control when
 a page can be edited using the web interface (commits from revision control
@@ -321,6 +321,26 @@ This hook should avoid directly redirecting the user to a signin page,
 since it's sometimes used to test to see which pages in a set of pages a
 user can edit.
 
+### checkcontent
+	
+	hook(type => "checkcontent", id => "foo", call => \&checkcontent);
+
+This hook is called to check the content a user has entered on a page,
+before it is saved, and decide if it should be allowed.
+
+It is passed named parameters: `content`, `page`, `cgi`, and `session`. If
+the content the user has entered is a comment, it may also be passed some
+additional parameters: `author`, `url`, and `subject`. The `subject`
+parameter may also be filled with the user's comment about the change.
+
+Note: When the user edits an existing wiki page, the passed `content` will
+include only the lines that they added to the page, or modified.
+
+The hook should return `undef` on success. If the content is disallowed, it
+should return a message stating what the problem is, or a function
+that can be run to perform whatever action is necessary to allow the user
+to post the content.
+
 ### editcontent
 
 	hook(type => "editcontent", id => "foo", call => \&editcontent);
-- 
cgit v1.2.3


From ae20879e843c1f65d6af3f9da24634414f7aed51 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Jan 2009 21:07:40 -0500
Subject: add new hook to skeleton

---
 IkiWiki/Plugin/skeleton.pm.example | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 4d7b4e717..ea7d6e47f 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -30,6 +30,7 @@ sub import {
 	hook(type => "auth", id => "skeleton", call => \&auth);
 	hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
 	hook(type => "canedit", id => "skeleton", call => \&canedit);
+	hook(type => "checkcontent", id => "skeleton", call => \&checkcontent);
 	hook(type => "editcontent", id => "skeleton", call => \&editcontent);
 	hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "skeleton", call => \&formbuilder);
@@ -180,6 +181,12 @@ sub canedit ($$$) {
 	debug("skeleton plugin running in canedit");
 }
 
+sub checkcontent (@) {
+	my %params=@_;
+
+	debug("skeleton plugin running in checkcontent");
+}
+
 sub editcontent ($$$) {
 	my %params=@_;
 
-- 
cgit v1.2.3


From 16c56af605f40db843b859c537d42494e33ae4c4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Jan 2009 21:58:05 -0500
Subject: make postcomment() pagespecs work while in checkcontent

---
 IkiWiki/Plugin/comments.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 14e785c8f..833bedf25 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -469,6 +469,7 @@ sub sessioncgi ($$) {
 	if ($form->submitted eq POST_COMMENT && $form->validate) {
 		IkiWiki::checksessionexpiry($cgi, $session);
 		
+		$postcomment=1;
 		IkiWiki::check_content(content => $form->field('editcontent'),
 			subject => $form->field('subject'),
 			$config{comments_allowauthor} ? (
@@ -476,7 +477,9 @@ sub sessioncgi ($$) {
 				url => $form->field('url'),
 			) : (),
 			page => $location,
-			cgi => $cgi, session => $session);
+			cgi => $cgi, session => $session
+		);
+		$postcomment=0;
 		
 		my $file = "$location._comment";
 
-- 
cgit v1.2.3


From 7ee92cab4095fb22d77a0b0100a472c6901eb519 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Jan 2009 22:39:11 -0500
Subject: blogspam: New plugin, adding spam filtering for page editing /
 comment posting using the BlogSpam.net API.

---
 IkiWiki/Plugin/blogspam.pm         | 111 +++++++++++++++++++++++++++++++++++++
 debian/changelog                   |   2 +
 doc/plugins/blogspam.mdwn          |  23 ++++++++
 doc/todo/anti-spam_protection.mdwn |  11 ++++
 t/syntax.t                         |   4 +-
 5 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100644 IkiWiki/Plugin/blogspam.pm
 create mode 100644 doc/plugins/blogspam.mdwn

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
new file mode 100644
index 000000000..6e68a9856
--- /dev/null
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -0,0 +1,111 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::blogspam;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+require RPC::XML;
+require RPC::XML::Client;
+
+my $defaulturl='http://test.blogspam.net:8888/';
+
+sub import {
+	hook(type => "getsetup", id => "blogspam",  call => \&getsetup);
+	hook(type => "checkcontent", id => "blogspam", call => \&checkcontent);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		},
+		blogspam_pagespec => {
+			type => 'pagespec',
+			example => 'postcomment(*)',
+			description => 'PageSpec of pages to check for spam',
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 0,
+		},
+		blogspam_options => {
+			type => "string",
+			example => "blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10",
+			description => "options to send to blogspam server",
+			link => "http://blogspam.net/api/testComment.html#options",
+			safe => 1,
+			rebuild => 0,
+		},
+		blogspam_server => {
+			type => "string",
+			default => $defaulturl,
+			description => "blogspam server XML-RPC url",
+			safe => 1,
+			rebuild => 0,
+		},
+}
+
+sub checkcontent (@) {
+	my %params=@_;
+	
+ 	if (exists $config{blogspam_pagespec}) {
+		return undef
+			if ! pagespec_match($params{page}, $config{blogspam_pagespec},
+	                	location => $params{page});
+	}
+
+	my $url=$defaulturl;
+	$url = $params{blogspam_server} if exists $params{blogspam_server};
+	my $client = RPC::XML::Client->new($url);
+
+	my @options = split(",", $params{blogspam_options})
+		if exists $params{blogspam_options};
+
+	# Allow short comments and whitespace-only edits, unless the user
+	# has overridden min-words themselves.
+	push @options, "min-words=0"
+		unless grep /^min-words=/i, @options;
+	# Wiki pages can have a lot of urls, unless the user specifically
+	# wants to limit them.
+	push @options, "exclude=lotsaurls"
+		unless grep /^max-links/i, @options;
+	# Unless the user specified a size check, disable such checking.
+	push @options, "exclude=size"
+		unless grep /^(?:max|min)-size/i, @options;
+	# This test has absurd false positives on words like "alpha"
+	# and "buy".
+	push @options, "exclude=stopwords";
+
+	# blogspam API does not have a field for author url, so put it in
+	# the content to be checked.
+	if (exists $params{url}) {
+		$params{content}.="\n".$params{url};
+	}
+
+	my $res = $client->send_request('testComment', {
+		ip => $ENV{REMOTE_ADDR},
+		comment => $params{content},
+		subject => defined $params{subject} ? $params{subject} : "",
+		name => defined $params{author} ? $params{author} : "",
+		options => join(",", @options),
+		site => $config{url},
+		version => "ikiwiki ".$IkiWiki::version,
+	});
+
+	if (! ref $res || ! defined $res->value) {
+		debug("failed to get response from blogspam server ($url)");
+		return undef;
+	}
+	elsif ($res->value =~ /^SPAM:(.*)/) {
+		return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$1;
+	}
+	elsif ($res->value ne 'OK') {
+		debug(gettext("blogspam server failure: ").$res->value);
+		return undef;
+	}
+	else {
+		return undef;
+	}
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index b75fe6afc..cb362d6e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ ikiwiki (3.02) UNRELEASED; urgency=low
     in blogging.
   * checkcontent: New hook, can be used to implement arbitrary content
     filters, including spam filters.
+  * blogspam: New plugin, adding spam filtering for page editing / comment
+    posting using the BlogSpam.net API.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/plugins/blogspam.mdwn b/doc/plugins/blogspam.mdwn
new file mode 100644
index 000000000..307d4646d
--- /dev/null
+++ b/doc/plugins/blogspam.mdwn
@@ -0,0 +1,23 @@
+[[!template id=plugin name=blogspam author="[[Joey]]"]]
+[[!tag type/auth]]
+
+This plugin adds antispam support to ikiwiki, using the
+[blogspam.net](http://blogspam.net/) API. Both page edits and
+[[comment|comments]] postings can be checked for spam. Currently,
+detected spam is not saved for human review, it is just rejected.
+
+You can control how content is tested via the `blogspam_options`
+setting. By default, the options are configured in a way that is
+appropriate for wiki content. This includes turning off some of the
+more problimatic tests.
+
+The `blogspam_pagespec` setting is a [[ikiwiki/PageSpec]] that can be
+used to configure which pages are checked for spam. The default is to check
+all edits. If you only want to check [[comments]] (not wiki page edits),
+set it to "postcomment(*)".
+
+By default, the blogspam.net server is used to do the spam checking. To
+change this, the `blogspam_server` option can be set to the url for a
+different server implementing the same API. Note that content is sent
+unencrypted over the internet to the server, and the server sees
+the full text of the content.
diff --git a/doc/todo/anti-spam_protection.mdwn b/doc/todo/anti-spam_protection.mdwn
index cb45faee5..b0524be5f 100644
--- a/doc/todo/anti-spam_protection.mdwn
+++ b/doc/todo/anti-spam_protection.mdwn
@@ -17,3 +17,14 @@ Cheers,
 You might look at the Wikipedia page on "Spam\_in\_blogs" for more ideas.  In particular, would it be possible to force a subset of the pages (by regex, but you'd choose the regex to match those pages which are publicly writable) to use rel="nofollow" in all links.
 
 > I just wanted to leave a link here to the [[todo/require_CAPTCHA_to_edit]] plugin patch.  Unfortunately that plugin currently interacts badly with the openid plugin. -- [[Will]]
+
+
+---
+
+Ikiwiki now has a checkcontent hook that plugins can use to see content
+that is being entered and check it for spam/whatever.
+
+There is a blogspam plugin that uses the blogspam.org service
+to check for common spam signatures. --[[Joey]] 
+
+[[done]]
diff --git a/t/syntax.t b/t/syntax.t
index d09d17f7f..9d5cbc373 100755
--- a/t/syntax.t
+++ b/t/syntax.t
@@ -5,8 +5,8 @@ use Test::More;
 
 my @progs="ikiwiki.in";
 my @libs="IkiWiki.pm";
-# monotone, external, amazon_s3 skipped since they need perl modules
-push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v amazon_s3.pm`;
+# monotone, external, blogspam, amazon_s3 skipped since they need perl modules
+push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v blogspam.pm | grep -v amazon_s3.pm`;
 push @libs, 'IkiWiki/Plugin/skeleton.pm.example';
 
 plan(tests => (@progs + @libs));
-- 
cgit v1.2.3


From 4bede22e4f2189a570ea43dec3b087052ef85edc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Jan 2009 13:39:53 -0500
Subject: use short names in comittype

Use mtn for monontone and hg for mercurial. The long names cause ugly
formatting in recentchanges, which has CSS that only allows a few
characters for the commit type column.
---
 IkiWiki/Plugin/mercurial.pm | 2 +-
 IkiWiki/Plugin/monotone.pm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 82423286d..6c4855e57 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -217,7 +217,7 @@ sub rcs_recentchanges ($) {
 		push @ret, {
 			rev        => $info->{"changeset"},
 			user       => $user,
-			committype => "mercurial",
+			committype => "hg",
 			when       => str2time($info->{"date"}),
 			message    => [@message],
 			pages      => [@pages],
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 38abb9a07..bdb564a71 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -559,7 +559,7 @@ sub rcs_recentchanges ($) {
 					if ($cert->{key} eq $config{mtnkey}) {
 						$committype = "web";
 					} else {
-						$committype = "monotone";
+						$committype = "mtn";
 					}
 				} elsif ($cert->{name} eq "date") {
 					$when = str2time($cert->{value}, 'UTC');
-- 
cgit v1.2.3


From cd2ddb57a5a20e308cee912e26f2383733c11b3c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Jan 2009 14:56:48 -0500
Subject: load rpc xml lib on the fly

This way, enabling the plugin via websetup is safe, it can't leave
ikiwiki in a broken state.
---
 IkiWiki/Plugin/blogspam.pm | 11 +++++++++--
 t/syntax.t                 |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 6e68a9856..4005e9f2a 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -4,8 +4,6 @@ package IkiWiki::Plugin::blogspam;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-require RPC::XML;
-require RPC::XML::Client;
 
 my $defaulturl='http://test.blogspam.net:8888/';
 
@@ -47,6 +45,15 @@ sub getsetup () {
 
 sub checkcontent (@) {
 	my %params=@_;
+
+	eval q{
+		use RPC::XML;
+		use RPC::XML::Client;
+	};
+	if ($@) {
+		warn($@);
+		return undef;
+	}
 	
  	if (exists $config{blogspam_pagespec}) {
 		return undef
diff --git a/t/syntax.t b/t/syntax.t
index 9d5cbc373..d09d17f7f 100755
--- a/t/syntax.t
+++ b/t/syntax.t
@@ -5,8 +5,8 @@ use Test::More;
 
 my @progs="ikiwiki.in";
 my @libs="IkiWiki.pm";
-# monotone, external, blogspam, amazon_s3 skipped since they need perl modules
-push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v blogspam.pm | grep -v amazon_s3.pm`;
+# monotone, external, amazon_s3 skipped since they need perl modules
+push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v amazon_s3.pm`;
 push @libs, 'IkiWiki/Plugin/skeleton.pm.example';
 
 plan(tests => (@progs + @libs));
-- 
cgit v1.2.3


From 6b681ed299191b4b803277f56e56a16dfa9906a5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Jan 2009 15:39:08 -0500
Subject: blogspam api now supports homepage link

---
 IkiWiki/Plugin/blogspam.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 4005e9f2a..cc6e840f0 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -83,17 +83,12 @@ sub checkcontent (@) {
 	# and "buy".
 	push @options, "exclude=stopwords";
 
-	# blogspam API does not have a field for author url, so put it in
-	# the content to be checked.
-	if (exists $params{url}) {
-		$params{content}.="\n".$params{url};
-	}
-
 	my $res = $client->send_request('testComment', {
 		ip => $ENV{REMOTE_ADDR},
 		comment => $params{content},
 		subject => defined $params{subject} ? $params{subject} : "",
 		name => defined $params{author} ? $params{author} : "",
+		link => exists $params{url} ? $params{url} : "",
 		options => join(",", @options),
 		site => $config{url},
 		version => "ikiwiki ".$IkiWiki::version,
-- 
cgit v1.2.3


From b7cd40c1bb0e0c88155c0948f8475db3479153c8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 18 Jan 2009 16:42:12 +0000
Subject: Add underlay plugin

---
 IkiWiki/Plugin/underlay.pm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 IkiWiki/Plugin/underlay.pm

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
new file mode 100644
index 000000000..380d418fb
--- /dev/null
+++ b/IkiWiki/Plugin/underlay.pm
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::underlay;
+# Copyright © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+# Licensed under the GNU GPL, version 2, or any later version published by the
+# Free Software Foundation
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "underlay",  call => \&getsetup);
+	hook(type => "checkconfig", id => "underlay", call => \&checkconfig);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 0,
+			rebuild => undef,
+		},
+		add_underlays => {
+			type => "string",
+			default => [],
+			description => "extra underlay directories to add",
+			advanced => 1,
+			safe => 0,
+			rebuild => 1,
+		},
+}
+
+sub checkconfig () {
+	return unless exists $config{add_underlays};
+
+	foreach my $dir (@{$config{add_underlays}}) {
+		add_underlay($dir);
+	}
+}
+
+1;
-- 
cgit v1.2.3


From c89925048f6c0b149d09b76ff122da2205b6ec86 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 18 Jan 2009 16:27:43 +0000
Subject: Add meta field "updated", which can alter the <updated> Atom element

Some aggregators, like Planet, sort by mtime rather than ctime. This
means that posts with modified content come to the top (which seems odd
to me, but is presumably what the aggregator's author or operator
wants), but it also means that posts with insignificant edits (like
adding tags) come to the top too. Atom defines <updated> to be the date
of the last *significant* change, so it's fine that ikiwiki defaults to
using the mtime, but it would be good to have a way for the author to
say "that edit was insignificant, don't use that mtime".
---
 IkiWiki/Plugin/inline.pm        | 12 +++++++++---
 IkiWiki/Plugin/meta.pm          |  7 +++++++
 doc/ikiwiki/directive/meta.mdwn |  9 +++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d8b5f8548..2205ebffc 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -519,9 +519,15 @@ sub genfeed ($$$$$@) {
 			mdate_3339 => date_3339($pagemtime{$p}),
 		);
 
-		if (exists $pagestate{$p} &&
-		    exists $pagestate{$p}{meta}{guid}) {
-			$itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+		if (exists $pagestate{$p}) {
+			if (exists $pagestate{$p}{meta}{guid}) {
+				$itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+			}
+
+			if (exists $pagestate{$p}{meta}{updated}) {
+				$itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
+				$itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
+			}
 		}
 
 		if ($itemtemplate->query(name => "enclosure")) {
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 15bb29b3f..4a22fed30 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -128,6 +128,13 @@ sub preprocess (@) {
 			$IkiWiki::pagectime{$page}=$time if defined $time;
 		}
 	}
+	elsif ($key eq 'updated') {
+		eval q{use Date::Parse};
+		if (! $@) {
+			my $time = str2time($value);
+			$pagestate{$page}{meta}{updated}=$time if defined $time;
+		}
+	}
 
 	if (! defined wantarray) {
 		# avoid collecting duplicate data during scan pass
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 74db31943..f29a118bf 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -139,6 +139,15 @@ Supported fields:
   pages unchanged and avoid_flooding_aggregators
   (see [[!iki tips/howto_avoid_flooding_aggregators]]).
 
+* updated
+
+  Specifies a fake modification time for a page, to be output into RSS and
+  Atom feeds. This is useful to avoid flooding aggregators that sort by
+  modification time, like Planet: for instance, when editing an old blog post
+  to add tags, you could set `updated` to be one second later than the original
+  value. The date/time can be given in any format that
+  [[!cpan TimeDate]] can understand, just like the `date` field.
+
 If the field is not one of the above predefined fields, the metadata will be
 written to the generated html page as a &lt;meta&gt; header. However, this
 won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled,
-- 
cgit v1.2.3


From 8360e96a8661d3cc0532f377db81a3f37babd126 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 19 Jan 2009 14:11:15 -0500
Subject: blogspam: Log spam info on failure.

---
 IkiWiki/Plugin/blogspam.pm | 9 ++++++---
 debian/changelog           | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index cc6e840f0..8462a6d1d 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -83,7 +83,7 @@ sub checkcontent (@) {
 	# and "buy".
 	push @options, "exclude=stopwords";
 
-	my $res = $client->send_request('testComment', {
+	my %req={
 		ip => $ENV{REMOTE_ADDR},
 		comment => $params{content},
 		subject => defined $params{subject} ? $params{subject} : "",
@@ -92,17 +92,20 @@ sub checkcontent (@) {
 		options => join(",", @options),
 		site => $config{url},
 		version => "ikiwiki ".$IkiWiki::version,
-	});
+	};
+	my $res = $client->send_request('testComment', %req);
 
 	if (! ref $res || ! defined $res->value) {
 		debug("failed to get response from blogspam server ($url)");
 		return undef;
 	}
 	elsif ($res->value =~ /^SPAM:(.*)/) {
+		eval q{use Data::Dumper};
+		debug("blogspam server reports ".$res->value.": ".Dumper(\%req));
 		return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$1;
 	}
 	elsif ($res->value ne 'OK') {
-		debug(gettext("blogspam server failure: ").$res->value);
+		debug("blogspam server failure: ".$res->value);
 		return undef;
 	}
 	else {
diff --git a/debian/changelog b/debian/changelog
index 6e8a54d9d..8bf45c30a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.03) UNRELEASED; urgency=low
 
   * Avoid feeding decoded unicode to Term::ReadLine.
     Closes: 512169
+  * blogspam: Log spam info on failure.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
 
-- 
cgit v1.2.3


From 3547a2a3474b2d5a97c4bc16ea29e81a013b1185 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 20 Jan 2009 11:12:49 -0500
Subject: fix removal form display

The form was misdisplayed when displayed via comment removal.
---
 IkiWiki/Plugin/remove.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 21989aff3..ee5784f20 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -218,7 +218,7 @@ sub sessioncgi ($$) {
 			}
 		}
 		else {
-			IkiWiki::showform($form, $buttons, $session, $q);
+			removal_confirm($q, $session, 0, $q->param("page"));
 		}
 
 		exit 0;
-- 
cgit v1.2.3


From 950137eb6c4b5a75a01724736423e41ab3896e45 Mon Sep 17 00:00:00 2001
From: Gabriel McManus <gmcmanus@gmail.com>
Date: Mon, 7 Jul 2008 21:33:01 +1000
Subject: img: only provide alt text if it was specified

if suitable alternate text is unknown, then it should not be given.
empty alt text is suitable mainly for purely decorative images.
(cherry picked from commit 3cd7f67f0cf894f4fd5ba16f68e82e4f7bdbfdc5)
---
 IkiWiki/Plugin/img.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 5c580c03c..d295b833b 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -119,9 +119,9 @@ sub preprocess (@) {
 	}
 
 	my $imgtag='<img src="'.$imgurl.
-		'" alt="'.(exists $params{alt} ? $params{alt} : '').
 		'" width="'.$im->Get("width").
 		'" height="'.$im->Get("height").'"'.
+		(exists $params{alt} ? '" alt="'.$params{alt}.'"' : '').
 		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
 		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
-- 
cgit v1.2.3


From 6fb0ab580eab0149288c1ab1e7b67f3b2c69ecce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 22 Jan 2009 20:53:47 -0500
Subject: fix typo

---
 IkiWiki/Plugin/blogspam.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 8462a6d1d..c482a5ae1 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -93,7 +93,7 @@ sub checkcontent (@) {
 		site => $config{url},
 		version => "ikiwiki ".$IkiWiki::version,
 	};
-	my $res = $client->send_request('testComment', %req);
+	my $res = $client->send_request('testComment', \%req);
 
 	if (! ref $res || ! defined $res->value) {
 		debug("failed to get response from blogspam server ($url)");
-- 
cgit v1.2.3


From e1ff06b634afe790fe7661898bb20d7077d93588 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 22 Jan 2009 20:58:49 -0500
Subject: fix uninitialized value warnings

I suspect these are only triggered by spammers.
---
 IkiWiki/Plugin/comments.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 833bedf25..6d0e45a97 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -406,19 +406,19 @@ sub sessioncgi ($$) {
 
 	if ($config{comments_allowauthor}) {
 		my $author = $form->field('author');
-		if (length $author) {
+		if (defined $author && length $author) {
 			$author =~ s/"/&quot;/g;
 			$content .= " claimedauthor=\"$author\"\n";
 		}
 		my $url = $form->field('url');
-		if (length $url) {
+		if (defined $url && length $url) {
 			$url =~ s/"/&quot;/g;
 			$content .= " url=\"$url\"\n";
 		}
 	}
 
 	my $subject = $form->field('subject');
-	if (length $subject) {
+	if (defined $subject && length $subject) {
 		$subject =~ s/"/&quot;/g;
 		$content .= " subject=\"$subject\"\n";
 	}
-- 
cgit v1.2.3


From ef856a5f7a4c893dde5a893971e4686d4c30c8f4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 22 Jan 2009 21:10:05 -0500
Subject: typo

---
 IkiWiki/Plugin/blogspam.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index c482a5ae1..8552f3a1b 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -83,7 +83,7 @@ sub checkcontent (@) {
 	# and "buy".
 	push @options, "exclude=stopwords";
 
-	my %req={
+	my %req=(
 		ip => $ENV{REMOTE_ADDR},
 		comment => $params{content},
 		subject => defined $params{subject} ? $params{subject} : "",
@@ -92,7 +92,7 @@ sub checkcontent (@) {
 		options => join(",", @options),
 		site => $config{url},
 		version => "ikiwiki ".$IkiWiki::version,
-	};
+	);
 	my $res = $client->send_request('testComment', \%req);
 
 	if (! ref $res || ! defined $res->value) {
-- 
cgit v1.2.3


From ee74e61ffc6fa589361a080a2c1476b0fe5afaa3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 14:37:04 -0500
Subject: blogspam: Fix use of blogspam_options and blogspam_server config
 settings.

---
 IkiWiki/Plugin/blogspam.pm | 6 +++---
 debian/changelog           | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 8552f3a1b..cbd9859a5 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -62,11 +62,11 @@ sub checkcontent (@) {
 	}
 
 	my $url=$defaulturl;
-	$url = $params{blogspam_server} if exists $params{blogspam_server};
+	$url = $config{blogspam_server} if exists $config{blogspam_server};
 	my $client = RPC::XML::Client->new($url);
 
-	my @options = split(",", $params{blogspam_options})
-		if exists $params{blogspam_options};
+	my @options = split(",", $config{blogspam_options})
+		if exists $config{blogspam_options};
 
 	# Allow short comments and whitespace-only edits, unless the user
 	# has overridden min-words themselves.
diff --git a/debian/changelog b/debian/changelog
index 7f6605fbf..96089c101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ikiwiki (3.03) UNRELEASED; urgency=low
 
   * Avoid feeding decoded unicode to Term::ReadLine.
     Closes: 512169
-  * blogspam: Log spam info on failure.
+  * blogspam: Log spam info on failure in debug mode.
   * Remove nonstandard css. Closes: #512378
+  * blogspam: Fix use of blogspam_options and blogspam_server
+    config settings.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
 
-- 
cgit v1.2.3


From c154fa5d6cd1620be7b139b08040740a1bdfafbc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 15:42:13 -0500
Subject: comments: If comment content checks fail, store the comment (in
 .ikiwiki/comments_pending) for moderator review.

---
 IkiWiki/Plugin/comments.pm | 43 +++++++++++++++++++++++++++++++------------
 IkiWiki/Plugin/editpage.pm |  5 +++--
 debian/changelog           |  2 ++
 doc/plugins/comments.mdwn  |  7 +++++++
 4 files changed, 43 insertions(+), 14 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6d0e45a97..4d225b90a 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -380,14 +380,7 @@ sub sessioncgi ($$) {
 	IkiWiki::check_canedit($page, $cgi, $session);
 	$postcomment=0;
 
-	# FIXME: rather a simplistic way to make the comments...
-	my $i = 0;
-	my $file;
-	my $location;
-	do {
-		$i++;
-		$location = "$page/$config{comments_pagename}$i";
-	} while (-e "$config{srcdir}/$location._comment");
+	my $location=unique_comment_location($page, $config{srcdir});
 
 	my $content = "[[!_comment format=$type\n";
 
@@ -470,21 +463,33 @@ sub sessioncgi ($$) {
 		IkiWiki::checksessionexpiry($cgi, $session);
 		
 		$postcomment=1;
-		IkiWiki::check_content(content => $form->field('editcontent'),
+		my $ok=IkiWiki::check_content(content => $form->field('editcontent'),
 			subject => $form->field('subject'),
 			$config{comments_allowauthor} ? (
 				author => $form->field('author'),
 				url => $form->field('url'),
 			) : (),
 			page => $location,
-			cgi => $cgi, session => $session
+			cgi => $cgi,
+			session => $session,
+			nonfatal => 1,
 		);
 		$postcomment=0;
-		
-		my $file = "$location._comment";
+
+		if (! $ok) {
+			my $penddir=$config{wikistatedir}."/comments_pending";
+			$location=unique_comment_location($page, $penddir);
+			writefile("$location._comment", $penddir, $content);
+			print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")),
+				"<p>".
+				gettext("Your comment will be posted after moderator review"),
+				"</p>");
+			exit;
+		}
 
 		# FIXME: could probably do some sort of graceful retry
 		# on error? Would require significant unwinding though
+		my $file = "$location._comment";
 		writefile($file, $config{srcdir}, $content);
 
 		my $conflict;
@@ -654,6 +659,20 @@ sub pagetemplate (@) {
 	}
 }
 
+sub unique_comment_location ($) {
+	my $page=shift;
+	my $dir=shift;
+
+	my $location;
+	my $i = 0;
+	do {
+		$i++;
+		$location = "$page/$config{comments_pagename}$i";
+	} while (-e "$dir/$location._comment");
+
+	return $location;
+}
+
 package IkiWiki::PageSpec;
 
 sub match_postcomment ($$;@) {
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index bba52e4fd..c206d96a4 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -105,11 +105,12 @@ sub check_content (@) {
 				$ok=1;
 			}
 			elsif (ref $ret eq 'CODE') {
-				$ret->();
+				$ret->() unless $params{nonfatal};
 				$ok=0;
 			}
 			elsif (defined $ret) {
-				error($ret);
+				error($ret) unless $params{nonfatal};
+				$ok=0;
 			}
 		}
 
diff --git a/debian/changelog b/debian/changelog
index 96089c101..002ae12c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.03) UNRELEASED; urgency=low
   * Remove nonstandard css. Closes: #512378
   * blogspam: Fix use of blogspam_options and blogspam_server
     config settings.
+  * comments: If comment content checks fail, store the comment
+    (in .ikiwiki/comments_pending) for moderator review.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
 
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 72b11af64..4cee3b9ad 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -41,3 +41,10 @@ There are some global options for the setup file:
   specify a name for themselves, and the \[[!meta author]] and
   \[[!meta authorurl]] directives will not be overridden by the comments
   plugin
+
+## comment moderation
+
+If you enable the [[blogspam]] plugin, comments that appear spammy will be
+held for moderation. These comments are stored in
+`.ikiwiki/comments_pending/`, and can be deleted, or moved into the
+wiki's srcdir to be posted.
-- 
cgit v1.2.3


From 731fc9e7a2ce818f0b7069cf0353931ec2dc8b43 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 18:49:57 -0500
Subject: comments: Add a moderation web interface.

---
 IkiWiki/Plugin/comments.pm       | 196 +++++++++++++++++++++++++++++++++------
 debian/changelog                 |   1 +
 templates/commentmoderation.tmpl |  23 +++++
 3 files changed, 193 insertions(+), 27 deletions(-)
 create mode 100644 templates/commentmoderation.tmpl

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4d225b90a..388a983f7 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -134,8 +134,8 @@ sub preprocess {
 	}
 
 	# no need to bother with htmlize if it's just HTML
-	$content = IkiWiki::htmlize($page, $params{destpage}, $format,
-		$content) if defined $format;
+	$content = IkiWiki::htmlize($page, $params{destpage}, $format, $content)
+		if defined $format;
 
 	IkiWiki::run_hooks(sanitize => sub {
 		$content = shift->(
@@ -263,13 +263,23 @@ sub linkcgi ($) {
 	}
 }
 
-# Mostly cargo-culted from IkiWiki::plugin::editpage
 sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
 	my $do = $cgi->param('do');
-	return unless $do eq 'comment';
+	if ($do eq 'comment') {
+		editcomment($cgi, $session);
+	}
+	elsif ($do eq 'commentmoderation') {
+		commentmoderation($cgi, $session);
+	}
+}
+
+# Mostly cargo-culted from IkiWiki::plugin::editpage
+sub editcomment ($$) {
+	my $cgi=shift;
+	my $session=shift;
 
 	IkiWiki::decode_cgi_utf8($cgi);
 
@@ -431,29 +441,8 @@ sub sessioncgi ($$) {
 	# - this means that if they do, rocks fall and everyone dies
 
 	if ($form->submitted eq PREVIEW) {
-		my $preview = IkiWiki::htmlize($location, $page, '_comment',
-				IkiWiki::linkify($location, $page,
-					IkiWiki::preprocess($location, $page,
-						IkiWiki::filter($location,
-							$page, $content),
-						0, 1)));
-		IkiWiki::run_hooks(format => sub {
-				$preview = shift->(page => $page,
-					content => $preview);
-			});
-
-		my $template = template("comment.tmpl");
-		$template->param(content => $preview);
-		$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);
+		$form->tmpl_param(page_preview => 
+			previewcomment($content, $location, $page, time));
 	}
 	else {
 		$form->tmpl_param(page_preview => "");
@@ -480,6 +469,7 @@ sub sessioncgi ($$) {
 			my $penddir=$config{wikistatedir}."/comments_pending";
 			$location=unique_comment_location($page, $penddir);
 			writefile("$location._comment", $penddir, $content);
+			IkiWiki::printheader($session);
 			print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")),
 				"<p>".
 				gettext("Your comment will be posted after moderator review"),
@@ -534,6 +524,158 @@ sub sessioncgi ($$) {
 	exit;
 }
 
+sub commentmoderation ($$) {
+	my $cgi=shift;
+	my $session=shift;
+
+	IkiWiki::needsignin($cgi, $session);
+	if (! IkiWiki::is_admin($session->param("name"))) {
+		error(gettext("you are not logged in as an admin"));
+	}
+
+	IkiWiki::decode_cgi_utf8($cgi);
+	
+	if (defined $cgi->param('sid')) {
+		IkiWiki::checksessionexpiry($cgi, $session);
+
+		my %vars=$cgi->Vars;
+		my $added=0;
+		foreach my $id (keys %vars) {
+			if ($id =~ /(.*)\Q._comment\E$/) {
+				my $action=$cgi->param($id);
+				next if $action eq 'Defer';
+
+				# Make sure that the id is of a legal
+				# pending comment before untainting.
+				my ($f)= $id =~ /$config{wiki_file_regexp}/;
+				if (! defined $f || ! length $f ||
+				    IkiWiki::file_pruned($f, $config{srcdir})) {
+					error("illegal file");
+				}
+
+				my $page=IkiWiki::possibly_foolish_untaint(IkiWiki::dirname($1));
+				my $file="$config{wikistatedir}/comments_pending/".
+					IkiWiki::possibly_foolish_untaint($id);
+
+				if ($action eq 'Accept') {
+					my $content=eval { readfile($file) };
+					next if $@; # file vanished since form was displayed
+					my $dest=unique_comment_location($page, $config{srcdir})."._comment";
+					writefile($dest, $config{srcdir}, $content);
+					if ($config{rcs} and $config{comments_commit}) {
+						IkiWiki::rcs_add($dest);
+					}
+					$added++;
+				}
+
+				# This removes empty subdirs, so the
+				# .ikiwiki/comments_pending dir will
+				# go away when all are moderated.
+				require IkiWiki::Render;
+				IkiWiki::prune($file);
+			}
+		}
+
+		if ($added) {
+			my $conflict;
+			if ($config{rcs} and $config{comments_commit}) {
+				my $message = gettext("Comment moderation");
+				IkiWiki::disable_commit_hook();
+				$conflict=IkiWiki::rcs_commit_staged($message,
+					$session->param('name'), $ENV{REMOTE_ADDR});
+				IkiWiki::enable_commit_hook();
+				IkiWiki::rcs_update();
+			}
+		
+			# Now we need a refresh
+			require IkiWiki::Render;
+			IkiWiki::refresh();
+			IkiWiki::saveindex();
+		
+			error($conflict) if defined $conflict;
+		}
+	}
+
+	my @comments=map {
+		my $id=$_;
+		my $file="$config{wikistatedir}/comments_pending/$id";
+		my $content=readfile($file);
+		my $ctime=(stat($file))[10];
+		{
+			id => $id,
+			view => previewcomment($content, $id,
+					IkiWiki::dirname($_), $ctime),
+		} 
+	} comments_pending();
+
+	my $template=template("commentmoderation.tmpl");
+	$template->param(
+		sid => $session->id,
+		comments => \@comments,
+	);
+	IkiWiki::printheader($session);
+	print IkiWiki::misctemplate(gettext("comment moderation"), $template->output);
+	exit;
+}
+
+sub comments_pending () {
+	my $dir="$config{wikistatedir}/comments_pending/";
+	return unless -d $dir;
+
+	my @ret;
+	eval q{use File::Find};
+	error($@) if $@;
+	find({
+		no_chdir => 1,
+		wanted => sub {
+			$_=decode_utf8($_);
+			if (IkiWiki::file_pruned($_, $dir)) {
+				$File::Find::prune=1;
+			}
+			elsif (! -l $_ && ! -d _) {
+				$File::Find::prune=0;
+				my ($f)=/$config{wiki_file_regexp}/; # untaint
+				if (defined $f && $f =~ /\Q._comment\E$/) {
+					$f=~s/^\Q$dir\E\/?//;
+                                        push @ret, $f;
+				}
+			}
+		}
+	}, $dir);
+
+	return @ret;
+}
+
+sub previewcomment ($$$) {
+	my $content=shift;
+	my $location=shift;
+	my $page=shift;
+	my $time=shift;
+
+	my $preview = IkiWiki::htmlize($location, $page, '_comment',
+			IkiWiki::linkify($location, $page,
+				IkiWiki::preprocess($location, $page,
+					IkiWiki::filter($location,
+						$page, $content),
+					0, 1)));
+	IkiWiki::run_hooks(format => sub {
+			$preview = shift->(page => $page,
+				content => $preview);
+		});
+
+	my $template = template("comment.tmpl");
+	$template->param(content => $preview);
+	$template->param(ctime => displaytime($time));
+
+	IkiWiki::run_hooks(pagetemplate => sub {
+		shift->(page => $location,
+			destpage => $page,
+			template => $template);
+	});
+
+	return $template->output;
+}
+
 sub commentsshown ($) {
 	my $page=shift;
 
diff --git a/debian/changelog b/debian/changelog
index 002ae12c1..c9ebcd1e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.03) UNRELEASED; urgency=low
     config settings.
   * comments: If comment content checks fail, store the comment
     (in .ikiwiki/comments_pending) for moderator review.
+  * comments: Add a moderation web interface.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
 
diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl
new file mode 100644
index 000000000..3dadb791b
--- /dev/null
+++ b/templates/commentmoderation.tmpl
@@ -0,0 +1,23 @@
+<TMPL_IF NAME="COMMENTS">
+<br />
+<form action="<TMPL_VAR CGIURL>" method="post">
+<input type="hidden" name="do" value="commentmoderation" />
+<input type="hidden" name="sid" value="<TMPL_VAR SID>" />
+<TMPL_LOOP NAME="COMMENTS">
+<div>
+<div>
+<TMPL_VAR VIEW>
+</div>
+<input type="radio" value="Defer" name="<TMPL_VAR ID>" checked>Defer</input>
+<input type="radio" value="Accept" name="<TMPL_VAR ID>">Accept</input>
+<input type="radio" value="Reject" name="<TMPL_VAR ID>">Reject</input>
+</div>
+<br />
+</TMPL_LOOP>
+<input type="submit" value="Submit" />
+</form>
+<TMPL_ELSE>
+<p>
+No comments need moderation at this time.
+</p>
+</TMPL_IF>
-- 
cgit v1.2.3


From 9a5085e5126d1f76d28a4438b1527659183477b5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 18:56:47 -0500
Subject: clean up comment preview

Remove actions from it, and avoid a broken title link.
---
 IkiWiki/Plugin/comments.pm | 2 ++
 templates/comment.tmpl     | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 388a983f7..ad5395a82 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -673,6 +673,8 @@ sub previewcomment ($$$) {
 			template => $template);
 	});
 
+	$template->param(have_actions => 0);
+
 	return $template->output;
 }
 
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 582efccb8..b4f235845 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,6 +1,12 @@
 <div class="comment" id="<TMPL_VAR NAME=INLINEPAGE>">
 
-<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>
+<div class="comment-subject">
+<TMPL_IF PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<TMPL_VAR TITLE>
+</TMPL_IF>
+</div>
 
 <div class="inlinecontent">
 <TMPL_VAR CONTENT>
-- 
cgit v1.2.3


From 7a7e28c55f1ffa64eedbaf36ee1729c6bbd27762 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 19:04:45 -0500
Subject: add a button to prefs page for comment moderation

---
 IkiWiki/Plugin/comments.pm | 13 +++++++++++++
 doc/plugins/comments.mdwn  |  8 +++++---
 doc/wikitemplates.mdwn     |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ad5395a82..c95f77a42 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -26,6 +26,7 @@ sub import {
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
 	hook(type => "cgi", id => "comments", call => \&linkcgi);
+	hook(type => "formbuilder_setup", id => "comments", call => \&formbuilder_setup);
 	IkiWiki::loadplugin("inline");
 }
 
@@ -618,6 +619,18 @@ sub commentmoderation ($$) {
 	exit;
 }
 
+sub formbuilder_setup (@) {
+	my %params=@_;
+
+	my $form=$params{form};
+	if ($form->title eq "preferences") {
+		push @{$params{buttons}}, "Comment Moderation";
+		if ($form->submitted && $form->submitted eq "Comment Moderation") {
+			commentmoderation($params{cgi}, $params{session});
+		}
+	}
+}
+
 sub comments_pending () {
 	my $dir="$config{wikistatedir}/comments_pending/";
 	return unless -d $dir;
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 4cee3b9ad..c13a6daa6 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -45,6 +45,8 @@ There are some global options for the setup file:
 ## comment moderation
 
 If you enable the [[blogspam]] plugin, comments that appear spammy will be
-held for moderation. These comments are stored in
-`.ikiwiki/comments_pending/`, and can be deleted, or moved into the
-wiki's srcdir to be posted.
+held for moderation. Wiki admins can access the comment moderation queue
+via a button on their Preferences page.
+
+The comments are stored in `.ikiwiki/comments_pending/`, and can be
+deleted, or moved into the wiki's srcdir to be posted.
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index dc217cd30..fc5893677 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -33,6 +33,8 @@ located in /usr/share/ikiwiki/templates by default.
   by the [[plugins/comments]] plugin.
 * `editcomment.tmpl` - This template is the comment post form for the
   [[plugins/comments]] plugin.
+* `commentmoderation.tmpl` - This template is used to produce the comment
+  moderation form.
 
 The [[plugins/pagetemplate]] plugin can allow individual pages to use a
 different template than `page.tmpl`.
-- 
cgit v1.2.3


From 4e21af767175cdf19143b0b0776e111de3253103 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 25 Jan 2009 19:45:56 -0500
Subject: sort comment queue by time, newest first

---
 IkiWiki/Plugin/comments.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index c95f77a42..f0b67a9eb 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -598,7 +598,7 @@ sub commentmoderation ($$) {
 	}
 
 	my @comments=map {
-		my $id=$_;
+		my ($id, $ctime)=@{$_};
 		my $file="$config{wikistatedir}/comments_pending/$id";
 		my $content=readfile($file);
 		my $ctime=(stat($file))[10];
@@ -607,7 +607,7 @@ sub commentmoderation ($$) {
 			view => previewcomment($content, $id,
 					IkiWiki::dirname($_), $ctime),
 		} 
-	} comments_pending();
+	} sort { $b->[1] <=> $a->[1] } comments_pending();
 
 	my $template=template("commentmoderation.tmpl");
 	$template->param(
@@ -649,8 +649,9 @@ sub comments_pending () {
 				$File::Find::prune=0;
 				my ($f)=/$config{wiki_file_regexp}/; # untaint
 				if (defined $f && $f =~ /\Q._comment\E$/) {
+					my $ctime=(stat($f))[10];
 					$f=~s/^\Q$dir\E\/?//;
-                                        push @ret, $f;
+                                        push @ret, [$f, $ctime];
 				}
 			}
 		}
-- 
cgit v1.2.3


From 9d4f396b1353d58c6b526818b69ada459b1be24c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 22:25:45 -0500
Subject: add reject all marked defer checkbox

---
 IkiWiki/Plugin/comments.pm       | 17 ++++++++---------
 templates/commentmoderation.tmpl | 12 +++++++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index f0b67a9eb..32f3712f2 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -539,12 +539,14 @@ sub commentmoderation ($$) {
 	if (defined $cgi->param('sid')) {
 		IkiWiki::checksessionexpiry($cgi, $session);
 
+		my $rejectalldefer=$cgi->param('rejectalldefer');
+
 		my %vars=$cgi->Vars;
 		my $added=0;
 		foreach my $id (keys %vars) {
 			if ($id =~ /(.*)\Q._comment\E$/) {
 				my $action=$cgi->param($id);
-				next if $action eq 'Defer';
+				next if $action eq 'Defer' && ! $rejectalldefer;
 
 				# Make sure that the id is of a legal
 				# pending comment before untainting.
@@ -601,7 +603,6 @@ sub commentmoderation ($$) {
 		my ($id, $ctime)=@{$_};
 		my $file="$config{wikistatedir}/comments_pending/$id";
 		my $content=readfile($file);
-		my $ctime=(stat($file))[10];
 		{
 			id => $id,
 			view => previewcomment($content, $id,
@@ -668,14 +669,12 @@ sub previewcomment ($$$) {
 
 	my $preview = IkiWiki::htmlize($location, $page, '_comment',
 			IkiWiki::linkify($location, $page,
-				IkiWiki::preprocess($location, $page,
-					IkiWiki::filter($location,
-						$page, $content),
-					0, 1)));
+			IkiWiki::preprocess($location, $page,
+			IkiWiki::filter($location, $page, $content), 0, 1)));
 	IkiWiki::run_hooks(format => sub {
-			$preview = shift->(page => $page,
-				content => $preview);
-		});
+		$preview = shift->(page => $page,
+			content => $preview);
+	});
 
 	my $template = template("comment.tmpl");
 	$template->param(content => $preview);
diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl
index 3dadb791b..e91d3146d 100644
--- a/templates/commentmoderation.tmpl
+++ b/templates/commentmoderation.tmpl
@@ -3,18 +3,24 @@
 <form action="<TMPL_VAR CGIURL>" method="post">
 <input type="hidden" name="do" value="commentmoderation" />
 <input type="hidden" name="sid" value="<TMPL_VAR SID>" />
+<input type="submit" value="Submit" />
+<input type="checkbox" name="rejectalldefer" value="1" />Reject
+all comments marked <em>Defer</em>
+<br />  
 <TMPL_LOOP NAME="COMMENTS">
 <div>
 <div>
 <TMPL_VAR VIEW>
 </div>
-<input type="radio" value="Defer" name="<TMPL_VAR ID>" checked>Defer</input>
-<input type="radio" value="Accept" name="<TMPL_VAR ID>">Accept</input>
-<input type="radio" value="Reject" name="<TMPL_VAR ID>">Reject</input>
+<input type="radio" value="Defer" name="<TMPL_VAR ID>" checked />Defer
+<input type="radio" value="Accept" name="<TMPL_VAR ID>" />Accept
+<input type="radio" value="Reject" name="<TMPL_VAR ID>" />Reject
 </div>
 <br />
 </TMPL_LOOP>
 <input type="submit" value="Submit" />
+<input type="checkbox" name="rejectalldefer" value="1" />Reject
+all comments marked <em>Defer</em>
 </form>
 <TMPL_ELSE>
 <p>
-- 
cgit v1.2.3


From 42b3e13739ccf67e3867c8e6864a2afdafa61c4a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 22:30:28 -0500
Subject: format moderation queue only at end, avoid O(N^3) bug

It was calling format hooks for each comment on the page.
When relativedate is enabled, that made it insert <script> tags
for each comment. And the browser loaded the same script over and over,
which was slow on its own. But that was nothing compared to running
the onload even over and over.. especially since the hook system
added a new call to the hook each time it loaded.

For a page with 10 comments, that caused the relativedate DOM parsing
code to run 1000 times, I think. Anyway, it was sloow. Now it runs once.
---
 IkiWiki/Plugin/comments.pm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 32f3712f2..b2243ce4c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -442,8 +442,12 @@ sub editcomment ($$) {
 	# - this means that if they do, rocks fall and everyone dies
 
 	if ($form->submitted eq PREVIEW) {
-		$form->tmpl_param(page_preview => 
-			previewcomment($content, $location, $page, time));
+		my $preview=previewcomment($content, $location, $page, time);
+		IkiWiki::run_hooks(format => sub {
+			$preview = shift->(page => $page,
+				content => $preview);
+		});
+		$form->tmpl_param(page_preview => $preview);
 	}
 	else {
 		$form->tmpl_param(page_preview => "");
@@ -603,10 +607,11 @@ sub commentmoderation ($$) {
 		my ($id, $ctime)=@{$_};
 		my $file="$config{wikistatedir}/comments_pending/$id";
 		my $content=readfile($file);
+		my $preview=previewcomment($content, $id,
+			IkiWiki::dirname($_), $ctime);
 		{
 			id => $id,
-			view => previewcomment($content, $id,
-					IkiWiki::dirname($_), $ctime),
+			view => $preview,
 		} 
 	} sort { $b->[1] <=> $a->[1] } comments_pending();
 
@@ -616,7 +621,11 @@ sub commentmoderation ($$) {
 		comments => \@comments,
 	);
 	IkiWiki::printheader($session);
-	print IkiWiki::misctemplate(gettext("comment moderation"), $template->output);
+	my $out=$template->output;
+	IkiWiki::run_hooks(format => sub {
+		$out = shift->(page => "", content => $out);
+	});
+	print IkiWiki::misctemplate(gettext("comment moderation"), $out);
 	exit;
 }
 
@@ -671,10 +680,6 @@ sub previewcomment ($$$) {
 			IkiWiki::linkify($location, $page,
 			IkiWiki::preprocess($location, $page,
 			IkiWiki::filter($location, $page, $content), 0, 1)));
-	IkiWiki::run_hooks(format => sub {
-		$preview = shift->(page => $page,
-			content => $preview);
-	});
 
 	my $template = template("comment.tmpl");
 	$template->param(content => $preview);
-- 
cgit v1.2.3


From ce39f8e0006253b7dd3489dbd414b5d4758c66ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 23:13:14 -0500
Subject: git: Fix malformed utf8 recieved from git.

If git log outputs malformed utf8 in, eg, usernames, detect it and fix it
up. This avoids commits such as f71abc92aa279fbe0b7578b8c4752d775dd4a259
breaking things.
---
 IkiWiki/Plugin/git.pm | 6 ++++++
 debian/changelog      | 1 +
 2 files changed, 7 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 3085a3b67..042c69f5a 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -139,6 +139,12 @@ sub safe_git (&@) {
 	my @lines;
 	while (<$OUT>) {
 		chomp;
+		
+		# check for invalid utf-8, and toss it back to avoid crashes
+		if (! utf8::valid($_)) {
+			$_=encode_utf8($_);
+		}
+
 		push @lines, $_;
 	}
 
diff --git a/debian/changelog b/debian/changelog
index c9ebcd1e9..6c1710fe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.03) UNRELEASED; urgency=low
   * comments: If comment content checks fail, store the comment
     (in .ikiwiki/comments_pending) for moderator review.
   * comments: Add a moderation web interface.
+  * git: Fix malformed utf8 recieved from git.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
 
-- 
cgit v1.2.3


From 5dd67723c1b03ce3fbdc0a0b61d3d20fbe11b208 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 26 Jan 2009 20:33:55 -0500
Subject: typo

---
 IkiWiki/Plugin/comments.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index b2243ce4c..cbb3374c2 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -477,7 +477,7 @@ sub editcomment ($$) {
 			IkiWiki::printheader($session);
 			print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")),
 				"<p>".
-				gettext("Your comment will be posted after moderator review"),
+				gettext("Your comment will be posted after moderator review").
 				"</p>");
 			exit;
 		}
-- 
cgit v1.2.3


From 4e92548ebc39c083e7ed8b870f4c13ba229127cd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 31 Jan 2009 14:49:12 +0000
Subject: comments: delete cgi hook in favour of the global one

---
 IkiWiki/Plugin/comments.pm | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index cbb3374c2..995d1f4eb 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -25,7 +25,6 @@ sub import {
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
-	hook(type => "cgi", id => "comments", call => \&linkcgi);
 	hook(type => "formbuilder_setup", id => "comments", call => \&formbuilder_setup);
 	IkiWiki::loadplugin("inline");
 }
@@ -167,7 +166,7 @@ sub preprocess {
 		}
 		else {
 			$commentauthorurl = IkiWiki::cgiurl(
-				do => 'commenter',
+				do => 'goto',
 				page => (length $config{userdir}
 					? "$config{userdir}/$commentuser"
 					: "$commentuser"));
@@ -235,35 +234,6 @@ sub preprocess {
 	return $content;
 }
 
-# This is exactly the same as recentchanges_link :-(
-sub linkcgi ($) {
-	my $cgi=shift;
-	if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
-
-		my $page=decode_utf8($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, urlto($link, undef, 1));
-		}
-
-		exit;
-	}
-}
-
 sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
-- 
cgit v1.2.3


From a981d6857f1eab350460116c1b5d868ed0215d29 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 31 Jan 2009 14:49:25 +0000
Subject: recentchanges: delete CGI hook in favour of the global one

---
 IkiWiki/Plugin/recentchanges.pm | 45 +----------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index ef108b3f0..56e80e7b8 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -13,7 +13,6 @@ sub import {
 	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 getsetup () {
@@ -79,48 +78,6 @@ sub htmlize (@) {
 	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=decode_utf8($cgi->param("page"));
-		if (!defined $page) {
-			error("missing page parameter");
-		}
-
-		IkiWiki::loadindex();
-
-		# If the page is internal (like a comment), see if it has a
-		# permalink. Comments do.
-		if (IkiWiki::isinternal($page) &&
-		    defined $pagestate{$page}{meta}{permalink}) {
-			IkiWiki::redirect($cgi,
-			                  $pagestate{$page}{meta}{permalink});
-			exit;
-		}
-
-		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, urlto($link, undef, 1));
-		}
-
-		exit;
-	}
-}
-
 sub store ($$$) {
 	my $change=shift;
 
@@ -138,7 +95,7 @@ sub store ($$$) {
 			if (length $config{cgiurl}) {
 				$_->{link} = "<a href=\"".
 					IkiWiki::cgiurl(
-						do => "recentchanges_link",
+						do => "goto",
 						page => $_->{page}
 					).
 					"\" rel=\"nofollow\">".
-- 
cgit v1.2.3


From 46b880f8390ac82d746add01de38a05155743374 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 31 Jan 2009 22:32:10 +0000
Subject: Split apache404 into an independent plugin

Also make it ignore the 'do' parameter at Joey's suggestion, to have one
less thing to remember when configuring.
---
 IkiWiki/CGI.pm                   | 49 +-------------------------
 IkiWiki/Plugin/apache404.pm      | 76 ++++++++++++++++++++++++++++++++++++++++
 doc/plugins/apache404.mdwn       | 11 ++++++
 doc/tips/apache_404_handler.mdwn | 10 ------
 t/apache404.t                    | 45 ++++++++++++++++++++++++
 t/cgi_page_from_404.t            | 43 -----------------------
 6 files changed, 133 insertions(+), 101 deletions(-)
 create mode 100644 IkiWiki/Plugin/apache404.pm
 create mode 100644 doc/plugins/apache404.mdwn
 delete mode 100644 doc/tips/apache_404_handler.mdwn
 create mode 100755 t/apache404.t
 delete mode 100755 t/cgi_page_from_404.t

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 8734cdd49..e75ebcd27 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -338,46 +338,6 @@ sub cgi_goto ($;$) {
 	exit;
 }
 
-sub cgi_page_from_404 ($$$) {
-	my $path = shift;
-	my $baseurl = shift;
-	my $usedirs = shift;
-
-	# fail if missing from environment or whatever
-	return undef unless defined $path;
-	return undef unless defined $baseurl;
-
-	# with usedirs on, path is like /~fred/foo/bar/ or /~fred/foo/bar or
-	#    /~fred/foo/bar/index.html
-	# with usedirs off, path is like /~fred/foo/bar.html
-	# baseurl is like 'http://people.example.com/~fred'
-
-	# convert baseurl to ~fred
-	unless ($baseurl =~ s{^https?://[^/]+/?}{}) {
-		return undef;
-	}
-
-	# convert path to /~fred/foo/bar
-	if ($usedirs) {
-		$path =~ s/\/*(?:index\.$config{htmlext})?$//;
-	}
-	else {
-		$path =~ s/\.$config{htmlext}$//;
-	}
-
-	# remove /~fred/
-	unless ($path =~ s{^/*\Q$baseurl\E/*}{}) {
-		return undef;
-	}
-
-	# special case for the index
-	unless ($path) {
-		return 'index';
-	}
-
-	return $path;
-}
-
 sub cgi (;$$) {
 	my $q=shift;
 	my $session=shift;
@@ -409,14 +369,7 @@ sub cgi (;$$) {
 	# commenter are for compatibility with any saved URLs
 	if ($do eq 'goto' || $do eq 'recentchanges_link' ||
 	    $do eq 'commenter') {
-		my $page = undef;
-
-		if ($ENV{REDIRECT_STATUS} eq '404') {
-			$page = cgi_page_from_404($ENV{REDIRECT_URL},
-				$config{url}, $config{usedirs});
-		}
-
-		cgi_goto($q, $page);
+		cgi_goto($q);
 	}
 
 	# Need to lock the wiki before getting a session.
diff --git a/IkiWiki/Plugin/apache404.pm b/IkiWiki/Plugin/apache404.pm
new file mode 100644
index 000000000..3ac6b3af5
--- /dev/null
+++ b/IkiWiki/Plugin/apache404.pm
@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+# Copyright © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+# Licensed under the GNU GPL, version 2, or any later version published by the
+# Free Software Foundation
+package IkiWiki::Plugin::apache404;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "cgi", id => 'apache404',  call => \&cgi);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			# not really a matter of safety, but enabling/disabling
+			# through a web interface is useless - it needs web
+			# server admin action too
+			safe => 0,
+			rebuild => 0,
+		}
+}
+
+sub cgi_page_from_404 ($$$) {
+	my $path = shift;
+	my $baseurl = shift;
+	my $usedirs = shift;
+
+	# fail if missing from environment or whatever
+	return undef unless defined $path;
+	return undef unless defined $baseurl;
+
+	# with usedirs on, path is like /~fred/foo/bar/ or /~fred/foo/bar or
+	#    /~fred/foo/bar/index.html
+	# with usedirs off, path is like /~fred/foo/bar.html
+	# baseurl is like 'http://people.example.com/~fred'
+
+	# convert baseurl to ~fred
+	unless ($baseurl =~ s{^https?://[^/]+/?}{}) {
+		return undef;
+	}
+
+	# convert path to /~fred/foo/bar
+	if ($usedirs) {
+		$path =~ s/\/*(?:index\.$config{htmlext})?$//;
+	}
+	else {
+		$path =~ s/\.$config{htmlext}$//;
+	}
+
+	# remove /~fred/
+	unless ($path =~ s{^/*\Q$baseurl\E/*}{}) {
+		return undef;
+	}
+
+	# special case for the index
+	unless ($path) {
+		return 'index';
+	}
+
+	return $path;
+}
+
+sub cgi ($) {
+	my $cgi=shift;
+
+	if ($ENV{REDIRECT_STATUS} eq '404') {
+		my $page = cgi_page_from_404($ENV{REDIRECT_URL},
+			$config{url}, $config{usedirs});
+		IkiWiki::cgi_goto($cgi, $page);
+	}
+}
+
+1;
diff --git a/doc/plugins/apache404.mdwn b/doc/plugins/apache404.mdwn
new file mode 100644
index 000000000..bab8fb59d
--- /dev/null
+++ b/doc/plugins/apache404.mdwn
@@ -0,0 +1,11 @@
+[[!template id=plugin name=apache404 author="[[Simon_McVittie|smcv]]"]]
+[[!tag type/useful]]
+
+This plugin lets you use the IkiWiki CGI script as an Apache 404 handler,
+to give the behaviour of various other wiki engines where visiting a
+nonexistent page provides you with a link to create it.
+
+To achieve this, put something like this in the wiki's Apache configuration
+file:
+
+    ErrorDocument 404 /cgi-bin/ikiwiki.cgi
diff --git a/doc/tips/apache_404_handler.mdwn b/doc/tips/apache_404_handler.mdwn
deleted file mode 100644
index 0fda759e7..000000000
--- a/doc/tips/apache_404_handler.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!meta title="Apache 404 handler"]]
-
-Sufficiently recent versions of IkiWiki can be used as an Apache 404 handler,
-to give the behaviour of various other wiki engines where visiting a
-nonexistent page provides you with a link to create it.
-
-To achieve this, put something like this in the wiki's Apache configuration
-file:
-
-    ErrorDocument 404 /cgi-bin/ikiwiki.cgi?do=goto
diff --git a/t/apache404.t b/t/apache404.t
new file mode 100755
index 000000000..00fc35250
--- /dev/null
+++ b/t/apache404.t
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 17;
+
+BEGIN { use_ok("IkiWiki::Plugin::apache404"); }
+
+sub cgi_page_from_404 {
+	return IkiWiki::Plugin::apache404::cgi_page_from_404(shift, shift,
+	                                                     shift);
+}
+
+$IkiWiki::config{htmlext} = 'html';
+
+is(cgi_page_from_404('/', 'http://example.com', 1), 'index');
+is(cgi_page_from_404('/index.html', 'http://example.com', 0), 'index');
+is(cgi_page_from_404('/', 'http://example.com/', 1), 'index');
+is(cgi_page_from_404('/index.html', 'http://example.com/', 0), 'index');
+
+is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user', 0),
+   'foo/bar');
+
+is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user/', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user/', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user/', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user/', 0),
+   'foo/bar');
+
+is(cgi_page_from_404('/~user/foo', 'https://example.com/~user', 1),
+   'foo');
+is(cgi_page_from_404('/~user/foo/index.html', 'https://example.com/~user', 1),
+   'foo');
+is(cgi_page_from_404('/~user/foo/', 'https://example.com/~user', 1),
+   'foo');
+is(cgi_page_from_404('/~user/foo.html', 'https://example.com/~user', 0),
+   'foo');
diff --git a/t/cgi_page_from_404.t b/t/cgi_page_from_404.t
deleted file mode 100755
index adbbdf874..000000000
--- a/t/cgi_page_from_404.t
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use Test::More tests => 18;
-
-BEGIN { use_ok("IkiWiki"); }
-BEGIN { use_ok("IkiWiki::CGI"); }
-
-sub cgi_page_from_404 { return IkiWiki::cgi_page_from_404(shift, shift, shift); }
-
-$IkiWiki::config{htmlext} = 'html';
-
-is(cgi_page_from_404('/', 'http://example.com', 1), 'index');
-is(cgi_page_from_404('/index.html', 'http://example.com', 0), 'index');
-is(cgi_page_from_404('/', 'http://example.com/', 1), 'index');
-is(cgi_page_from_404('/index.html', 'http://example.com/', 0), 'index');
-
-is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user', 0),
-   'foo/bar');
-
-is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user/', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user/', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user/', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user/', 0),
-   'foo/bar');
-
-is(cgi_page_from_404('/~user/foo', 'https://example.com/~user', 1),
-   'foo');
-is(cgi_page_from_404('/~user/foo/index.html', 'https://example.com/~user', 1),
-   'foo');
-is(cgi_page_from_404('/~user/foo/', 'https://example.com/~user', 1),
-   'foo');
-is(cgi_page_from_404('/~user/foo.html', 'https://example.com/~user', 0),
-   'foo');
-- 
cgit v1.2.3


From c886bea32084a920f3ba26b3f96327681f5db917 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 31 Jan 2009 23:01:10 +0000
Subject: Split cgi_goto into a goto plugin

---
 IkiWiki/CGI.pm                  | 51 ---------------------------
 IkiWiki/Plugin/apache404.pm     |  3 +-
 IkiWiki/Plugin/comments.pm      |  2 ++
 IkiWiki/Plugin/goto.pm          | 76 +++++++++++++++++++++++++++++++++++++++++
 IkiWiki/Plugin/recentchanges.pm |  2 ++
 doc/plugins/goto.mdwn           | 10 ++++++
 6 files changed, 92 insertions(+), 52 deletions(-)
 create mode 100644 IkiWiki/Plugin/goto.pm
 create mode 100644 doc/plugins/goto.mdwn

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index e75ebcd27..c91914564 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -294,50 +294,6 @@ sub cgi_savesession ($) {
 	umask($oldmask);
 }
 
-# cgi_goto(CGI, [page])
-# Redirect to a specified page, or display "not found". If not specified,
-# the page param from the CGI object is used.
-sub cgi_goto ($;$) {
-	my $q = shift;
-	my $page = shift;
-
-	if (!defined $page) {
-		$page = decode_utf8($q->param("page"));
-
-		if (!defined $page) {
-			error("missing page parameter");
-		}
-	}
-
-	loadindex();
-
-	# If the page is internal (like a comment), see if it has a
-	# permalink. Comments do.
-	if (isinternal($page) &&
-	    defined $pagestate{$page}{meta}{permalink}) {
-		redirect($q, $pagestate{$page}{meta}{permalink});
-	}
-
-	my $link = bestlink("", $page);
-
-	if (! length $link) {
-		print $q->header(-status => "404 Not Found");
-		print misctemplate(gettext("missing page"),
-			"<p>".
-			sprintf(gettext("The page %s does not exist."),
-				htmllink("", "", $page)).
-			"</p>".
-			# Internet Explorer won't show custom 404 responses
-			# unless they're >= 512 bytes
-			(" " x 512));
-	}
-	else {
-		redirect($q, urlto($link, undef, 1));
-	}
-
-	exit;
-}
-
 sub cgi (;$$) {
 	my $q=shift;
 	my $session=shift;
@@ -365,13 +321,6 @@ sub cgi (;$$) {
 		}
 	}
 
-	# goto is the preferred name for this; recentchanges_link and
-	# commenter are for compatibility with any saved URLs
-	if ($do eq 'goto' || $do eq 'recentchanges_link' ||
-	    $do eq 'commenter') {
-		cgi_goto($q);
-	}
-
 	# Need to lock the wiki before getting a session.
 	lockwiki();
 	loadindex();
diff --git a/IkiWiki/Plugin/apache404.pm b/IkiWiki/Plugin/apache404.pm
index 3ac6b3af5..e7ce70435 100644
--- a/IkiWiki/Plugin/apache404.pm
+++ b/IkiWiki/Plugin/apache404.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "cgi", id => 'apache404',  call => \&cgi);
+	IkiWiki::loadplugin("goto");
 }
 
 sub getsetup () {
@@ -69,7 +70,7 @@ sub cgi ($) {
 	if ($ENV{REDIRECT_STATUS} eq '404') {
 		my $page = cgi_page_from_404($ENV{REDIRECT_URL},
 			$config{url}, $config{usedirs});
-		IkiWiki::cgi_goto($cgi, $page);
+		IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
 	}
 }
 
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 995d1f4eb..3cdffe856 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -26,6 +26,8 @@ sub import {
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
 	hook(type => "formbuilder_setup", id => "comments", call => \&formbuilder_setup);
+	# Load goto to fix up user page links for logged-in commenters
+	IkiWiki::loadplugin("goto");
 	IkiWiki::loadplugin("inline");
 }
 
diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
new file mode 100644
index 000000000..9e7a2621f
--- /dev/null
+++ b/IkiWiki/Plugin/goto.pm
@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::goto;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "cgi", id => 'goto',  call => \&cgi);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		}
+}
+
+# cgi_goto(CGI, [page])
+# Redirect to a specified page, or display "not found". If not specified,
+# the page param from the CGI object is used.
+sub cgi_goto ($;$) {
+	my $q = shift;
+	my $page = shift;
+
+	if (!defined $page) {
+		$page = IkiWiki::decode_utf8($q->param("page"));
+
+		if (!defined $page) {
+			error("missing page parameter");
+		}
+	}
+
+	IkiWiki::loadindex();
+
+	# If the page is internal (like a comment), see if it has a
+	# permalink. Comments do.
+	if (IkiWiki::isinternal($page) &&
+	    defined $pagestate{$page}{meta}{permalink}) {
+		redirect($q, $pagestate{$page}{meta}{permalink});
+	}
+
+	my $link = bestlink("", $page);
+
+	if (! length $link) {
+		print $q->header(-status => "404 Not Found");
+		print IkiWiki::misctemplate(gettext("missing page"),
+			"<p>".
+			sprintf(gettext("The page %s does not exist."),
+				htmllink("", "", $page)).
+			"</p>".
+			# Internet Explorer won't show custom 404 responses
+			# unless they're >= 512 bytes
+			(" " x 512));
+	}
+	else {
+		IkiWiki::redirect($q, urlto($link, undef, 1));
+	}
+
+	exit;
+}
+
+sub cgi ($) {
+	my $cgi=shift;
+	my $do = $cgi->param('do');
+
+	if (defined $do && ($do eq 'goto' || $do eq 'commenter' ||
+	                       $do eq 'recentchanged_link')) {
+		# goto is the preferred name for this; recentchanges_link and
+		# commenter are for compatibility with any saved URLs
+		cgi_goto($cgi);
+	}
+}
+
+1;
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 56e80e7b8..329dd6f32 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -13,6 +13,8 @@ sub import {
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
 	hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
 	hook(type => "htmlize", id => "_change", call => \&htmlize);
+	# Load goto to fix up links from recentchanges
+	IkiWiki::loadplugin("goto");
 }
 
 sub getsetup () {
diff --git a/doc/plugins/goto.mdwn b/doc/plugins/goto.mdwn
new file mode 100644
index 000000000..21dda16b2
--- /dev/null
+++ b/doc/plugins/goto.mdwn
@@ -0,0 +1,10 @@
+[[!template id=plugin name=goto author="[[Simon_McVittie|smcv]]"]]
+[[!tag type/useful]]
+
+This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly
+for internal use by the [[apache404]], [[comments]] and [[recentchanges]]
+plugins, which enable it automatically.
+
+With this plugin enabled you can link to `ikiwiki.cgi?do=goto&page=some/where`
+to make a link that will redirect to the page `/some/where` if it exists, or
+offer a link to create it if it doesn't.
-- 
cgit v1.2.3


From b0361b8efde26fbf4f3207be6c3c8f39eb16a9f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 31 Jan 2009 19:02:50 -0500
Subject: factor out IE stupididy workaround

---
 IkiWiki/CGI.pm         | 23 +++++++++++++++++------
 IkiWiki/Plugin/goto.pm | 17 ++++++++---------
 2 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index c91914564..3000ed100 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -229,6 +229,20 @@ sub cgi_prefs ($$) {
 	showform($form, $buttons, $session, $q);
 }
 
+sub cgi_custom_failure ($$) {
+	my $header=shift;
+	my $message=shift;
+
+	print $header;
+	print $message;
+
+	# Internet Explod^Hrer won't show custom 404 responses
+	# unless they're >= 512 bytes
+	print ' ' x 512;
+
+	exit;
+}
+
 sub check_banned ($$) {
 	my $q=shift;
 	my $session=shift;
@@ -236,14 +250,11 @@ sub check_banned ($$) {
 	my $name=$session->param("name");
 	if (defined $name) {
 		if (grep { $name eq $_ } @{$config{banned_users}}) {
-			print $q->header(-status => "403 Forbidden");
 			$session->delete();
-			print gettext("You are banned.");
-			# Internet Explorer won't show custom 404 responses
-			# unless they're >= 512 bytes
-			print " " x 512;
 			cgi_savesession($session);
-			exit;
+			cgi_custom_failure(
+				$q->header(-status => "403 Forbidden"),
+				gettext("You are banned."));
 		}
 	}
 }
diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 9e7a2621f..7cc8cb484 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -44,15 +44,14 @@ sub cgi_goto ($;$) {
 	my $link = bestlink("", $page);
 
 	if (! length $link) {
-		print $q->header(-status => "404 Not Found");
-		print IkiWiki::misctemplate(gettext("missing page"),
-			"<p>".
-			sprintf(gettext("The page %s does not exist."),
-				htmllink("", "", $page)).
-			"</p>".
-			# Internet Explorer won't show custom 404 responses
-			# unless they're >= 512 bytes
-			(" " x 512));
+		IkiWiki::cgi_custom_failure(
+			$q->header(-status => "404 Not Found"),
+			IkiWiki::misctemplate(gettext("missing page"),
+				"<p>".
+				sprintf(gettext("The page %s does not exist."),
+					htmllink("", "", $page)).
+				"</p>")
+		)
 	}
 	else {
 		IkiWiki::redirect($q, urlto($link, undef, 1));
-- 
cgit v1.2.3


From 3b83e520182a83e4ae6c61ab7b360b0eb939469f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 31 Jan 2009 19:26:36 -0500
Subject: rename apache404 -> 404

This may already work with other web servers that have copied apache's
interface, and it should be easy to add support to it for web servers that
use some other interface. So, make the name more general.
---
 IkiWiki/Plugin/404.pm       | 77 +++++++++++++++++++++++++++++++++++++++++++++
 IkiWiki/Plugin/apache404.pm | 77 ---------------------------------------------
 debian/changelog            |  2 +-
 debian/copyright            |  2 +-
 doc/plugins/404.mdwn        | 11 +++++++
 doc/plugins/apache404.mdwn  | 11 -------
 doc/plugins/goto.mdwn       |  2 +-
 doc/tips/dot_cgi.mdwn       |  9 +++---
 t/404.t                     | 44 ++++++++++++++++++++++++++
 t/apache404.t               | 45 --------------------------
 10 files changed, 139 insertions(+), 141 deletions(-)
 create mode 100644 IkiWiki/Plugin/404.pm
 delete mode 100644 IkiWiki/Plugin/apache404.pm
 create mode 100644 doc/plugins/404.mdwn
 delete mode 100644 doc/plugins/apache404.mdwn
 create mode 100755 t/404.t
 delete mode 100755 t/apache404.t

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
new file mode 100644
index 000000000..5550ea7d1
--- /dev/null
+++ b/IkiWiki/Plugin/404.pm
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+# Copyright © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+# Licensed under the GNU GPL, version 2, or any later version published by the
+# Free Software Foundation
+package IkiWiki::Plugin::404;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "cgi", id => '404',  call => \&cgi);
+	IkiWiki::loadplugin("goto");
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			# not really a matter of safety, but enabling/disabling
+			# through a web interface is useless - it needs web
+			# server admin action too
+			safe => 0,
+			rebuild => 0,
+		}
+}
+
+sub cgi_page_from_404 ($$$) {
+	my $path = shift;
+	my $baseurl = shift;
+	my $usedirs = shift;
+
+	# fail if missing from environment or whatever
+	return undef unless defined $path;
+	return undef unless defined $baseurl;
+
+	# with usedirs on, path is like /~fred/foo/bar/ or /~fred/foo/bar or
+	#    /~fred/foo/bar/index.html
+	# with usedirs off, path is like /~fred/foo/bar.html
+	# baseurl is like 'http://people.example.com/~fred'
+
+	# convert baseurl to ~fred
+	unless ($baseurl =~ s{^https?://[^/]+/?}{}) {
+		return undef;
+	}
+
+	# convert path to /~fred/foo/bar
+	if ($usedirs) {
+		$path =~ s/\/*(?:index\.$config{htmlext})?$//;
+	}
+	else {
+		$path =~ s/\.$config{htmlext}$//;
+	}
+
+	# remove /~fred/
+	unless ($path =~ s{^/*\Q$baseurl\E/*}{}) {
+		return undef;
+	}
+
+	# special case for the index
+	unless ($path) {
+		return 'index';
+	}
+
+	return $path;
+}
+
+sub cgi ($) {
+	my $cgi=shift;
+
+	if ($ENV{REDIRECT_STATUS} eq '404') {
+		my $page = cgi_page_from_404($ENV{REDIRECT_URL},
+			$config{url}, $config{usedirs});
+		IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
+	}
+}
+
+1;
diff --git a/IkiWiki/Plugin/apache404.pm b/IkiWiki/Plugin/apache404.pm
deleted file mode 100644
index e7ce70435..000000000
--- a/IkiWiki/Plugin/apache404.pm
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/perl
-# Copyright © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
-# Licensed under the GNU GPL, version 2, or any later version published by the
-# Free Software Foundation
-package IkiWiki::Plugin::apache404;
-
-use warnings;
-use strict;
-use IkiWiki 3.00;
-
-sub import {
-	hook(type => "cgi", id => 'apache404',  call => \&cgi);
-	IkiWiki::loadplugin("goto");
-}
-
-sub getsetup () {
-	return
-		plugin => {
-			# not really a matter of safety, but enabling/disabling
-			# through a web interface is useless - it needs web
-			# server admin action too
-			safe => 0,
-			rebuild => 0,
-		}
-}
-
-sub cgi_page_from_404 ($$$) {
-	my $path = shift;
-	my $baseurl = shift;
-	my $usedirs = shift;
-
-	# fail if missing from environment or whatever
-	return undef unless defined $path;
-	return undef unless defined $baseurl;
-
-	# with usedirs on, path is like /~fred/foo/bar/ or /~fred/foo/bar or
-	#    /~fred/foo/bar/index.html
-	# with usedirs off, path is like /~fred/foo/bar.html
-	# baseurl is like 'http://people.example.com/~fred'
-
-	# convert baseurl to ~fred
-	unless ($baseurl =~ s{^https?://[^/]+/?}{}) {
-		return undef;
-	}
-
-	# convert path to /~fred/foo/bar
-	if ($usedirs) {
-		$path =~ s/\/*(?:index\.$config{htmlext})?$//;
-	}
-	else {
-		$path =~ s/\.$config{htmlext}$//;
-	}
-
-	# remove /~fred/
-	unless ($path =~ s{^/*\Q$baseurl\E/*}{}) {
-		return undef;
-	}
-
-	# special case for the index
-	unless ($path) {
-		return 'index';
-	}
-
-	return $path;
-}
-
-sub cgi ($) {
-	my $cgi=shift;
-
-	if ($ENV{REDIRECT_STATUS} eq '404') {
-		my $page = cgi_page_from_404($ENV{REDIRECT_URL},
-			$config{url}, $config{usedirs});
-		IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
-	}
-}
-
-1;
diff --git a/debian/changelog b/debian/changelog
index f3927f121..be32d3abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ikiwiki (3.04) UNRELEASED; urgency=low
 
-  * apache404: New plugin which lets you use the IkiWiki CGI script as
+  * 404: New plugin which lets you use the IkiWiki CGI script as
     an Apache 404 handler, to give the behaviour of various other wiki
     engines where visiting a nonexistent page provides you with a link
     to create it. (smcv)
diff --git a/debian/copyright b/debian/copyright
index bdfbaa573..f589b4a8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -118,7 +118,7 @@ Copyright:
  © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: apache404.pm
+Files: 404.pm
 Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
diff --git a/doc/plugins/404.mdwn b/doc/plugins/404.mdwn
new file mode 100644
index 000000000..8d36279c8
--- /dev/null
+++ b/doc/plugins/404.mdwn
@@ -0,0 +1,11 @@
+[[!template id=plugin name=404 author="[[Simon_McVittie|smcv]]"]]
+[[!tag type/useful]]
+
+This plugin lets you use the IkiWiki CGI script as an Apache 404 handler,
+to give the behaviour of various other wiki engines where visiting a
+nonexistent page provides you with a link to create it.
+
+To achieve this, put something like this in the wiki's Apache configuration
+file:
+
+    ErrorDocument 404 /cgi-bin/ikiwiki.cgi
diff --git a/doc/plugins/apache404.mdwn b/doc/plugins/apache404.mdwn
deleted file mode 100644
index bab8fb59d..000000000
--- a/doc/plugins/apache404.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!template id=plugin name=apache404 author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
-
-This plugin lets you use the IkiWiki CGI script as an Apache 404 handler,
-to give the behaviour of various other wiki engines where visiting a
-nonexistent page provides you with a link to create it.
-
-To achieve this, put something like this in the wiki's Apache configuration
-file:
-
-    ErrorDocument 404 /cgi-bin/ikiwiki.cgi
diff --git a/doc/plugins/goto.mdwn b/doc/plugins/goto.mdwn
index 21dda16b2..9c401c5d2 100644
--- a/doc/plugins/goto.mdwn
+++ b/doc/plugins/goto.mdwn
@@ -2,7 +2,7 @@
 [[!tag type/useful]]
 
 This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly
-for internal use by the [[apache404]], [[comments]] and [[recentchanges]]
+for internal use by the [[404]], [[comments]] and [[recentchanges]]
 plugins, which enable it automatically.
 
 With this plugin enabled you can link to `ikiwiki.cgi?do=goto&page=some/where`
diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index ffcbf95d4..04d7a9721 100644
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -26,11 +26,10 @@ configuration changes should work anywhere.
   Or, if you've put it in a `~/public_html`, edit
   `/etc/apache2/mods-available/userdir.conf`.
 
-You may also want to enable the [[plugins/apache404]]
-plugin. To make apache use it, the apache config file
-will need a further modification to make it use ikiwiki's CGI
-as the apache 404 handler. Something like this, with
-the path adjusted to where you've put the CGI:
+* You may also want to enable the [[plugins/404]] plugin.
+  To make apache use it, the apache config file will need a further
+  modification to make it use ikiwiki's CGI as the apache 404 handler.
+  Something like this, with the path adjusted to where you've put the CGI:
 
 	ErrorDocument 404 /cgi-bin/ikiwiki.cgi
 
diff --git a/t/404.t b/t/404.t
new file mode 100755
index 000000000..0bb3c6063
--- /dev/null
+++ b/t/404.t
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 17;
+
+BEGIN { use_ok("IkiWiki::Plugin::404"); }
+
+sub cgi_page_from_404 {
+	return IkiWiki::Plugin::404::cgi_page_from_404(shift, shift, shift);
+}
+
+$IkiWiki::config{htmlext} = 'html';
+
+is(cgi_page_from_404('/', 'http://example.com', 1), 'index');
+is(cgi_page_from_404('/index.html', 'http://example.com', 0), 'index');
+is(cgi_page_from_404('/', 'http://example.com/', 1), 'index');
+is(cgi_page_from_404('/index.html', 'http://example.com/', 0), 'index');
+
+is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user', 0),
+   'foo/bar');
+
+is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user/', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user/', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user/', 1),
+   'foo/bar');
+is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user/', 0),
+   'foo/bar');
+
+is(cgi_page_from_404('/~user/foo', 'https://example.com/~user', 1),
+   'foo');
+is(cgi_page_from_404('/~user/foo/index.html', 'https://example.com/~user', 1),
+   'foo');
+is(cgi_page_from_404('/~user/foo/', 'https://example.com/~user', 1),
+   'foo');
+is(cgi_page_from_404('/~user/foo.html', 'https://example.com/~user', 0),
+   'foo');
diff --git a/t/apache404.t b/t/apache404.t
deleted file mode 100755
index 00fc35250..000000000
--- a/t/apache404.t
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use Test::More tests => 17;
-
-BEGIN { use_ok("IkiWiki::Plugin::apache404"); }
-
-sub cgi_page_from_404 {
-	return IkiWiki::Plugin::apache404::cgi_page_from_404(shift, shift,
-	                                                     shift);
-}
-
-$IkiWiki::config{htmlext} = 'html';
-
-is(cgi_page_from_404('/', 'http://example.com', 1), 'index');
-is(cgi_page_from_404('/index.html', 'http://example.com', 0), 'index');
-is(cgi_page_from_404('/', 'http://example.com/', 1), 'index');
-is(cgi_page_from_404('/index.html', 'http://example.com/', 0), 'index');
-
-is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user', 0),
-   'foo/bar');
-
-is(cgi_page_from_404('/~user/foo/bar', 'http://example.com/~user/', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/index.html', 'http://example.com/~user/', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar/', 'http://example.com/~user/', 1),
-   'foo/bar');
-is(cgi_page_from_404('/~user/foo/bar.html', 'http://example.com/~user/', 0),
-   'foo/bar');
-
-is(cgi_page_from_404('/~user/foo', 'https://example.com/~user', 1),
-   'foo');
-is(cgi_page_from_404('/~user/foo/index.html', 'https://example.com/~user', 1),
-   'foo');
-is(cgi_page_from_404('/~user/foo/', 'https://example.com/~user', 1),
-   'foo');
-is(cgi_page_from_404('/~user/foo.html', 'https://example.com/~user', 0),
-   'foo');
-- 
cgit v1.2.3


From dd862b4639bd470cbc3e726798af2f07587cb62e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 3 Feb 2009 19:48:55 +0000
Subject: Work around XML::Atom strangeness that results in double-encoded
 posts

See [[bugs/Aggregated_Atom_feeds_are_double-encoded]]. By default,
XML::Atom outputs strings of UTF-8 bytes with the Perl UTF8 flag stripped
off, which IkiWiki assumes to be Latin-1 and re-encodes as UTF-8 on
output. XML::Feed  does not currently (0.41-1) set the magic variable to
change this behaviour (I've filed a bug on CPAN), but IkiWiki can
usefully set the same variable as a workaround.
---
 IkiWiki/Plugin/aggregate.pm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c667ee2a9..e1baae666 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -534,6 +534,11 @@ sub aggregate (@) {
 		}
 
 		foreach my $entry ($f->entries) {
+			# XML::Feed doesn't work around XML::Atom's bizarre
+			# API, so we will. Real unicode strings? Yes please.
+			# See [[bugs/Aggregated_Atom_feeds_are_double-encoded]]
+			local $XML::Atom::ForceUnicode = 1;
+
 			my $c=$entry->content;
 			# atom feeds may have no content, only a summary
 			if (! defined $c && ref $entry->summary) {
-- 
cgit v1.2.3


From 5e2e95a516e7f967654108bbc4d8e9ab71a6820f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 11 Feb 2009 12:29:39 -0500
Subject: doubled semicolons

---
 IkiWiki/Plugin/graphviz.pm  | 2 +-
 IkiWiki/Plugin/sparkline.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index b43e96a73..32e994d6b 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -45,7 +45,7 @@ sub render_graph (\%) {
 
 	if (! -e "$config{destdir}/$dest") {
 		my $pid;
-		my $sigpipe=0;;
+		my $sigpipe=0;
 		$SIG{PIPE}=sub { $sigpipe=1 };
 		$pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 1ed65e5b7..458192695 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -130,7 +130,7 @@ sub preprocess (@) {
 
 	if (! -e "$config{destdir}/$fn") {
 		my $pid;
-		my $sigpipe=0;;
+		my $sigpipe=0;
 		$SIG{PIPE}=sub { $sigpipe=1 };
 		$pid=open2(*IN, *OUT, "php");
 
-- 
cgit v1.2.3


From 46819b530bca5a3adf00278500a34363a94c1fb2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 12 Feb 2009 13:02:58 -0500
Subject: shortcut: If default_pageext is set, first look for
 shortcuts.default_pageext

Falls back to looking for shortcuts.mdwn for backwards compatabiity; there
probably exist wikis that have changed the pageext but still use
shortcuts.mdwn.
---
 IkiWiki/Plugin/shortcut.pm           |  8 ++++++--
 debian/changelog                     |  2 ++
 doc/plugins/mdwn/discussion.mdwn     |  4 ----
 doc/plugins/shortcut/discussion.mdwn | 21 +++------------------
 4 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 0e7cbd4d1..c1e6a7eb3 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -23,9 +23,13 @@ sub checkconfig () {
 	if (defined $config{srcdir}) {
 		# Preprocess the shortcuts page to get all the available shortcuts
 		# defined before other pages are rendered.
-		my $srcfile=srcfile("shortcuts.mdwn", 1);
+		my $srcfile=srcfile("shortcuts.".$config{default_pageext}, 1);
 		if (! defined $srcfile) {
-			error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+			$srcfile=srcfile("shortcuts.mdwn", 1);
+		}
+		if (! defined $srcfile) {
+			error(sprintf(gettext("shortcut plugin will not work without %s"),
+				"shortcuts.".$config{default_pageext}));
 		}
 		IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 	}
diff --git a/debian/changelog b/debian/changelog
index 294d23197..7467508f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.04) UNRELEASED; urgency=low
   * Fix unusual --setup --post-commit command line option combo.
   * Create any missing directory necessary to put the wrapper
     file into. Closes: #514384
+  * shortcut: If default_pageext is set, first look for
+    shortcuts.default_pageext.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 31 Jan 2009 19:04:45 -0500
 
diff --git a/doc/plugins/mdwn/discussion.mdwn b/doc/plugins/mdwn/discussion.mdwn
index 9ebf99b7e..4b05e7f4e 100644
--- a/doc/plugins/mdwn/discussion.mdwn
+++ b/doc/plugins/mdwn/discussion.mdwn
@@ -5,7 +5,3 @@ you need to overwrite the underlay
 dir (set underlaydir in ikiwiki.setup
 to your own underlay dir or replace underlay pages
 in your $SRC).
-
-Specially, the [[shortcut]] plugin is hardcoded to
-use shortcuts.mdwn.  So you need pay more care if
-you [[use shortcut without mdwn|shortcut/discussion]].
diff --git a/doc/plugins/shortcut/discussion.mdwn b/doc/plugins/shortcut/discussion.mdwn
index 770c95836..4e11ce08c 100644
--- a/doc/plugins/shortcut/discussion.mdwn
+++ b/doc/plugins/shortcut/discussion.mdwn
@@ -3,25 +3,10 @@ disabled [[mdwn]], to get [[shortcut]] work, you need
 commit in a shortcuts.ext (ext is `rcs|creole|html|txt|etc`),
 and edit/patch [[shortcut]].
 
-Maybe use the $default_pageext is better than hardcode .mdwn?
-
-<pre>
---- shortcut.pm.orig    2009-02-12 02:05:22.000000000 -0600
-+++ shortcut.pm 2009-02-12 04:41:30.000000000 -0600
-@@ -23,9 +23,9 @@
-        if (defined $config{srcdir}) {
-                # Preprocess the shortcuts page to get all the available shortcuts
-                # defined before other pages are rendered.
--               my $srcfile=srcfile("shortcuts.mdwn", 1);
-+               my $srcfile=srcfile("shortcuts.$config{default_pageext}", 1);
-                if (! defined $srcfile) {
--                       error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
-+                       error(gettext("shortcut plugin will not work without a shortcuts.$config{default_pageext}"));
-                }
-                IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
-        }
-</pre>
+Maybe use the `default_pageext` is better than hardcode .mdwn?
 
 --[[weakish]]
 
+> done, it will use `default_pageext` now --[[Joey]] 
+
 
-- 
cgit v1.2.3


From 2c51b18aec0cebd1a433cb541fe80f8ade7b3936 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 12 Feb 2009 16:31:05 -0500
Subject: move check_canedit, check_content to IkiWiki library from editpage

It no longer makes sense to keep these functions in editpage, because
serveral plugins now exist that use them, and users may want to disable
editpage, while leaving those plugins enabled.

Most notably, comments uses both functions, and it's entirely appropriate
to disable editpage but still want to have comments enabled.

Less likely, attachments, rename, and remove all use check_canedit -- but
it would be unusual indeed to want to use these w/o editpage.
---
 IkiWiki.pm                 | 64 ++++++++++++++++++++++++++++++++++++++++++++
 IkiWiki/Plugin/editpage.pm | 66 +---------------------------------------------
 debian/changelog           |  2 ++
 3 files changed, 67 insertions(+), 65 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 66fea4369..ce1ceb351 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1293,6 +1293,70 @@ sub indexlink () {
 	return "<a href=\"$config{url}\">$config{wikiname}</a>";
 }
 
+sub check_canedit ($$$;$) {
+	my $page=shift;
+	my $q=shift;
+	my $session=shift;
+	my $nonfatal=shift;
+	
+	my $canedit;
+	run_hooks(canedit => sub {
+		return if defined $canedit;
+		my $ret=shift->($page, $q, $session);
+		if (defined $ret) {
+			if ($ret eq "") {
+				$canedit=1;
+			}
+			elsif (ref $ret eq 'CODE') {
+				$ret->() unless $nonfatal;
+				$canedit=0;
+			}
+			elsif (defined $ret) {
+				error($ret) unless $nonfatal;
+				$canedit=0;
+			}
+		}
+	});
+	return defined $canedit ? $canedit : 1;
+}
+
+sub check_content (@) {
+	my %params=@_;
+	
+	return 1 if ! exists $hooks{checkcontent}; # optimisation
+
+	if (exists $pagesources{$params{page}}) {
+		my @diff;
+		my %old=map { $_ => 1 }
+		        split("\n", readfile(srcfile($pagesources{$params{page}})));
+		foreach my $line (split("\n", $params{content})) {
+			push @diff, $line if ! exists $old{$_};
+		}
+		$params{content}=join("\n", @diff);
+	}
+
+	my $ok;
+	run_hooks(checkcontent => sub {
+		return if defined $ok;
+		my $ret=shift->(%params);
+		if (defined $ret) {
+			if ($ret eq "") {
+				$ok=1;
+			}
+			elsif (ref $ret eq 'CODE') {
+				$ret->() unless $params{nonfatal};
+				$ok=0;
+			}
+			elsif (defined $ret) {
+				error($ret) unless $params{nonfatal};
+				$ok=0;
+			}
+		}
+
+	});
+	return defined $ok ? $ok : 1;
+}
+
 my $wikilock;
 
 sub lockwiki () {
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index c206d96a4..0068a6b11 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -51,73 +51,9 @@ sub refresh () {
 
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin,
-# and other plugins use the functions below.
+# and other plugins use the function below.
 package IkiWiki;
 
-sub check_canedit ($$$;$) {
-	my $page=shift;
-	my $q=shift;
-	my $session=shift;
-	my $nonfatal=shift;
-	
-	my $canedit;
-	run_hooks(canedit => sub {
-		return if defined $canedit;
-		my $ret=shift->($page, $q, $session);
-		if (defined $ret) {
-			if ($ret eq "") {
-				$canedit=1;
-			}
-			elsif (ref $ret eq 'CODE') {
-				$ret->() unless $nonfatal;
-				$canedit=0;
-			}
-			elsif (defined $ret) {
-				error($ret) unless $nonfatal;
-				$canedit=0;
-			}
-		}
-	});
-	return defined $canedit ? $canedit : 1;
-}
-
-sub check_content (@) {
-	my %params=@_;
-	
-	return 1 if ! exists $hooks{checkcontent}; # optimisation
-
-	if (exists $pagesources{$params{page}}) {
-		my @diff;
-		my %old=map { $_ => 1 }
-		        split("\n", readfile(srcfile($pagesources{$params{page}})));
-		foreach my $line (split("\n", $params{content})) {
-			push @diff, $line if ! exists $old{$_};
-		}
-		$params{content}=join("\n", @diff);
-	}
-
-	my $ok;
-	run_hooks(checkcontent => sub {
-		return if defined $ok;
-		my $ret=shift->(%params);
-		if (defined $ret) {
-			if ($ret eq "") {
-				$ok=1;
-			}
-			elsif (ref $ret eq 'CODE') {
-				$ret->() unless $params{nonfatal};
-				$ok=0;
-			}
-			elsif (defined $ret) {
-				error($ret) unless $params{nonfatal};
-				$ok=0;
-			}
-		}
-
-	});
-	return defined $ok ? $ok : 1;
-}
-
 sub cgi_editpage ($$) {
 	my $q=shift;
 	my $session=shift;
diff --git a/debian/changelog b/debian/changelog
index 7467508f6..8da3f8849 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ ikiwiki (3.04) UNRELEASED; urgency=low
     file into. Closes: #514384
   * shortcut: If default_pageext is set, first look for
     shortcuts.default_pageext.
+  * Allow comments, rename, remove, and attazhments plugins to be used
+    even if the editpage plugin is disabled.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 31 Jan 2009 19:04:45 -0500
 
-- 
cgit v1.2.3


From 684cd73a79405ee58e115e603213c39a33d710cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 14 Feb 2009 03:01:35 -0500
Subject: downgrade missing shortcuts page error to warning

and response to bug report
---
 IkiWiki/Plugin/shortcut.pm                                   |  8 +++++---
 ...shortcut_plugin_will_not_work_without_shortcuts.mdwn.mdwn | 12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index c1e6a7eb3..5693ee782 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -28,10 +28,12 @@ sub checkconfig () {
 			$srcfile=srcfile("shortcuts.mdwn", 1);
 		}
 		if (! defined $srcfile) {
-			error(sprintf(gettext("shortcut plugin will not work without %s"),
-				"shortcuts.".$config{default_pageext}));
+			print STDERR sprintf(gettext("shortcut plugin will not work without %s"),
+				"shortcuts.".$config{default_pageext})."\n";
+		}
+		else {
+			IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 		}
-		IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 	}
 }
 
diff --git a/doc/bugs/shortcut_plugin_will_not_work_without_shortcuts.mdwn.mdwn b/doc/bugs/shortcut_plugin_will_not_work_without_shortcuts.mdwn.mdwn
index 994929bfc..85844132d 100644
--- a/doc/bugs/shortcut_plugin_will_not_work_without_shortcuts.mdwn.mdwn
+++ b/doc/bugs/shortcut_plugin_will_not_work_without_shortcuts.mdwn.mdwn
@@ -6,3 +6,15 @@ On my initial ikiwiki -setup auto.setup, I get the following error:
 
 This is using the latest git pull of ikiwiki.
 I am not sure why it is not finding shortcuts.mdwn. -- [[JosephTurian]]
+
+> The error, and the weird paths suggest to me that you
+> have installed ikiwiki in a strange way, and it is failing
+> to find its basewiki underlay. The `$installdir` is
+> hardcoded into IkiWiki.pm at build time, based on the PREFIX
+> setting (see README).
+> 
+> If that's not set right, you'll have other problems than just this one,
+> so I suggest you check how you installed ikiwiki.
+> 
+> Anyway, I've made the shortcut plugin only warn about this..
+> --[[Joey]] 
-- 
cgit v1.2.3


From adcc349d89ada08c106f39ecb9338e3cde9668a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 14 Feb 2009 03:04:11 -0500
Subject: check for empty srcdir

This happens when using -dumpsetup
---
 IkiWiki/Plugin/shortcut.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 5693ee782..1840a5722 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -20,7 +20,7 @@ sub getsetup () {
 }
 
 sub checkconfig () {
-	if (defined $config{srcdir}) {
+	if (defined $config{srcdir} && length $config{srcdir}) {
 		# Preprocess the shortcuts page to get all the available shortcuts
 		# defined before other pages are rendered.
 		my $srcfile=srcfile("shortcuts.".$config{default_pageext}, 1);
-- 
cgit v1.2.3


From bb8b8787ef9477c027b9e5d8b7b5e1addfd1ca32 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Feb 2009 13:25:06 -0500
Subject: comments

---
 IkiWiki/Plugin/template.pm                         | 3 ++-
 debian/changelog                                   | 4 ++++
 doc/bugs/cannot_reliably_use_meta_in_template.mdwn | 2 ++
 doc/bugs/tags__44___backlinks_and_3.x.mdwn         | 2 ++
 doc/todo/tag_pagespec_function.mdwn                | 7 +++++++
 5 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 57bff20ff..b872f0962 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -10,7 +10,8 @@ use Encode;
 
 sub import {
 	hook(type => "getsetup", id => "template", call => \&getsetup);
-	hook(type => "preprocess", id => "template", call => \&preprocess);
+	hook(type => "preprocess", id => "template", call => \&preprocess,
+		scan => 1);
 }
 
 sub getsetup () {
diff --git a/debian/changelog b/debian/changelog
index 62374d2dc..c28d36c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 ikiwiki (3.05) UNRELEASED; urgency=low
 
   * debhelper v7.2; rules file minimisation.
+  * template: Load templates in scan mode.
+    This is potentially expensive, but is necessary so that meta and tag
+    directives, and other links on templates affect the page using the
+    template reliably.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
diff --git a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
index 48288a2b3..de6c227f6 100644
--- a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
+++ b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
@@ -14,3 +14,5 @@ scan pass, every page containing a template will cause the template to be
 loaded and filled out. This can be some serious additional overhead.
 
 --[[Joey]] 
+
+[[done]]
diff --git a/doc/bugs/tags__44___backlinks_and_3.x.mdwn b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
index ea0eecc80..4fe9a4723 100644
--- a/doc/bugs/tags__44___backlinks_and_3.x.mdwn
+++ b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
@@ -30,3 +30,5 @@ time, so went ahead and migrated live, spamming planet debian in the process
 > [[cannot_reliably_use_meta_in_template]]. AFAIK, this has never worked
 > reliably, although the linked page has a simple, though potentially
 > expensive fix. --[[Joey]] 
+
+> fix made, [[done]] --[[Joey]] 
diff --git a/doc/todo/tag_pagespec_function.mdwn b/doc/todo/tag_pagespec_function.mdwn
index 0a51c7220..060368179 100644
--- a/doc/todo/tag_pagespec_function.mdwn
+++ b/doc/todo/tag_pagespec_function.mdwn
@@ -8,6 +8,13 @@ match tagged pages independent of whatever the tagbase is set to.
 
  -- [[users/Jon]] 2009/02/17
 
+> So, this looks good, appreciate the patch.
+> 
+> The only problem I see is it could be confusing if `tag(foo)` matched
+> a page that just linked to the tag via a wikilink, w/o actually tagging it.
+>
+> One other thing, perhaps it should be called `tagged()`? --[[Joey]] 
+
 [[!tag patch]]
 
     --- a/plugins/IkiWiki/Plugin/tag.pm	2009-02-16 11:30:11.000000000 +0000
-- 
cgit v1.2.3


From a4497591f958f3d2fb28ef597c7870bfc4db72e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Feb 2009 13:29:08 -0500
Subject: Revert "comments" (stupid commit)

This reverts commit bb8b8787ef9477c027b9e5d8b7b5e1addfd1ca32.
---
 IkiWiki/Plugin/template.pm                         | 3 +--
 debian/changelog                                   | 4 ----
 doc/bugs/cannot_reliably_use_meta_in_template.mdwn | 2 --
 doc/bugs/tags__44___backlinks_and_3.x.mdwn         | 2 --
 doc/todo/tag_pagespec_function.mdwn                | 7 -------
 5 files changed, 1 insertion(+), 17 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b872f0962..57bff20ff 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -10,8 +10,7 @@ use Encode;
 
 sub import {
 	hook(type => "getsetup", id => "template", call => \&getsetup);
-	hook(type => "preprocess", id => "template", call => \&preprocess,
-		scan => 1);
+	hook(type => "preprocess", id => "template", call => \&preprocess);
 }
 
 sub getsetup () {
diff --git a/debian/changelog b/debian/changelog
index c28d36c84..62374d2dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,6 @@
 ikiwiki (3.05) UNRELEASED; urgency=low
 
   * debhelper v7.2; rules file minimisation.
-  * template: Load templates in scan mode.
-    This is potentially expensive, but is necessary so that meta and tag
-    directives, and other links on templates affect the page using the
-    template reliably.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
diff --git a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
index de6c227f6..48288a2b3 100644
--- a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
+++ b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
@@ -14,5 +14,3 @@ scan pass, every page containing a template will cause the template to be
 loaded and filled out. This can be some serious additional overhead.
 
 --[[Joey]] 
-
-[[done]]
diff --git a/doc/bugs/tags__44___backlinks_and_3.x.mdwn b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
index 4fe9a4723..ea0eecc80 100644
--- a/doc/bugs/tags__44___backlinks_and_3.x.mdwn
+++ b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
@@ -30,5 +30,3 @@ time, so went ahead and migrated live, spamming planet debian in the process
 > [[cannot_reliably_use_meta_in_template]]. AFAIK, this has never worked
 > reliably, although the linked page has a simple, though potentially
 > expensive fix. --[[Joey]] 
-
-> fix made, [[done]] --[[Joey]] 
diff --git a/doc/todo/tag_pagespec_function.mdwn b/doc/todo/tag_pagespec_function.mdwn
index 060368179..0a51c7220 100644
--- a/doc/todo/tag_pagespec_function.mdwn
+++ b/doc/todo/tag_pagespec_function.mdwn
@@ -8,13 +8,6 @@ match tagged pages independent of whatever the tagbase is set to.
 
  -- [[users/Jon]] 2009/02/17
 
-> So, this looks good, appreciate the patch.
-> 
-> The only problem I see is it could be confusing if `tag(foo)` matched
-> a page that just linked to the tag via a wikilink, w/o actually tagging it.
->
-> One other thing, perhaps it should be called `tagged()`? --[[Joey]] 
-
 [[!tag patch]]
 
     --- a/plugins/IkiWiki/Plugin/tag.pm	2009-02-16 11:30:11.000000000 +0000
-- 
cgit v1.2.3


From 9acc4d578d7468ebb54a02377e571c89bb76ad9b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Feb 2009 13:30:07 -0500
Subject: template: Load templates in scan mode

This is potentially expensive, but is necessary so that meta and tag
directives, and other links on templates affect the page using the template
reliably.
---
 IkiWiki/Plugin/template.pm                         | 3 ++-
 debian/changelog                                   | 4 ++++
 doc/bugs/cannot_reliably_use_meta_in_template.mdwn | 2 ++
 doc/bugs/tags__44___backlinks_and_3.x.mdwn         | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 57bff20ff..b872f0962 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -10,7 +10,8 @@ use Encode;
 
 sub import {
 	hook(type => "getsetup", id => "template", call => \&getsetup);
-	hook(type => "preprocess", id => "template", call => \&preprocess);
+	hook(type => "preprocess", id => "template", call => \&preprocess,
+		scan => 1);
 }
 
 sub getsetup () {
diff --git a/debian/changelog b/debian/changelog
index 62374d2dc..c28d36c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 ikiwiki (3.05) UNRELEASED; urgency=low
 
   * debhelper v7.2; rules file minimisation.
+  * template: Load templates in scan mode.
+    This is potentially expensive, but is necessary so that meta and tag
+    directives, and other links on templates affect the page using the
+    template reliably.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
diff --git a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
index 48288a2b3..de6c227f6 100644
--- a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
+++ b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
@@ -14,3 +14,5 @@ scan pass, every page containing a template will cause the template to be
 loaded and filled out. This can be some serious additional overhead.
 
 --[[Joey]] 
+
+[[done]]
diff --git a/doc/bugs/tags__44___backlinks_and_3.x.mdwn b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
index ea0eecc80..4fe9a4723 100644
--- a/doc/bugs/tags__44___backlinks_and_3.x.mdwn
+++ b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
@@ -30,3 +30,5 @@ time, so went ahead and migrated live, spamming planet debian in the process
 > [[cannot_reliably_use_meta_in_template]]. AFAIK, this has never worked
 > reliably, although the linked page has a simple, though potentially
 > expensive fix. --[[Joey]] 
+
+> fix made, [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 52f2235e6072bfb2e39a52bd8c106ae890ba4a5a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Feb 2009 19:36:58 -0500
Subject: goto: Fix redirect to comments.

---
 IkiWiki/Plugin/goto.pm | 2 +-
 debian/changelog       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 7cc8cb484..4fd1471e9 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -38,7 +38,7 @@ sub cgi_goto ($;$) {
 	# permalink. Comments do.
 	if (IkiWiki::isinternal($page) &&
 	    defined $pagestate{$page}{meta}{permalink}) {
-		redirect($q, $pagestate{$page}{meta}{permalink});
+	    	Ikiwiki::redirect($q, $pagestate{$page}{meta}{permalink});
 	}
 
 	my $link = bestlink("", $page);
diff --git a/debian/changelog b/debian/changelog
index c28d36c84..b644ac99c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low
     This is potentially expensive, but is necessary so that meta and tag
     directives, and other links on templates affect the page using the
     template reliably.
+  * goto: Fix redirect to comments.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
-- 
cgit v1.2.3


From 5f96944dd5ad099d96adbf0273b4dc7d1da98829 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Feb 2009 19:37:36 -0500
Subject: typo

---
 IkiWiki/Plugin/goto.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 4fd1471e9..06ec0bdca 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -38,7 +38,7 @@ sub cgi_goto ($;$) {
 	# permalink. Comments do.
 	if (IkiWiki::isinternal($page) &&
 	    defined $pagestate{$page}{meta}{permalink}) {
-	    	Ikiwiki::redirect($q, $pagestate{$page}{meta}{permalink});
+	    	IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
 	}
 
 	my $link = bestlink("", $page);
-- 
cgit v1.2.3


From e611d4cdc10d2fb66d41ec8e101e6e35ddc9fdbf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 19 Feb 2009 18:49:30 -0500
Subject: add tag() pagespec

patch from jon
---
 IkiWiki/Plugin/tag.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index d43910910..48c197748 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -125,4 +125,12 @@ sub pagetemplate (@) {
 	}
 }
 
+package IkiWiki::PageSpec;
+
+sub match_tag ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+	return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+}
+
 1
-- 
cgit v1.2.3


From f813b10fef13682c95ada9c9a9ccf05ff602c172 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 19 Feb 2009 18:54:25 -0500
Subject: rename tag() to tagged(); add docs

---
 IkiWiki/Plugin/tag.pm               | 2 +-
 debian/changelog                    | 1 +
 doc/ikiwiki/pagespec.mdwn           | 3 ++-
 doc/plugins/tag.mdwn                | 3 +++
 doc/todo/tag_pagespec_function.mdwn | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 48c197748..8fe9c6828 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -127,7 +127,7 @@ sub pagetemplate (@) {
 
 package IkiWiki::PageSpec;
 
-sub match_tag ($$;@) {
+sub match_tagged ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 	return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
diff --git a/debian/changelog b/debian/changelog
index 810c59f4e..80b3c5d8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low
     template reliably.
   * goto: Fix redirect to comments.
   * Add noextension parameter to htmlize hooks to support, eg, Makefile.
+  * Add tagged() PageSpec.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 86abe5745..b476bde1f 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -25,6 +25,7 @@ match all pages except for Discussion pages and the SandBox:
 Some more elaborate limits can be added to what matches using these functions:
 
 * "`link(page)`" - match only pages that link to a given page (or glob)
+* "`tagged(tag)`" - match pages that are tagged or link to the given tag (or glob)
 * "`backlink(page)`" - match only pages that a given page links to
 * "`creation_month(month)`" - match only pages created on the given month
 * "`creation_day(mday)`" - or day of the month
@@ -65,7 +66,7 @@ More complex expressions can also be created, by using parentheses for
 grouping. For example, to match pages in a blog that are tagged with either
 of two tags, use:
 
-	blog/* and (link(tag/foo) or link(tag/bar))
+	blog/* and (tagged(foo) or tagged(bar))
 
 Note that page names in PageSpecs are matched against the absolute
 filenames of the pages in the wiki, so a pagespec "foo" used on page
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 17bb086a1..8ff70a069 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -5,6 +5,9 @@ This plugin provides the [[ikiwiki/directive/tag]] and
 [[ikiwiki/directive/taglink]] [[directives|ikiwiki/directive]].
 These directives allow tagging pages.
 
+It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
+match pages that are tagged with a specific tag.
+
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
diff --git a/doc/todo/tag_pagespec_function.mdwn b/doc/todo/tag_pagespec_function.mdwn
index 060368179..681a1f661 100644
--- a/doc/todo/tag_pagespec_function.mdwn
+++ b/doc/todo/tag_pagespec_function.mdwn
@@ -15,7 +15,7 @@ match tagged pages independent of whatever the tagbase is set to.
 >
 > One other thing, perhaps it should be called `tagged()`? --[[Joey]] 
 
-[[!tag patch]]
+[[!tag patch done]]
 
     --- a/plugins/IkiWiki/Plugin/tag.pm	2009-02-16 11:30:11.000000000 +0000
     +++ b/plugins/IkiWiki/Plugin/tag.pm	2009-02-17 15:40:03.000000000 +0000
-- 
cgit v1.2.3


From 63439fa10b2b59e85337d7a0f71ddaa38dfb0018 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Feb 2009 16:56:02 -0500
Subject: bzr: Add missing stub rcs_diff.

---
 IkiWiki/Plugin/bzr.pm | 4 ++++
 debian/changelog      | 1 +
 2 files changed, 5 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 16c959069..783623dee 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -255,6 +255,10 @@ sub rcs_recentchanges ($) {
 	return @ret;
 }
 
+sub rcs_diff ($) {
+	# TODO
+}
+
 sub rcs_getctime ($) {
 	my ($file) = @_;
 
diff --git a/debian/changelog b/debian/changelog
index 1dc01878b..ac7e2f21d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low
   * Add tagged() PageSpec.
   * Updated German translation (Kai Wasserbäch). Closes: #516770
   * Setup automator: Prompt for password twice. Closes: #516973
+  * bzr: Add missing stub rcs_diff.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
-- 
cgit v1.2.3


From b30c1b0c38bc8e6730a76135e6bff695d0f778c2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 26 Feb 2009 02:31:13 -0500
Subject: comments: Avoid showing comment moderation button in prefs to
 non-admins.

---
 IkiWiki/Plugin/comments.pm | 3 ++-
 debian/changelog           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3cdffe856..ee53dbc91 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -605,7 +605,8 @@ sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
-	if ($form->title eq "preferences") {
+	if ($form->title eq "preferences" &&
+	    IkiWiki::is_admin($params{session}->param("name"))) {
 		push @{$params{buttons}}, "Comment Moderation";
 		if ($form->submitted && $form->submitted eq "Comment Moderation") {
 			commentmoderation($params{cgi}, $params{session});
diff --git a/debian/changelog b/debian/changelog
index ac7e2f21d..68d08ad8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low
   * Updated German translation (Kai Wasserbäch). Closes: #516770
   * Setup automator: Prompt for password twice. Closes: #516973
   * bzr: Add missing stub rcs_diff.
+  * comments: Avoid showing comment moderation button in prefs to non-admins.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
-- 
cgit v1.2.3


From 596b2906fdc863fac2a3c86abbdb39416eee1961 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 26 Feb 2009 14:09:26 -0500
Subject: bzr: Add missing rcs_diff. (liw)

---
 IkiWiki/Plugin/bzr.pm                              | 18 ++++++++++-
 debian/changelog                                   |  2 +-
 .../bzr_plugin_does_not_define_rcs__95__diff.mdwn  | 36 +---------------------
 3 files changed, 19 insertions(+), 37 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 783623dee..883007367 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -256,7 +256,23 @@ sub rcs_recentchanges ($) {
 }
 
 sub rcs_diff ($) {
-	# TODO
+	my $taintedrev=shift;
+	my ($rev) = $taintedrev =~ /^(\d+(\.\d+)*)$/; # untaint
+
+	my $prevspec = "before:" . $rev;
+	my $revspec = "revno:" . $rev;
+	my @cmdline = ("bzr", "diff", "--old", $config{srcdir},
+		"--new", $config{srcdir},
+		"-r", $prevspec . ".." . $revspec);
+	open (my $out, "@cmdline |");
+
+	my @lines = <$out>;
+	if (wantarray) {
+		return @lines;
+	}
+	else {
+		return join("", @lines);
+	}
 }
 
 sub rcs_getctime ($) {
diff --git a/debian/changelog b/debian/changelog
index 68d08ad8e..90b672e8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low
   * Add tagged() PageSpec.
   * Updated German translation (Kai Wasserbäch). Closes: #516770
   * Setup automator: Prompt for password twice. Closes: #516973
-  * bzr: Add missing stub rcs_diff.
+  * bzr: Add missing rcs_diff. (liw)
   * comments: Avoid showing comment moderation button in prefs to non-admins.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
diff --git a/doc/bugs/bzr_plugin_does_not_define_rcs__95__diff.mdwn b/doc/bugs/bzr_plugin_does_not_define_rcs__95__diff.mdwn
index 110f769c7..0294ec62e 100644
--- a/doc/bugs/bzr_plugin_does_not_define_rcs__95__diff.mdwn
+++ b/doc/bugs/bzr_plugin_does_not_define_rcs__95__diff.mdwn
@@ -24,38 +24,4 @@ Grepping to verify absence of rcs_diff:
 >> seems to work. I am unfortunately not ready to set up a git repository that you
 >> can pull from. --liw
 
-    diff --git a/IkiWiki/Plugin/.bzr.pm.swp b/IkiWiki/Plugin/.bzr.pm.swp
-    new file mode 100644
-    index 0000000..712120c
-    Binary files /dev/null and b/IkiWiki/Plugin/.bzr.pm.swp differ
-    diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
-    index 783623d..f1d5854 100644
-    --- a/IkiWiki/Plugin/bzr.pm
-    +++ b/IkiWiki/Plugin/bzr.pm
-    @@ -256,7 +256,25 @@ sub rcs_recentchanges ($) {
-     }
-   
-     sub rcs_diff ($) {
-    -   # TODO
-    +        my $taintedrev=shift;
-    +   my ($rev) = $taintedrev =~ /^(\d+(\.\d+)*)$/; # untaint
-    +           print STDERR "taintedrev: $taintedrev\nrev: $rev\n";
-    +
-    +   my $prevspec = "before:" . $rev;
-    +   my $revspec = "revno:" . $rev;
-    +        my @cmdline = ("bzr", "diff", "--old", $config{srcdir},
-    +                  "--new", $config{srcdir},
-    +                  "-r", $prevspec . ".." . $revspec);
-    +   print STDERR "cmdline: @cmdline\n";
-    +        open (my $out, "@cmdline |");
-    +
-    +   my @lines = <$out>;
-    +        if (wantarray) {
-    +                return @lines;
-    +        }
-    +        else {
-    +                return join("", @lines);
-    +        }
-     }
-   
-     sub rcs_getctime ($) {
+[[done]] --[[Joey]] 
-- 
cgit v1.2.3


From affd4ca3daa8da233d915516fb668c8f99fffe51 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 27 Feb 2009 13:21:29 -0500
Subject: goto: Fix typo that broke recentchanges_link compatability.

---
 IkiWiki/Plugin/goto.pm | 2 +-
 debian/changelog       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 06ec0bdca..3f40c5859 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -65,7 +65,7 @@ sub cgi ($) {
 	my $do = $cgi->param('do');
 
 	if (defined $do && ($do eq 'goto' || $do eq 'commenter' ||
-	                       $do eq 'recentchanged_link')) {
+	                       $do eq 'recentchanges_link')) {
 		# goto is the preferred name for this; recentchanges_link and
 		# commenter are for compatibility with any saved URLs
 		cgi_goto($cgi);
diff --git a/debian/changelog b/debian/changelog
index 90b672e8d..0b1eec6cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low
   * Setup automator: Prompt for password twice. Closes: #516973
   * bzr: Add missing rcs_diff. (liw)
   * comments: Avoid showing comment moderation button in prefs to non-admins.
+  * goto: Fix typo that broke recentchanges_link compatability.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
-- 
cgit v1.2.3


From e7d2da564145d4ad05c3dcbe9d71bbf091243b91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 7 Mar 2009 14:33:11 -0500
Subject: wmd plugin from willu

---
 IkiWiki/Plugin/wmd.pm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 IkiWiki/Plugin/wmd.pm

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
new file mode 100644
index 000000000..074e1df6f
--- /dev/null
+++ b/IkiWiki/Plugin/wmd.pm
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::wmd;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+use POSIX;
+use Encode;
+
+sub import {
+	add_underlay("wmd");
+	hook(type => "getsetup", id => "wmd", call => \&getsetup);
+	hook(type => "formbuilder_setup", id => "wmd", call => \&formbuilder_setup);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+}
+
+sub formbuilder_setup (@) {
+	my %params=@_;
+	my $form=$params{form};
+
+	return if ! defined $form->field("do");
+	
+	return unless (($form->field("do") eq "edit") ||
+				($form->field("do") eq "create"));
+
+	$form->tmpl_param("wmd_preview", "<div class=\"wmd-preview\"></div>\n".include_javascript(undef, 1));
+}
+
+sub include_javascript ($;$) {
+	my $page=shift;
+	my $absolute=shift;
+	
+	return '<script src="'.urlto("wmd.js", $page, $absolute).
+		'" type="text/javascript"></script>'."\n";
+}
+
+1
+
-- 
cgit v1.2.3


From 029cf94493ca6fc7e13245539c138d3884adc61f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 7 Mar 2009 14:34:31 -0500
Subject: rebuild not needed

This plugin only affects the page edit, not the compiled wiki.
---
 IkiWiki/Plugin/wmd.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 074e1df6f..3372ffe38 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -17,7 +17,6 @@ sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
-			rebuild => 1,
 		},
 }
 
@@ -30,7 +29,8 @@ sub formbuilder_setup (@) {
 	return unless (($form->field("do") eq "edit") ||
 				($form->field("do") eq "create"));
 
-	$form->tmpl_param("wmd_preview", "<div class=\"wmd-preview\"></div>\n".include_javascript(undef, 1));
+	$form->tmpl_param("wmd_preview", "<div class=\"wmd-preview\"></div>\n".
+		include_javascript(undef, 1));
 }
 
 sub include_javascript ($;$) {
@@ -42,4 +42,3 @@ sub include_javascript ($;$) {
 }
 
 1
-
-- 
cgit v1.2.3


From 72dd9a9a0434e1682d7e27b935500c010a03dddc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 7 Mar 2009 18:54:26 -0500
Subject: make wmd comment support comment editing (I think)

---
 IkiWiki/Plugin/wmd.pm      | 5 +++--
 templates/editcomment.tmpl | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 3372ffe38..9e9f17f7f 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -26,8 +26,9 @@ sub formbuilder_setup (@) {
 
 	return if ! defined $form->field("do");
 	
-	return unless (($form->field("do") eq "edit") ||
-				($form->field("do") eq "create"));
+	return unless $form->field("do") eq "edit" ||
+			$form->field("do") eq "create" ||
+			$form->field("do") eq "comment";
 
 	$form->tmpl_param("wmd_preview", "<div class=\"wmd-preview\"></div>\n".
 		include_javascript(undef, 1));
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 891bcae65..7590cdfd7 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -15,6 +15,7 @@ Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
 IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
 <TMPL_VAR NAME="FORM-END">
+<TMPL_VAR WMD_PREVIEW>
 
 <TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
-- 
cgit v1.2.3


From 9a82ef32b96b07278b90a1219fa555fa2a970912 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 7 Mar 2009 19:22:27 -0500
Subject: look for wmd/wmd.js

This means that the underlay needs to have a wmd/wmd/wmd.js,
which is a trifle weird, but it isolates all the wmd stuff in a
single wmd subdirectory of the built wiki. The wmd/images creating
a toplevel images directory was particularly bad.
---
 IkiWiki/Plugin/wmd.pm | 2 +-
 doc/plugins/wmd.mdwn  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 9e9f17f7f..bdbcecc06 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -38,7 +38,7 @@ sub include_javascript ($;$) {
 	my $page=shift;
 	my $absolute=shift;
 	
-	return '<script src="'.urlto("wmd.js", $page, $absolute).
+	return '<script src="'.urlto("wmd/wmd.js", $page, $absolute).
 		'" type="text/javascript"></script>'."\n";
 }
 
diff --git a/doc/plugins/wmd.mdwn b/doc/plugins/wmd.mdwn
index 31a508cdb..dc9a30703 100644
--- a/doc/plugins/wmd.mdwn
+++ b/doc/plugins/wmd.mdwn
@@ -6,10 +6,11 @@
 
 To use the plugin, you will need to install WMD. Download the [WMD
 source](http://wmd-editor.com/downloads/wmd-1.0.1.zip).  In that zip file
-you'll find a few example html files, a readme and `wmd` directory.  Move the
-`wmd` directory into the ikiwiki `underlaydir` directory (ie
-`/usr/share/ikiwiki/`).  You should now have a `wmd/wmd.js` file as well as
-some other javascript files and an images directory in the same place.
+you'll find a few example html files, a readme and `wmd` directory.  Create
+a 'wmd' subdirectory in the ikiwiki `underlaydir` directory (ie `sudo mkdir
+/usr/share/ikiwiki/wmd`). Move the `wmd` directory into the directory you
+made. You should now have a `wmd/wmd/wmd.js` file as well as some other
+javascript files and an images directory in the same place.
 
 Note that the WMD plugin does **not** handle ikiwiki directives.  For this
 reason the normal `preview` button remains.
-- 
cgit v1.2.3


From 1bf100cfdebee69fc53d2cdf77d626b9fe8be987 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 8 Mar 2009 13:11:26 -0400
Subject: configure wmd to leave text in markdown

---
 IkiWiki/Plugin/wmd.pm      | 13 ++++++++++---
 doc/todo/mdwn_preview.mdwn |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index bdbcecc06..9ddd237ab 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -37,9 +37,16 @@ sub formbuilder_setup (@) {
 sub include_javascript ($;$) {
 	my $page=shift;
 	my $absolute=shift;
-	
-	return '<script src="'.urlto("wmd/wmd.js", $page, $absolute).
-		'" type="text/javascript"></script>'."\n";
+
+	my $wmdjs=urlto("wmd/wmd.js", $page, $absolute);
+	return <<"EOF"
+<script type="text/javascript">
+wmd_options = {
+	output: "Markdown"
+};
+</script>
+<script src="$wmdjs" type="text/javascript"></script>
+EOF
 }
 
 1
diff --git a/doc/todo/mdwn_preview.mdwn b/doc/todo/mdwn_preview.mdwn
index 2fa460336..3008eb529 100644
--- a/doc/todo/mdwn_preview.mdwn
+++ b/doc/todo/mdwn_preview.mdwn
@@ -85,4 +85,5 @@ remains.  Some CSS to clean up the display of the live WMD preview would be good
 > converted from mdwn to html. I think that wmd is converting the mdwn
 > into html when the form is posted, so it would also save like that.
 > I assume that is designed for websites that do not use markdown
-> internally. Doesn't it have a setting to leave it as markdown? --[[Joey]] 
+> internally. Doesn't it have a setting to leave it as markdown?
+>> Found setting, fixed. --[[Joey]] 
-- 
cgit v1.2.3


From d3b4c2dbd13f6721042db7a7b6843851c9037551 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 8 Mar 2009 18:46:18 -0400
Subject: avoid potential infinite loop in smiley expansion

- In 3.05, ikiwiki began expanding templates in scan mode,
  for annoying, expensive, but ultimatly necessary reasons
  of correctness.
- Smiley processing has a bug: It inserts a span for the smiley,
  and then continues searching forward in the content for more,
  starting at $end_of_smiley+1. Which means it searches for smilies
  in the span too! And if it somehow finds one, we get an infinite loop
  here.
- This bug can, probably, only be tickled if a htmllink to
  show the smiley fails, because the smiley file doesn't exist,
  or because ikiwiki doesn't know about it. In that case,
  a link will be inserted to _create_ the missing page,
  and that link will include the smiley inside the <a></a>.
- When a template is expanded in scan mode, and it contains
  an inline, the sanitize hook is run during scan mode,
  which never happened before. That causes the smiley processor
  to run, before ikiwiki is, necessarily, aware that all
  the smiley files exist (depending on scan order). So
  it inserts creation links for them, and triggers the bug.

I've put in the simple fix of jumping forward past the inserted
span, and it does fix the problem. I will need to look in a bit
more detail into why an inline nested inside a template is
fully expanded during the scan pass -- that really shouldn't
be necessary, and it makes things much slower than they need
to be.
---
 IkiWiki/Plugin/smiley.pm | 6 +++---
 debian/changelog         | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 1697a37c1..0d77916d0 100644
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -87,10 +87,10 @@ MATCH:	while (m{(?:^|(?<=\s|>))(\\?)$smiley_regexp(?:(?=\s|<)|$)}g) {
 		}
 		else {
 			# Replace the smiley with its expanded value.
-			substr($_, $spos, length($smiley))=
-				htmllink($params{page}, $params{destpage},
+			my $link=htmllink($params{page}, $params{destpage},
 				         $smileys{$smiley}, linktext => $smiley);
-			pos=$epos+1;
+			substr($_, $spos, length($smiley))=$link;
+			pos=$epos+length($link);
 		}
 	}
 
diff --git a/debian/changelog b/debian/changelog
index d6ee6fd8a..e5d522200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (3.07) UNRELEASED; urgency=low
   * Updated French translation (Jean-Luc Coulon). Closes: #518510
   * wmd: New plugin contributed by William Uther to support the WMD
     Wysiwym markdown editor.
+  * smiley: Avoid infinite loop in smiley expansion. Closes: #518805
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 Mar 2009 15:43:02 -0500
 
-- 
cgit v1.2.3


From dd2fa2efb956f8af6c98d37f8cfd280df2f97cb5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 8 Mar 2009 18:57:47 -0400
Subject: When loading a template in scan mode, let preprocess know it only
 needs to scan.

This makes wikis such as zack's much faster in the scan pass.
In that pass, when a template contains an inline, there is no reason to
process the entire inline and all its pages. I'd forgotten to pass
along the flag to let preprocess() know it was in scan mode, leading to
much unncessary churning.
---
 IkiWiki/Plugin/template.pm | 6 +++++-
 debian/changelog           | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b872f0962..b6097bb49 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -69,9 +69,13 @@ sub preprocess (@) {
 		}
 	}
 
+	# This needs to run even in scan mode, in order to process
+	# links and other metadata includes via the template.
+	my $scan=! defined wantarray;
+
 	return IkiWiki::preprocess($params{page}, $params{destpage},
 		IkiWiki::filter($params{page}, $params{destpage},
-		$template->output));
+		$template->output), $scan);
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index e5d522200..95d414bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.07) UNRELEASED; urgency=low
   * wmd: New plugin contributed by William Uther to support the WMD
     Wysiwym markdown editor.
   * smiley: Avoid infinite loop in smiley expansion. Closes: #518805
+  * template: When loading a template in scan mode, let preprocess
+    know it only needs to scan.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 Mar 2009 15:43:02 -0500
 
-- 
cgit v1.2.3


From 793e9332c3fc6db6733dce6783d6ac9c8058bb8d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Mar 2009 13:52:51 -0400
Subject: avoid uninitialized value warnings

---
 IkiWiki/Plugin/404.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index 5550ea7d1..bae9e15d1 100644
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -67,7 +67,8 @@ sub cgi_page_from_404 ($$$) {
 sub cgi ($) {
 	my $cgi=shift;
 
-	if ($ENV{REDIRECT_STATUS} eq '404') {
+	if (exists $ENV{REDIRECT_STATUS} && 
+	    $ENV{REDIRECT_STATUS} eq '404') {
 		my $page = cgi_page_from_404($ENV{REDIRECT_URL},
 			$config{url}, $config{usedirs});
 		IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
-- 
cgit v1.2.3


From 7bd0d536442493a8898981a8a784bf16126085c5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Mar 2009 14:01:40 -0400
Subject: git: Fix utf-8 encoding of author names.

I guess what's happening here is that since the name
is passed to git via an environment variable, perl's normal
utf-8 IO layer stuff doesn't work. So we have to explicitly
decode the string from perl's internal representation into
utf-8.
---
 IkiWiki/Plugin/git.pm | 2 +-
 debian/changelog      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 042c69f5a..12f3a74cb 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -447,7 +447,7 @@ sub rcs_commit_staged ($$$) {
 	# Set the commit author and email to the web committer.
 	my %env=%ENV;
 	if (defined $user || defined $ipaddr) {
-		my $u=defined $user ? $user : $ipaddr;
+		my $u=encode_utf8(defined $user ? $user : $ipaddr);
 		$ENV{GIT_AUTHOR_NAME}=$u;
 		$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
 	}
diff --git a/debian/changelog b/debian/changelog
index c66db85a2..a7e7544c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.08) UNRELEASED; urgency=low
+
+  * git: Fix utf-8 encoding of author names.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Mar 2009 14:00:21 -0400
+
 ikiwiki (3.07) unstable; urgency=low
  
   * Updated German translation (Kai Wasserbäch). Closes: #518377
-- 
cgit v1.2.3


From 4ac0b2953131d7a53562ab8918c8e5a49952d8ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 9 Mar 2009 14:18:55 -0400
Subject: git: Manually decode git output from utf-8, avoids warning messages
 on invalidly encoded output.

---
 IkiWiki/Plugin/git.pm | 12 +++++++-----
 debian/changelog      |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 12f3a74cb..b386ab71b 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -136,14 +136,16 @@ sub safe_git (&@) {
 	}
 	# In parent.
 
+	# git output is probably utf-8 encoded, but may contain
+	# other encodings or invalidly encoded stuff. So do not rely
+	# on the normal utf-8 IO layer, decode it by hand.
+	binmode($OUT);
+
 	my @lines;
 	while (<$OUT>) {
+		$_=decode_utf8($_, 0);
+
 		chomp;
-		
-		# check for invalid utf-8, and toss it back to avoid crashes
-		if (! utf8::valid($_)) {
-			$_=encode_utf8($_);
-		}
 
 		push @lines, $_;
 	}
diff --git a/debian/changelog b/debian/changelog
index a7e7544c6..77b5d9fa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.08) UNRELEASED; urgency=low
 
   * git: Fix utf-8 encoding of author names.
+  * git: Manually decode git output from utf-8, avoids
+    warning messages on invalidly encoded output.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 09 Mar 2009 14:00:21 -0400
 
-- 
cgit v1.2.3


From 55b83cb7bd1cd7c60bb45dc22c3745dd80a63fed Mon Sep 17 00:00:00 2001
From: chrysn <chrysn@fsfe.org>
Date: Tue, 17 Mar 2009 20:19:11 +0100
Subject: implement sort=title_natural for inline

adds a new sorting order, title_natural, that uses Sort::Naturally's
ncmp function to provide better sorting for inlines
---
 IkiWiki/Plugin/inline.pm          | 4 ++++
 doc/ikiwiki/directive/inline.mdwn | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2205ebffc..a89e827c1 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -194,6 +194,10 @@ sub preprocess_inline (@) {
 	if (exists $params{sort} && $params{sort} eq 'title') {
 		@list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
 	}
+	elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
+		require Sort::Naturally;
+		@list=sort { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) } @list;
+	}
 	elsif (exists $params{sort} && $params{sort} eq 'mtime') {
 		@list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;
 	}
diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index 40670e1e7..3f9a9ede5 100644
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -87,7 +87,10 @@ Here are some less often needed parameters:
   inlining page.
 * `sort` - Controls how inlined pages are sorted. The default, "age" is to
   sort newest created pages first. Setting it to "title" will sort pages by
-  title, and "mtime" sorts most recently modified pages first.
+  title, and "mtime" sorts most recently modified pages first. If
+  [Sort::Naturally](http://search.cpan.org/dist/Sort-Naturally/lib/Sort/Naturally.pm)
+  is installed, `sort` can be set to "title_natural" to sort by title with
+  numbers treated as such ("1 2 9 10 20" instead of "1 10 2 20 9").
 * `reverse` - If set to "yes", causes the sort order to be reversed.
 * `feedshow` - Specify the maximum number of matching pages to include in
   the rss/atom feeds. The default is the same as the `show` value above.
-- 
cgit v1.2.3


From bb258b56b29cb01f27bdc0dfd0bced55a88574ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 19 Mar 2009 15:35:57 -0400
Subject: avoid crashing if Sort::Naturally is not installed

---
 IkiWiki/Plugin/inline.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a89e827c1..218fd7515 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -195,7 +195,10 @@ sub preprocess_inline (@) {
 		@list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
 	}
 	elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
-		require Sort::Naturally;
+		eval q{use Sort::Naturally};
+		if ($@) {
+			error(gettext("Sort::Naturally needed for title_natural sort"));
+		}
 		@list=sort { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) } @list;
 	}
 	elsif (exists $params{sort} && $params{sort} eq 'mtime') {
-- 
cgit v1.2.3


From a1c8520ce8798dcd2d6b16a59da93afbd4bbf86b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 19 Mar 2009 16:01:23 -0400
Subject: inline: Fix urls to feed when feedfile is used on an index page.

It would be better to use urlto() here, but will_render
has not yet been called on the feed files at this point, so
it won't work. (And reorganizing so it can be is tricky.)
---
 IkiWiki/Plugin/inline.pm                                     | 4 ++--
 debian/changelog                                             | 1 +
 doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 218fd7515..9d7d4b0fd 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -281,8 +281,8 @@ sub preprocess_inline (@) {
 		}
 	}
 
-	my $rssurl=basename($feedbase."rss".$feednum) if $feeds && $rss;
-	my $atomurl=basename($feedbase."atom".$feednum) if $feeds && $atom;
+	my $rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $rss;
+	my $atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $atom;
 
 	my $ret="";
 
diff --git a/debian/changelog b/debian/changelog
index 8266afa09..06707a83c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low
 
   * inline: Add title_natural sort order, using Sort::Naturally
     (chrysn)
+  * inline: Fix urls to feed when feedfile is used on an index page.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Mar 2009 15:32:49 -0400
 
diff --git a/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn b/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn
index 1653e0b02..6b8781a8c 100644
--- a/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn
+++ b/doc/bugs/feedfile_does_the_wrong_thing_from_index.mdwn2.mdwn
@@ -3,3 +3,5 @@
 When I put the following !inline in my index.mdwn, it generate a file called index/graphics.rss.  However, the link in the RSS button is to graphics.rss (i.e., not in the index/ directory).
 
 `\[[!inline pages="link(tags/graphics) and ./posts/* and !*/Discussion" show="10" feedfile=graphics feedonly=yes]]`
+
+[[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 2c86616a6a10397e47017cbccf0cbfd7992a497b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 20 Mar 2009 16:24:19 -0400
Subject: fix rcs_getctime to return first, not last, change time

This was being buggy and returning the file's last change time, not its
creation time.
---
 IkiWiki/Plugin/mercurial.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 6c4855e57..11fdec529 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -236,7 +236,7 @@ sub rcs_getctime ($) {
 
 	# XXX filename passes through the shell here, should try to avoid
 	# that just in case
-	my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", '1', 
+	my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v",
 		"--style", "default", "$config{srcdir}/$file");
 	open (my $out, "@cmdline |");
 
@@ -249,7 +249,7 @@ sub rcs_getctime ($) {
 	eval q{use Date::Parse};
 	error($@) if $@;
 	
-	my $ctime = str2time($log[0]->{"date"});
+	my $ctime = str2time($log[$#log]->{"date"});
 	return $ctime;
 }
 
-- 
cgit v1.2.3


From a2c0423e541006f5d1c0c99f4bb07aadfb0cc733 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 20 Mar 2009 16:32:37 -0400
Subject: fix rcs_getctime to return first, not last, change time

This was being buggy and returning the file's last change time, not its
creation time.

(I checked all the others (except tla) and they're ok.)
---
 IkiWiki/Plugin/git.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index b386ab71b..68b114a73 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -594,8 +594,8 @@ sub rcs_getctime ($) {
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
-	my $sha1  = git_sha1($file);
-	my $ci    = git_commit_info($sha1, 1);
+	my @sha1s = run_or_non('git', 'rev-list', 'HEAD', '--', $file);
+	my $ci    = git_commit_info($sha1s[$#sha1s], 1);
 	my $ctime = $ci->{'author_epoch'};
 	debug("ctime for '$file': ". localtime($ctime));
 
-- 
cgit v1.2.3


From 503d83ffbc358714ad84e46ce523b8702268edb6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 26 Mar 2009 14:04:28 -0400
Subject: comments: Fix too loose test for comments pages that matched normal
 pages with "comment_" in their name. Closes: #521322

---
 IkiWiki/Plugin/comments.pm | 2 +-
 debian/changelog           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ee53dbc91..5782d9083 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -672,7 +672,7 @@ sub previewcomment ($$$) {
 sub commentsshown ($) {
 	my $page=shift;
 
-	return ! pagespec_match($page, "*/$config{comments_pagename}*",
+	return ! pagespec_match($page, "internal(*/$config{comments_pagename}*)",
 	                        location => $page) &&
 	       pagespec_match($page, $config{comments_pagespec},
 	                      location => $page);
diff --git a/debian/changelog b/debian/changelog
index 01404a2b4..4ba32c8d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ikiwiki (3.09) UNRELEASED; urgency=low
     not last commit time.
   * Updated French translation (Jean-Luc Coulon). Closes: #521072
   * css: Add clear: both to inlinefooter.
+  * comments: Fix too loose test for comments pages that matched
+    normal pages with "comment_" in their name. Closes: #521322
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Mar 2009 15:32:49 -0400
 
-- 
cgit v1.2.3


From 10822a22b3d8872afb31e1847ee7448af86c574d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 26 Mar 2009 16:45:53 -0400
Subject: comments: Fix anchor ids to be legal xhtml. Closes: #521339

Well, that was a PITA.

Luckily, this doesn't break guids to comments in rss feeds,
though it does change the links.

I haven't put in a warning about needing to rebuild to get
this fix. It's probably good enough for new comments to get the
fix, without a lot of mass rebuilding.
---
 IkiWiki/Plugin/comments.pm | 24 ++++++++++++++++++++++--
 debian/changelog           |  1 +
 templates/comment.tmpl     |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 5782d9083..2ad422f5f 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -224,7 +224,7 @@ sub preprocess {
 
 	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
 		$pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
-			"#".$params{page};
+			"#".page_to_id($params{page});
 	}
 
 	eval q{use Date::Parse};
@@ -490,7 +490,8 @@ sub editcomment ($$) {
 		# Jump to the new comment on the page.
 		# The trailing question mark tries to avoid broken
 		# caches and get the most recent version of the page.
-		IkiWiki::redirect($cgi, urlto($page, undef, 1)."?updated#$location");
+		IkiWiki::redirect($cgi, urlto($page, undef, 1).
+			"?updated#".page_to_id($location));
 
 	}
 	else {
@@ -759,6 +760,10 @@ sub pagetemplate (@) {
 	if (!exists $commentstate{$page}) {
 		return;
 	}
+	
+	if ($template->query(name => 'commentid')) {
+		$template->param(commentid => page_to_id($page));
+	}
 
 	if ($template->query(name => 'commentuser')) {
 		$template->param(commentuser =>
@@ -808,6 +813,21 @@ sub unique_comment_location ($) {
 	return $location;
 }
 
+sub page_to_id ($) {
+	# Converts a comment page name into a unique, legal html id
+	# addtibute value, that can be used as an anchor to link to the
+	# comment.
+	my $page=shift;
+
+	# It needs to start with a letter.
+	$page="comment_".$page;
+
+	# Encode any illegal characters.
+	$page=~s/([^A-Za-z0-9-_:.])/"__".ord($1)."__"/eg;
+
+	return $page;
+}
+	
 package IkiWiki::PageSpec;
 
 sub match_postcomment ($$;@) {
diff --git a/debian/changelog b/debian/changelog
index 4ba32c8d6..158db9a4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low
   * css: Add clear: both to inlinefooter.
   * comments: Fix too loose test for comments pages that matched
     normal pages with "comment_" in their name. Closes: #521322
+  * comments: Fix anchor ids to be legal xhtml. Closes: #521339
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Mar 2009 15:32:49 -0400
 
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 1b9064ea0..fb76ea004 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,4 +1,4 @@
-<div class="comment" id="<TMPL_VAR NAME=INLINEPAGE>">
+<div class="comment" id="<TMPL_VAR NAME=COMMENTID>">
 
 <div class="comment-subject">
 <TMPL_IF PERMALINK>
-- 
cgit v1.2.3


From 260ee2a28368691a5f1a7dee918717a28d28ed2e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 27 Mar 2009 13:44:31 -0400
Subject: use md5sum for page_to_id

The munged ids were looking pretty nasty, and were not completly guaranteed
to be unique. So a md5sum seems like a better approach. (Would have used
sha1, but md5 is in perl core.)
---
 IkiWiki/Plugin/comments.pm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 2ad422f5f..98f9f8b3d 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -819,13 +819,10 @@ sub page_to_id ($) {
 	# comment.
 	my $page=shift;
 
-	# It needs to start with a letter.
-	$page="comment_".$page;
-
-	# Encode any illegal characters.
-	$page=~s/([^A-Za-z0-9-_:.])/"__".ord($1)."__"/eg;
+	eval q{use Digest::MD5 'md5_hex'};
+	error($@) if $@;
 
-	return $page;
+	return "comment-".md5_hex($page);
 }
 	
 package IkiWiki::PageSpec;
-- 
cgit v1.2.3


From 72b9482835faabcef13a22c9c9af3314da5a71f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 1 Apr 2009 19:18:43 -0400
Subject: recentchanges: change to using do=goto links.

---
 IkiWiki/Plugin/recentchanges.pm | 2 +-
 debian/changelog                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 329dd6f32..fa851e466 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -123,7 +123,7 @@ sub store ($$$) {
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
-			do => "recentchanges_link",
+			do => "goto",
 			page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
 		);
 	}
diff --git a/debian/changelog b/debian/changelog
index a3ff97d30..25ed0dce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low
   * comments: Fix anchor ids to be legal xhtml. Closes: #521339
   * Fix documentation of anonok_pagespec. Closes: #521793
   * Add missing suggests on libtext-textile-perl. Closes: #522039
+  * recentchanges: change to using do=goto links.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Mar 2009 15:32:49 -0400
 
-- 
cgit v1.2.3