From 38d58467f491ac7e154d83b7fa0a90d1ebb79efc Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Thu, 1 Jan 2009 07:33:36 -0500 Subject: link to related bug --- doc/todo/modify_page_filename_in_plugin.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/todo') diff --git a/doc/todo/modify_page_filename_in_plugin.mdwn b/doc/todo/modify_page_filename_in_plugin.mdwn index 4099487a1..a13c8b62f 100644 --- a/doc/todo/modify_page_filename_in_plugin.mdwn +++ b/doc/todo/modify_page_filename_in_plugin.mdwn @@ -6,6 +6,8 @@ The problem is that I occasionally have xxx.c and xxx.h in the same directory an My solution is to allow plugins to provide a hook that sets the pagename. --[[/users/bstpierre]] +> You might also find the solution to [[bugs/multiple_pages_with_same_name]] helps you. That patch is already applied. -- [[Will]] + --- /usr/share/perl5/IkiWiki.pm.ORIG 2008-10-03 14:12:50.000000000 -0400 +++ /usr/share/perl5/IkiWiki.pm 2008-10-07 11:57:26.000000000 -0400 @@ -196,11 +196,32 @@ -- cgit v1.2.3 From e65bdf090634f8d5ec531b2259f1bfd8fb4bc18a Mon Sep 17 00:00:00 2001 From: "http://puck42.myopenid.com/" Date: Mon, 5 Jan 2009 21:02:43 -0500 Subject: --- doc/todo/allow_disabling_backlinks.mdwn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/todo/allow_disabling_backlinks.mdwn (limited to 'doc/todo') diff --git a/doc/todo/allow_disabling_backlinks.mdwn b/doc/todo/allow_disabling_backlinks.mdwn new file mode 100644 index 000000000..8f2792082 --- /dev/null +++ b/doc/todo/allow_disabling_backlinks.mdwn @@ -0,0 +1,18 @@ +This patch allows disabling the backlinks in the config file by setting nobacklinks to 0. + +It is backwards compatible, and by default enables backlinks in the generated pages. + + +--- IkiWiki/Render.pm.orig2 2009-01-06 14:54:01.000000000 +1300 ++++ IkiWiki/Render.pm 2009-01-06 14:55:08.000000000 +1300 +@@ -107,7 +107,8 @@ + $template->param(have_actions => 1); + } + +- my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page); ++ my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page) ++ unless defined $config{nobacklinks} && $config{nobacklinks} == 0; + my ($backlinks, $more_backlinks); + if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) { + $backlinks=\@backlinks; + -- cgit v1.2.3 From e1d94c08f05a57318e3a84bbe37effabfb1b2614 Mon Sep 17 00:00:00 2001 From: "http://puck42.myopenid.com/" Date: Mon, 5 Jan 2009 21:03:42 -0500 Subject: --- doc/todo/allow_disabling_backlinks.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/todo') diff --git a/doc/todo/allow_disabling_backlinks.mdwn b/doc/todo/allow_disabling_backlinks.mdwn index 8f2792082..5dd4876e8 100644 --- a/doc/todo/allow_disabling_backlinks.mdwn +++ b/doc/todo/allow_disabling_backlinks.mdwn @@ -2,7 +2,7 @@ This patch allows disabling the backlinks in the config file by setting nobackli It is backwards compatible, and by default enables backlinks in the generated pages. - +
 --- IkiWiki/Render.pm.orig2	2009-01-06 14:54:01.000000000 +1300
 +++ IkiWiki/Render.pm	2009-01-06 14:55:08.000000000 +1300
 @@ -107,7 +107,8 @@
@@ -15,4 +15,4 @@ It is backwards compatible, and by default enables backlinks in the generated pa
  	my ($backlinks, $more_backlinks);
  	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
  		$backlinks=\@backlinks;
