From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 21:19:17 +0000 (-0500)
Subject: opendiscussion: This plugin will also now allow posting comments
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/b384af237df92e787f84f845d0d2bc182f7775ff?ds=sidebyside

opendiscussion: This plugin will also now allow posting comments
to otherwise locked-down sites.
---

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 4b91f5d83..5a455940b 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -25,6 +25,7 @@ sub canedit ($$) {
 	my $session=shift;
 
 	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
+	return "" if pagespec_match($page, "postcomment(*)");
 	return undef;
 }
 
diff --git a/debian/changelog b/debian/changelog
index b4acac633..a65592277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * Add link to userpage (or creation link) to top of preferences page.
   * auto-blog.setup: Lock all pages, so only admin can post to the blog
     by default.
+  * opendiscussion: This plugin will also now allow posting comments
+    to otherwise locked-down sites. 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index b6d4d252b..f933d32be 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -14,8 +14,8 @@ authorship should hopefully be unforgeable by CGI users.
 The intention is that on a non-wiki site (like a blog) you can lock all
 pages for admin-only access, then allow otherwise unprivileged (or perhaps
 even anonymous) users to comment on posts. See the documentation of the
-[[lockedit]] and [[anonok]] pages for details on locking down a wiki so
-users can only post comments.
+[[opendiscussion]], [[lockedit]] and [[anonok]] pages for details on locking
+down a wiki so readers can only post comments.
 
 Individual comments are stored as internal-use pages named something like
 `page/comment_1`, `page/comment_2`, etc. These pages internally use a
diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn
index c8f64ea47..681163203 100644
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@@ -12,14 +12,9 @@ to lock. For example, you could choose to lock all pages created before
 2006, or all pages that are linked to from the page named "locked". More
 usually though, you'll just list some names of pages to lock.
 
-One handy thing to do if you're using ikiwiki for your blog is to lock
-"* and !*/Discussion". This prevents others from adding to or modifying
-posts in your blog, while still letting them comment via the Discussion
-pages.
-
-Alternatively, if you're using the [[comments]] plugin, you can lock
-"!postcomment(*)" to allow users to comment on pages, but not edit anything
-else.
+If you want to lock down a blog so only you can post to it, you can just
+lock "*", and enable the [[opendiscussion]] plugin, so readers can still post
+[[comments]].
 
 Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]]
 can specify that some pages are not locked for some users. For example,
diff --git a/doc/plugins/opendiscussion.mdwn b/doc/plugins/opendiscussion.mdwn
index b2ba68bf7..3b5ab4858 100644
--- a/doc/plugins/opendiscussion.mdwn
+++ b/doc/plugins/opendiscussion.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=opendiscussion author="[[Joey]]"]]
 [[!tag type/auth]]
 
-This plugin allows editing of Discussion pages by anonymous users who have
-not logged into the wiki.
+This plugin allows editing of Discussion pages, and posting of comments,
+even when the [[lockedit]] plugin has been configured to otherwise prevent
+editing.