-
+
-- cgit v1.2.3 From 4bc545cff9bfb6d0dc6c76df253becc4e6cc6721 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Jan 2009 13:21:44 -0500 Subject: new feature --- doc/todo/relative_pagespec_deficiency.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/todo/relative_pagespec_deficiency.mdwn (limited to 'doc/todo') diff --git a/doc/todo/relative_pagespec_deficiency.mdwn b/doc/todo/relative_pagespec_deficiency.mdwn new file mode 100644 index 000000000..9fdfe74b1 --- /dev/null +++ b/doc/todo/relative_pagespec_deficiency.mdwn @@ -0,0 +1,6 @@ +While a relative pagespec like `./posts/*` will work, when used in a page +such as `bdale/blog`, you cannot do +`created_after(./posts/foo)` -- only `glob()` supports relative page +references. + +The other pagespec functions should too, where appropriate. -- cgit v1.2.3 From 81b87d41fb2efb5d5e1b365fcde7d5e2a2f7ce91 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 10 Jan 2009 11:41:41 +0000 Subject: Request review for my comments branch Partially addresses [[todo/comments]] --- doc/todo/comments.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'doc/todo') diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn index 832441be1..e8698f721 100644 --- a/doc/todo/comments.mdwn +++ b/doc/todo/comments.mdwn @@ -10,6 +10,8 @@ > it's hard enough to get some people to title their blog posts :-) > --[[smcv]] +## Patches pending merge + * If a spammer posts a comment, it is either impossible or hard to clean up via the web. Would be nice to have some kind of link on the comment that allows trusted users to remove it (using the remove plugin of @@ -23,7 +25,9 @@ > So that took about 10 days... > --[[Joey]] -## Patches pending merge + >> Implemented in my 'comments' branch, please review. It turns out + >> [[plugins/remove]] is happy to remove internal pages, so it was quite + >> easy to do. --[[smcv]] * There is some common code cargo-culted from other plugins (notably inline and editpage) which should probably be shared -- cgit v1.2.3 From af9566a6952905beff7f1ca9db64f01c3faf4ff2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 10 Jan 2009 14:17:27 -0500 Subject: comments: Add support for removing comments via web interface. (smcv) --- debian/changelog | 1 + doc/todo/comments.mdwn | 36 +++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) (limited to 'doc/todo') diff --git a/debian/changelog b/debian/changelog index 74556906e..61aee299d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low * repolist: New plugin to support the rel=vcs-* microformat. * 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) -- Joey Hess Tue, 06 Jan 2009 15:02:52 -0500 diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn index e8698f721..c74ded8f6 100644 --- a/doc/todo/comments.mdwn +++ b/doc/todo/comments.mdwn @@ -12,23 +12,6 @@ ## Patches pending merge -* If a spammer posts a comment, it is either impossible or hard to clean - up via the web. Would be nice to have some kind of link on the comment - that allows trusted users to remove it (using the remove plugin of - course). - - > Won't the remove plugin refuse to remove internal pages? This would be - > a good feature to have, though. --[[smcv]] - - > Here, FWIW, is the first ikiwiki comment spam I've seen: - > - > So that took about 10 days... - > --[[Joey]] - - >> Implemented in my 'comments' branch, please review. It turns out - >> [[plugins/remove]] is happy to remove internal pages, so it was quite - >> easy to do. --[[smcv]] - * There is some common code cargo-culted from other plugins (notably inline and editpage) which should probably be shared @@ -151,3 +134,22 @@ first. --[[smcv]] > done --[[Joey]] + +* If a spammer posts a comment, it is either impossible or hard to clean + up via the web. Would be nice to have some kind of link on the comment + that allows trusted users to remove it (using the remove plugin of + course). + + > Won't the remove plugin refuse to remove internal pages? This would be + > a good feature to have, though. --[[smcv]] + + > Here, FWIW, is the first ikiwiki comment spam I've seen: + > + > So that took about 10 days... + > --[[Joey]] + + >> Implemented in my 'comments' branch, please review. It turns out + >> [[plugins/remove]] is happy to remove internal pages, so it was quite + >> easy to do. --[[smcv]] + + >>> done --[[Joey]] -- cgit v1.2.3 From 7a8ea68fc0bba9f75ba81a9547d359f42e31caa4 Mon Sep 17 00:00:00 2001 From: Joey Hess 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 'doc/todo') 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 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