From c42fd7d7580d081f3e3f624fd74219b0435230f6 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 5 Mar 2013 10:54:51 +0100 Subject: [PATCH 01/63] Add configuration to restrict the formats allowed for comments I want to write my blog posts in a convenient format (Emacs org mode) but do not want commenters to be able to use this format for security reasons. This patch allows to configure which formats are allowed for writing comments. Effectively, it restricts the formats enabled with add_plugin to those mentioned in comments_allowformats. If this is empty, all formats are allowed, which is the behavior without this patch. --- IkiWiki/Plugin/comments.pm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 285013e49..151e839d0 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -90,6 +90,15 @@ sub getsetup () { safe => 0, rebuild => 0, }, + comments_allowformats => { + type => 'string', + default => '', + example => 'mdwn txt', + description => 'Restrict formats for comments to (no restriction if empty)', + safe => 1, + rebuild => 0, + }, + } sub checkconfig () { @@ -101,6 +110,8 @@ sub checkconfig () { unless defined $config{comments_closed_pagespec}; $config{comments_pagename} = 'comment_' unless defined $config{comments_pagename}; + $config{comments_allowformats} = '' + unless defined $config{comments_allowformats}; } sub htmlize { @@ -128,12 +139,18 @@ sub safeurl ($) { } } +sub isallowed ($) { + my $format = shift; + return ! $config{comments_allowformats} || $config{comments_allowformats} =~ /\b$format\b/; +} + sub preprocess { my %params = @_; my $page = $params{page}; my $format = $params{format}; - if (defined $format && ! exists $IkiWiki::hooks{htmlize}{$format}) { + if (defined $format && (! exists $IkiWiki::hooks{htmlize}{$format} || + ! isallowed($format))) { error(sprintf(gettext("unsupported page format %s"), $format)); } @@ -332,7 +349,7 @@ sub editcomment ($$) { my @page_types; if (exists $IkiWiki::hooks{htmlize}) { - foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) { + foreach my $key (grep { !/^_/ && isallowed($_) } keys %{$IkiWiki::hooks{htmlize}}) { push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key]; } } From fae59b07b02dbcaba892e96ff86f3f800e6ef54a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 2 Mar 2013 18:11:07 +0000 Subject: [PATCH 02/63] page.tmpl: omit searchform, trails, sidebar and most metadata in CGI These all seem somewhat inappropriate (searchform and sidebar are arguable either way). I've left actions and languages enabled, since they seem more reasonable for CGI-generated pages. Bug: http://ikiwiki.info/bugs/trail_shows_on_cgi_pages/ Signed-off-by: Simon McVittie --- templates/page.tmpl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/templates/page.tmpl b/templates/page.tmpl index 89b4f3a06..6353c7596 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -21,6 +21,8 @@ + + @@ -36,6 +38,8 @@ + + @@ -56,9 +60,11 @@ + + @@ -112,15 +118,19 @@ + + + +
From a867da05bbdd0ee8765de21db27aebfe3d9fc0e5 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm_nWF_tPw8mLI7rMxfykA_d3FehQNvWpI" Date: Sun, 12 May 2013 23:36:19 -0400 Subject: [PATCH 03/63] --- doc/tips/DreamHost.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index 338bca782..8272958ae 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. - +[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. # Fixing CPAN From 5d4688f0cb1ef4a02f38864098db5b7c4bb32d33 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 May 2013 23:48:37 -0400 Subject: [PATCH 04/63] Revert spam This reverts commit a867da05bbdd0ee8765de21db27aebfe3d9fc0e5. --- doc/tips/DreamHost.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index 8272958ae..338bca782 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. -[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) + **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. # Fixing CPAN From 871545c27c7e477c26b008434de216be44c585bd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnAq_X98v6qKJFwl-MyLb440vC8laTdiMg" Date: Mon, 13 May 2013 22:41:05 -0400 Subject: [PATCH 05/63] --- doc/tips/DreamHost.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index 338bca782..8272958ae 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. - +[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. # Fixing CPAN From d6a29569cf8bf734192d7fe53ff3f62773c3a96d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 May 2013 00:04:08 -0400 Subject: [PATCH 06/63] Revert spam This reverts commit 871545c27c7e477c26b008434de216be44c585bd. --- doc/tips/DreamHost.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index 8272958ae..338bca782 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. -[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) + **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. # Fixing CPAN From 3281e185ee8ce13348e7cf4fb3b14837af651197 Mon Sep 17 00:00:00 2001 From: "http://butoijoh.myopenid.com/" Date: Tue, 14 May 2013 22:55:41 -0400 Subject: [PATCH 07/63] --- doc/tips/DreamHost.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index 338bca782..f51c7521f 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,5 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. +[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. From 9addf2b57e31a4a8960f0ff66a32d350f58a2d63 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 May 2013 22:20:31 -0400 Subject: [PATCH 08/63] Revert spam This reverts commit 3281e185ee8ce13348e7cf4fb3b14837af651197. --- doc/tips/DreamHost.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index f51c7521f..338bca782 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,5 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. -[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. From 67ebaf15d77cb00e0be16696c60860e7c61e827f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 May 2013 22:20:56 -0400 Subject: [PATCH 09/63] theme: Now can be used in all templates when a theme is enabled. --- IkiWiki/Plugin/theme.pm | 9 +++++++++ debian/changelog | 2 ++ 2 files changed, 11 insertions(+) diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm index ee94547e9..9b84ea7f0 100644 --- a/IkiWiki/Plugin/theme.pm +++ b/IkiWiki/Plugin/theme.pm @@ -9,6 +9,7 @@ sub import { hook(type => "getsetup", id => "theme", call => \&getsetup); hook(type => "checkconfig", id => "theme", call => \&checkconfig); hook(type => "needsbuild", id => "theme", call => \&needsbuild); + hook(type => "pagetemplate", id => "theme", call => \&pagetemplate); } sub getsetup () { @@ -63,4 +64,12 @@ sub needsbuild ($) { return $needsbuild; } +sub pagetemplate (@) { + my %params=@_; + my $template=$params{template}; + if (exists $config{theme} && length $config{theme}) { + $template->param("theme_$config{theme}" => 1); + } +} + 1 diff --git a/debian/changelog b/debian/changelog index e6d39fa27..fb51569b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20130505) UNRELEASED; urgency=low * Fix test suite to not fail when XML::Twig is not installed. Closes: #707436 + * theme: Now can be used in all templates when + a theme is enabled. -- Joey Hess Thu, 09 May 2013 10:47:18 -0400 From 2198a25db486a33e3869daa1ed2600df718160c3 Mon Sep 17 00:00:00 2001 From: "http://tonyguards.myopenid.com/" Date: Thu, 16 May 2013 22:42:07 -0400 Subject: [PATCH 10/63] --- doc/tips/DreamHost.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index 338bca782..a08da789a 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. - +[http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit Baby Pink] | [http://www.propertykita.com/rumah.html Rumah Dijual] | [http://www.optimaweb.co.id/jasa-seo Jasa SEO] **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. # Fixing CPAN From b00ff62c90ffbac6c7bbb2c4b69706ee47cd9bc0 Mon Sep 17 00:00:00 2001 From: "http://tonyguards.myopenid.com/" Date: Thu, 16 May 2013 22:43:25 -0400 Subject: [PATCH 11/63] --- doc/tips/DreamHost.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index a08da789a..8272958ae 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. -[http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit Baby Pink] | [http://www.propertykita.com/rumah.html Rumah Dijual] | [http://www.optimaweb.co.id/jasa-seo Jasa SEO] +[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. # Fixing CPAN From 325160e44f9a3b273958e5c0051cd34c832c8221 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 May 2013 23:23:49 -0400 Subject: [PATCH 12/63] Revert 2 spam commits --- doc/tips/DreamHost.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/DreamHost.mdwn b/doc/tips/DreamHost.mdwn index 8272958ae..338bca782 100644 --- a/doc/tips/DreamHost.mdwn +++ b/doc/tips/DreamHost.mdwn @@ -1,6 +1,6 @@ # Introduction I had some trouble installing ikiwiki on to a shared hosting service (DreamHost) and figured I'd post the results, since it was pretty rough to get installed. These instructions should work for Perl generally (some of the docs are borrowed from Catalyst's docs), but are tailored for Ikiwiki. There are a few items I'll file as bugs, as well, to aid future installation, but frankly the problems appear to be with installing perl as a non-root user, not anything specific to iki. -[Baby Pink](http://www.grosir-kosmetik.com/6-baby-pink-cream-pemutih-kulit) | [Rumah Dijual](http://www.propertykita.com/rumah.html) | [Jasa SEO](http://www.optimaweb.co.id/jasa-seo) + **Note: CPAN seems to die without warning, or die after successfully install modules. It appears to just like dying. If you encounter this, retry the last command after restarting CPAN.** Unfortunately, this doc can't cover how to fix any other problems with CPAN beyond what you find here. # Fixing CPAN From bf9fdcc80fd511c97643139ae298790e770854ef Mon Sep 17 00:00:00 2001 From: "http://claimid.com/richard-lyons" Date: Fri, 17 May 2013 06:52:55 -0400 Subject: [PATCH 13/63] new topic re 2rand[0,1,1] spam --- doc/forum/How_can_I_prevent_spam__63__.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/forum/How_can_I_prevent_spam__63__.mdwn diff --git a/doc/forum/How_can_I_prevent_spam__63__.mdwn b/doc/forum/How_can_I_prevent_spam__63__.mdwn new file mode 100644 index 000000000..44e31927e --- /dev/null +++ b/doc/forum/How_can_I_prevent_spam__63__.mdwn @@ -0,0 +1,17 @@ +I am getting continuous spam like this: + + discussion 85.25.146.11 web 11:02:19 05/17/13 2rand[0,1,1] + discussion 85.25.146.11 web 11:02:13 05/17/13 2rand[0,1,1] + +The bot uses an IP address as the username and puts '2rand[0,1,1]' as comment text. + +I do not have a page 'discussion' in use, so I have redirected this page with an apache2 +Alias to a static page, just in case anyone stumbles on it. This means it cannot really +be edited via the web. However the bots that post +this spam are evidently not opening the page to edit it, but merely sending a cgi request +as if they had edited the page. The result is that no damage is done on the site and no +benefit is achieved for the spammer since google cannot see the result. However, the +logs are stuffed with spurious entries and a page is constantly recompiled, which wastes +resources. + +Is there some way to reject edits that do not arise from an established session? From eee5a31401a641bb83c52d745e30ea9274e07400 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Fri, 17 May 2013 13:55:47 -0400 Subject: [PATCH 14/63] Added a comment --- ..._fd26fb7f1569e8c44ba8262794f938db._comment | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment diff --git a/doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment b/doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment new file mode 100644 index 000000000..a7293288c --- /dev/null +++ b/doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 1" + date="2013-05-17T17:55:46Z" + content=""" +Normally ikiwiki requires a valid session cookie of a logged in user to edit pages. It sounds like you may have the opendiscussion or anonok plugins enabled, which allows anyone to edit without logging in. Recommend disabling them. + +Since you know the spammer's IP, put it into ikiwiki.setup: + +
+banned_users:
+  - ip(85.25.146.11)
+
+ +If the user was logging in, you could also put their username in the ban list. + +You can also try enabling the blogspam plugin. +"""]] From 56dd31b96307e3290caf374c9fc52c724e35a419 Mon Sep 17 00:00:00 2001 From: "http://claimid.com/richard-lyons" Date: Fri, 17 May 2013 16:56:24 -0400 Subject: [PATCH 15/63] Added a comment --- ...t_2_d098124f005976ee815d25c883bc9106._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment diff --git a/doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment b/doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment new file mode 100644 index 000000000..53e743361 --- /dev/null +++ b/doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="http://claimid.com/richard-lyons" + nickname="richard-lyons" + subject="comment 2" + date="2013-05-17T20:56:23Z" + content=""" +I did indeed have opendiscussion active. I shall wait to see what happens after disabling it. + +The bots seem to make 5 consecutive edits at short intervals (around 2 minutes) using an IP +address as a username. I do not know if the IP is the one from which they work. There are +usually two or three sets of five edits using different IP addresses as username in each hour. + +I did try blocking specific IPs but they constantly change. + +It would be good if blocking could match a regexp, but as far as I can see this is not an option, +"""]] From c4c9c3683b449107b04b1cd0b07064d2f38985db Mon Sep 17 00:00:00 2001 From: "http://claimid.com/richard-lyons" Date: Sat, 18 May 2013 04:13:20 -0400 Subject: [PATCH 16/63] Added a comment: SOLVED -- How can I prevent spam? --- .../comment_3_deb434d01aaefa18d2791e48d6c824ae._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment diff --git a/doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment b/doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment new file mode 100644 index 000000000..64783befc --- /dev/null +++ b/doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://claimid.com/richard-lyons" + nickname="richard-lyons" + subject="SOLVED -- How can I prevent spam?" + date="2013-05-18T08:13:19Z" + content=""" +I can now confirm that this particular attack has stopped after removing the opendiscussion plugin. +"""]] From 9e4f0efe44a11ee5d30ce077a8f259d2ecc5b781 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 May 2013 16:26:48 -0400 Subject: [PATCH 17/63] notifyemail: Fix bug that caused duplicate emails to be sent when site was rebuilt. --- IkiWiki/Plugin/notifyemail.pm | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) diff --git a/IkiWiki/Plugin/notifyemail.pm b/IkiWiki/Plugin/notifyemail.pm index 2c1775f2e..b50a22a00 100644 --- a/IkiWiki/Plugin/notifyemail.pm +++ b/IkiWiki/Plugin/notifyemail.pm @@ -78,6 +78,7 @@ sub anonsubscribe ($$) { sub notify (@) { my @files=@_; return unless @files; + return if $config{rebuild}; eval q{use Mail::Sendmail}; error $@ if $@; diff --git a/debian/changelog b/debian/changelog index fb51569b3..07d955bb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.20130505) UNRELEASED; urgency=low Closes: #707436 * theme: Now can be used in all templates when a theme is enabled. + * notifyemail: Fix bug that caused duplicate emails to be sent when + site was rebuilt. -- Joey Hess Thu, 09 May 2013 10:47:18 -0400 From 07d39ce5bf320940c210b0e67dd293c43351cd47 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 May 2013 16:33:32 -0400 Subject: [PATCH 18/63] bzr: bzr rm no longer has a --force option, remove --- IkiWiki/Plugin/bzr.pm | 2 +- debian/changelog | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm index 72552abcc..99a07d2c0 100644 --- a/IkiWiki/Plugin/bzr.pm +++ b/IkiWiki/Plugin/bzr.pm @@ -195,7 +195,7 @@ sub rcs_add ($) { sub rcs_remove ($) { my ($file) = @_; - my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file"); + my @cmdline = ("bzr", "rm", "--quiet", "$config{srcdir}/$file"); if (system(@cmdline) != 0) { warn "'@cmdline' failed: $!"; } diff --git a/debian/changelog b/debian/changelog index 07d955bb2..33795a5da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20130505) UNRELEASED; urgency=low +ikiwiki (3.20130518) unstable; urgency=low * Fix test suite to not fail when XML::Twig is not installed. Closes: #707436 @@ -6,8 +6,9 @@ ikiwiki (3.20130505) UNRELEASED; urgency=low a theme is enabled. * notifyemail: Fix bug that caused duplicate emails to be sent when site was rebuilt. + * bzr: bzr rm no longer has a --force option, remove - -- Joey Hess Thu, 09 May 2013 10:47:18 -0400 + -- Joey Hess Sat, 18 May 2013 16:28:21 -0400 ikiwiki (3.20130504) unstable; urgency=low From 7dea816ddf182f8386da82a381f93c459b832536 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 May 2013 16:41:31 -0400 Subject: [PATCH 19/63] releasing version 3.20130518 --- ikiwiki.spec | 2 +- po/ikiwiki.pot | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ikiwiki.spec b/ikiwiki.spec index 7e9dbf0f6..9d799da3f 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20130504 +Version: 3.20130518 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d7f2926a3..3f2fac90b 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: 2013-05-04 23:52-0400\n" +"POT-Creation-Date: 2013-05-18 16:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -561,11 +561,11 @@ msgstr "" msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" From f594c2da96c401ee312803793d5ff3f088d70369 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 May 2013 16:47:11 -0400 Subject: [PATCH 20/63] add news item for ikiwiki 3.20130518 --- doc/news/version_3.20121016.mdwn | 17 ----------------- doc/news/version_3.20130518.mdwn | 9 +++++++++ 2 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 doc/news/version_3.20121016.mdwn create mode 100644 doc/news/version_3.20130518.mdwn diff --git a/doc/news/version_3.20121016.mdwn b/doc/news/version_3.20121016.mdwn deleted file mode 100644 index 62cb39758..000000000 --- a/doc/news/version_3.20121016.mdwn +++ /dev/null @@ -1,17 +0,0 @@ -ikiwiki 3.20121016 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * monochrome: New theme, contributed by Jon Dowland. - * rst: Ported to python 3, while still also being valid python 2. - Thanks, W. Trevor King - * Try to avoid a situation in which so many ikiwiki cgi wrapper programs - are running, all waiting on some long-running thing like a site rebuild, - that it prevents the web server from doing anything else. The current - approach only avoids this problem for GET requests; if multiple cgi's - run GETs on a site at the same time, one will display a "please wait" - page for a configurable number of seconds, which then redirects to retry. - To enable this protection, set cgi\_overload\_delay to the number of - seconds to wait. This is not enabled by default. - * Add back a 1em margin between archivepage divs. - * recentchangesdiff: Correct broken template that resulted in duplicate - diff icons being displayed, and bloated the recentchanges page with - inline diffs when the configuration should have not allowed them."""]] \ No newline at end of file diff --git a/doc/news/version_3.20130518.mdwn b/doc/news/version_3.20130518.mdwn new file mode 100644 index 000000000..635b86935 --- /dev/null +++ b/doc/news/version_3.20130518.mdwn @@ -0,0 +1,9 @@ +ikiwiki 3.20130518 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix test suite to not fail when XML::Twig is not installed. + Closes: #[707436](http://bugs.debian.org/707436) + * theme: Now <TMPL\_IF THEME\_$NAME> can be used in all templates when + a theme is enabled. + * notifyemail: Fix bug that caused duplicate emails to be sent when + site was rebuilt. + * bzr: bzr rm no longer has a --force option, remove"""]] \ No newline at end of file From e4fe8b5a9d0126f812e9bf126bcb7fc4b9e6dd59 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk8TE6spoqxRcznT9V_Q6K9BPipBjECzjU" Date: Sat, 18 May 2013 17:24:52 -0400 Subject: [PATCH 21/63] --- ...Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn diff --git a/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn b/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn new file mode 100644 index 000000000..118b534ed --- /dev/null +++ b/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn @@ -0,0 +1,7 @@ +All the ikiwiki blogs I have seen have a single user blog. Is it possible to give every user a blog, where they can create their own pages in their own directory = based on their user name? + +I feel that a wiki might give more options in the way users share and collaborate when compared to a blog engine (like Word Press in multi user format) + +Is this the best place to post a question like this? There doesn't seem to be much traffic in this forum +Thanks for your help +Richard From fc268b311d8d9ac28a0f52cbede79fde18c6cd47 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" Date: Sun, 19 May 2013 16:10:13 -0400 Subject: [PATCH 22/63] --- ...s_does_not_prevent_tags_from_being_aggregated.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn diff --git a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn new file mode 100644 index 000000000..d00e6b8ef --- /dev/null +++ b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn @@ -0,0 +1,11 @@ +I added a feedpages directive to `blog/index.mdwn` to not pick up anything tagged `tags/random/hidden` yet that still happenend. + + ~git/richardhartmann.de/blog % grep hidden index.mdwn + [[!inline pages="./posts/*/*/* and !*/Discussion" feedpages="./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden)" show="10" actions=yes rootpage="blog"]] + ~git/richardhartmann.de/blog % grep hidden posts/2013/05/17-Debian_Release_Critical_Bug_report_for_Week_20.mdwn + [[!tag tags/tech/floss/debian tags/tech/floss/debian/rc-stats/8.0-jessie tags/random/hidden]] + ~git/richardhartmann.de/blog % + +If you need more information, please let me know. + +Richard From 76c4154a99fab6b933d6b09b5e0e8d6a17ae938f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" Date: Sun, 19 May 2013 16:15:24 -0400 Subject: [PATCH 23/63] --- .../feedpages_does_not_prevent_tags_from_being_aggregated.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn index d00e6b8ef..bed4ab056 100644 --- a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn +++ b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn @@ -3,7 +3,7 @@ I added a feedpages directive to `blog/index.mdwn` to not pick up anything tagge ~git/richardhartmann.de/blog % grep hidden index.mdwn [[!inline pages="./posts/*/*/* and !*/Discussion" feedpages="./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden)" show="10" actions=yes rootpage="blog"]] ~git/richardhartmann.de/blog % grep hidden posts/2013/05/17-Debian_Release_Critical_Bug_report_for_Week_20.mdwn - [[!tag tags/tech/floss/debian tags/tech/floss/debian/rc-stats/8.0-jessie tags/random/hidden]] + \[[!tag tags/tech/floss/debian tags/tech/floss/debian/rc-stats/8.0-jessie tags/random/hidden]] ~git/richardhartmann.de/blog % If you need more information, please let me know. From 173b4c951d627d58dd1653425187c041e54a53dc Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 21 May 2013 04:03:41 -0400 Subject: [PATCH 24/63] syntax error in pagespec, not an ikiwiki bug --- ...es_not_prevent_tags_from_being_aggregated.mdwn | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn index bed4ab056..f0d0f789a 100644 --- a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn +++ b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn @@ -1,7 +1,7 @@ I added a feedpages directive to `blog/index.mdwn` to not pick up anything tagged `tags/random/hidden` yet that still happenend. ~git/richardhartmann.de/blog % grep hidden index.mdwn - [[!inline pages="./posts/*/*/* and !*/Discussion" feedpages="./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden)" show="10" actions=yes rootpage="blog"]] + \[[!inline pages="./posts/*/*/* and !*/Discussion" feedpages="./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden)" show="10" actions=yes rootpage="blog"]] ~git/richardhartmann.de/blog % grep hidden posts/2013/05/17-Debian_Release_Critical_Bug_report_for_Week_20.mdwn \[[!tag tags/tech/floss/debian tags/tech/floss/debian/rc-stats/8.0-jessie tags/random/hidden]] ~git/richardhartmann.de/blog % @@ -9,3 +9,16 @@ I added a feedpages directive to `blog/index.mdwn` to not pick up anything tagge If you need more information, please let me know. Richard + +> I don't think this is a bug. You have a syntax error in your pagespec: +> "not" is not a recognised keyword in [[pagespecs|ikiwiki/pagespec]], +> so `and not tagged(...)` should be `and !tagged(...)`. Presumably inline +> falls back to `pages` when `feedpages` doesn't work. +> +> By posting the pagespec here with insufficient escaping (which I've fixed) +> you caused *this* ikiwiki instance's HTML to contain an error message +> illustrating that syntax error :-) +> +> Error: syntax error in pagespec "(./posts/*/*/* and !*/Discussion) and (./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden))" +> +> [[done]]. --[[smcv]] From 47df02820d74440a1044b8f31f616fcbb3bc5e07 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" Date: Tue, 21 May 2013 12:39:15 -0400 Subject: [PATCH 25/63] --- .../feedpages_does_not_prevent_tags_from_being_aggregated.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn index f0d0f789a..a47054128 100644 --- a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn +++ b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn @@ -22,3 +22,5 @@ Richard > Error: syntax error in pagespec "(./posts/*/*/* and !*/Discussion) and (./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden))" > > [[done]]. --[[smcv]] + +> > As per IRC: Thanks. As an aside, shouldn't this ikiwiki instance ignore directives in normal text? The problem may be non-trivial, but still... -- Richard From 195771f0de184ad07b8b0833f6130af106b244e0 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 21 May 2013 14:23:31 -0400 Subject: [PATCH 26/63] --- ...edpages_does_not_prevent_tags_from_being_aggregated.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn index a47054128..a004154df 100644 --- a/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn +++ b/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn @@ -24,3 +24,9 @@ Richard > [[done]]. --[[smcv]] > > As per IRC: Thanks. As an aside, shouldn't this ikiwiki instance ignore directives in normal text? The problem may be non-trivial, but still... -- Richard + +>>> "Normal text" is exactly where directives go, so, not really. +>>> If you mean verbatim text (e.g. indentation in Markdown): the fact that +>>> directives still expand to HTML, which is then treated as verbatim, is an +>>> unfortunate result of how ikiwiki interacts with pages' markup languages +>>> (directives and wikilinks happen before markup is converted to HTML). --[[smcv]] From b077c8f3db10ad2378750ef0b29efed1aa96b87f Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Tue, 21 May 2013 15:26:13 -0400 Subject: [PATCH 27/63] Verified smooth migrations in two podcatchers. --- doc/todo/fancypodcast.mdwn | 116 +++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 12 deletions(-) diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn index ea3bebd94..ccf08eeaf 100644 --- a/doc/todo/fancypodcast.mdwn +++ b/doc/todo/fancypodcast.mdwn @@ -71,23 +71,113 @@ Episode enclosure |(./) |(./) |(./) |(./) * Verify that the feeds validate. * Subscribe to a fancy feed in some common podcatchers and verify display details against a reference podcast. +* Verify smooth transitions for two common use cases (see testing + details below). ### Must-have (for [[schmonz]], anyway) -* Think carefully about... - * UTF-8. - * Whether [[tips/howto avoid flooding aggregators]] suffices for... - * Converting a simple podcast to a fancy one. - 7. Set up a non-production copy of one of my podcasts. - * Manually test that feeds match production. - * Subscribe to the copy in `r2e`, iTunes, Downcast. - 7. Try migrating the copy from simple to fancy. - * Document the steps I take. - * Make the feed readers update. - * Document what happens for each of them. - * Migrating a fancy podcast from elsewhere into ikiwiki. +* Think carefully about UTF-8. * Verify that _all_ the tests pass (not just my new ones). +## Migration + +### Upgrading within ikiwiki: from simple to fancy + +#### My test podcast + +For this test, I chose a podcast that tries to work around ikiwiki's +current limitations by issuing two separate `inline`s: + +* One with `feedonly=yes` that includes `.mdwn`, `.pdf`, and `.mp3` +* One with `feeds=no` that includes only `.mdwn` (and makes a trail) + +This has the following effects: + +* Browser: sees just the articles (each of which has a manually + created link to its corresponding media file) +* Feedreader: sees all the articles and media in one flat stream +* Podcatcher: sees just the media (sans articles) + +I want instead to write one `inline` with these effects: + +* Browser: sees just the articles (each of which automatically links + to its enclosure) +* Feedreader: sees just the articles (each of which specifies its + enclosure) +* Podcatcher: sees just the enclosures (each of which has an enclosing + article, rendered as the media's "description") + +#### Upgrade steps + +7. Set up a non-production copy of the podcast. + 7. Visually diff RSS and Atom feeds against production. + 7. Subscribe to the copy (both feeds) in `r2e`, iTunes, Downcast. +7. Apply fancypodcast patch to the installed ikiwiki: + 7. `cd ~/Documents/trees/ikiwiki && git checkout fancypodcast` + 7. `git diff --no-prefix master > ~/Documents/trees/localpatches/www/ikiwiki/fancypodcast.diff` + 7. `cd ~/Documents/trees/pkgsrc-current/www/ikiwiki && make deinstall && make install clean` +7. Verify that simple podcasts are unaffected: + 7. Rerun `ikiwiki --setup`. + 7. `diff -uB simple-before.rss simple-after.rss` + * A few new elements and attributes, as expected. + 7. `diff -uB simple-before.atom simple-after.atom` + * No change. +7. Remove the feed-only `inline` and enable feeds on the remaining one. +7. Convert articles' manual download links to `\[[!meta enclosure=""]]`. +7. I want existing and future podcatchers to get my new fancy + episodes, and I know my podcast isn't in any planets, so I'm + going to skip [[tips/howto avoid flooding aggregators]]. +7. Rerun `ikiwiki --setup`. +7. Verify browser shows the same stuff. +7. `diff -uB simple-after.rss fancy-after.rss # and atom` + * MP3s and PDFs are no longer naked enclosures, but belong to + articles as they should. + * Articles have updated modification times, as they should. +7. `r2e run` (both RSS and Atom) + * Nothing new with the default `trust-guid = True` (otherwise + would expect updated articles). +7. iTunes "Update Podcast" (both RSS and Atom) + * Added one episode per article, with article text as the episode + description. + * Kept old naked-enclosure episodes around. +7. Downcast refresh (RSS): + * Added one episode per article, with article text as the episode + description. + * Kept old naked-enclosure episodes around. +7. Downcast refresh (Atom): + * Added one episode per article, with no episode description + (expected, see feature table). + * Kept old naked-enclosure episodes around. + +Different tradeoffs are possible. These seem okay to me. + +### Importing into ikiwiki: fancy (from another CMS) + +#### My test podcast + +For this test, I chose a podcast currently being published with +Textpattern and tru_podcast, because I'd strongly prefer to publish +it with ikiwiki instead. + +#### Upgrade steps + +7. Set up a non-production copy of the podcast. + 7. Visually diff RSS and Atom feeds against production. + 7. Subscribe to the copy (both feeds) in `r2e`, iTunes, Downcast. +7. With a fancypodcast-enabled ikiwiki installed: + 7. Copy content from Textpattern to ikiwiki: + 7. Match article paths to preserve `/YYYY/MM/DD/post-title` permalinks. + 7. Match enclosure paths (or redirect) to preserve Textpattern's URLs. + 7. Match titles, post dates, and guids with `\[[!meta]]`. + 7. Match feed paths with permanent redirects from `/atom/` to + `/index.atom` (and same for RSS). + 7. `\[[!inline]]` the articles. + 7. Rerun `ikiwiki --setup`. +7. Stop Textpattern, start ikiwiki. +7. Verify that podcatchers see the feeds and don't redownload anything. +7. Naively add two new blog posts, one with an enclosure. +7. Verify that podcatchers download the new enclosures. + ----- ## Future improvements @@ -122,6 +212,8 @@ Episode enclosure |(./) |(./) |(./) |(./) ### Other ideas +* Don't render template text (e.g., "Use this template to insert a + note into a page") in feeds. * Optionally specify the enclosure's: * MIME type, in case `File::MimeInfo` guesses wrong. * Duration, in case `ffprobe` guesses wrong. From 05ef03951228b33472b442230f891e57bd79c31a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlc1n8sFLPn3DdkDndR-jYWaN0k16WewT8" Date: Thu, 23 May 2013 05:45:29 -0400 Subject: [PATCH 28/63] Add jlefrique's homepage --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 6b657c8ff..07b669f64 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -191,3 +191,4 @@ Personal sites and blogs * [WikiAtoBR](http://wiki.hi.ato.br) Open, free and annoymous wiki. No need for account registering and login. It is Brazilian so it is in Portuguese. * [Manifesto](http://manifesto.hi.ato.br) Open, free and annoymous blog. No need for account registering and login. It is Brazilian so it is in Portuguese. * [Z is for Zombies](http://blog.zouish.org/) — personal blog/site of Francesca Ciceri +* Julien Lefrique's [homepage](http://julien.lefrique.name/), hosted on [GitHub pages](https://github.com/jlefrique/jlefrique.github.com) with CGI disabled From 3b444c450ae91cd30fbd422e19fdabdd9db55f3c Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 26 May 2013 05:48:18 -0400 Subject: [PATCH 29/63] Nicer to look at: no red X's, just checkmarks. --- doc/todo/fancypodcast.mdwn | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn index ccf08eeaf..f67c62da1 100644 --- a/doc/todo/fancypodcast.mdwn +++ b/doc/todo/fancypodcast.mdwn @@ -22,18 +22,18 @@ critical eyes ([[smcv]]?) raking over my diffs. --[[schmonz]] [[!table data=""" Feature |iTunes RSS|iTunes Atom|Downcast RSS|Downcast Atom -Feed image |{X} |{X} |{X} |{X} +Feed image | | | | Feed title |(./) |(./) |(./) |(./) -Feed publisher |{X} |{X} |{X} |{X} -Feed "category" |{X} |{X} |{X} |{X} +Feed publisher | | | | +Feed "category" | | | | Feed date |(./) |(./) |(./) |(./) -Feed description |(./) |(./) |(./) |{X} -Episode image |{X} |{X} |{X} |{X} +Feed description |(./) |(./) |(./) | +Episode image | | | | Episode title |(./) |(./) |(./) |(./) Episode date |(./) |(./) |(./) |(./) -Episode duration |{X} |{X} |{X} |{X} -Episode author |{X} |{X} |{X} |{X} -Episode description|(./) |(./) |(./) |{X} +Episode duration | | | | +Episode author | | | | +Episode description|(./) |(./) |(./) | Episode enclosure |(./) |(./) |(./) |(./) """]] From 852af6ed8d738bb71faa2c470b1e04928bde55a0 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 26 May 2013 09:43:42 -0400 Subject: [PATCH 30/63] Link to NetBSD (cat has been released from bag). --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 07b669f64..b58ef205f 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -19,7 +19,7 @@ Projects & Organizations ======================== * [This wiki](http://ikiwiki.info) (of course!) - +* [NetBSD wiki](http://wiki.netbsd.org) * The [GNU Hurd](http://www.gnu.org/software/hurd/) * [DragonFly BSD](http://www.dragonflybsd.org/) * [Monotone](http://wiki.monotone.ca/) From ab6ae1e6ad04928463cc4a93c9aadb9ce265b16b Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 26 May 2013 10:44:31 -0400 Subject: [PATCH 31/63] Update my user page. --- doc/users/schmonz.mdwn | 44 +++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn index 84dca1948..97fa1cbd6 100644 --- a/doc/users/schmonz.mdwn +++ b/doc/users/schmonz.mdwn @@ -1,20 +1,32 @@ -[Amitai Schlair](http://www.schmonz.com/) uses ikiwiki -for all sorts of things: - -* a undergraduate group's university-provided-static-hosted site - (with [[plugins/rsync]] and a [WIND - authentication](http://www.columbia.edu/acis/rad/authmethods/wind/) - plugin) -* a major open-source project's wiki (with the [[rcs/cvs]] plugin) -* team documentation and project planning at work: product and - sprint backlogs, burndown charts, release plans/procedures/announcements, - aggregating feeds of shared interest, etc. (with the - [[plugins/contrib/dynamiccookies]] and [[plugins/contrib/proxies]] - plugins) -* personal to-do and scratch space - -ikiwiki contributions: +[Amitai Schlair](http://www.schmonz.com/) has contributed code to ikiwiki... [[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs or todo/fancypodcast)" ]] + +...and uses ikiwiki for all sorts of things: + +## Public + +* [A major open-source project's wiki](http://wiki.netbsd.org) (with + the [[rcs/cvs]] plugin) +* [An undergraduate group's university-provided-static-hosted + site](http://www.columbia.edu/cu/philo/) (with [[plugins/rsync]] and a [WIND + authentication](http://www.columbia.edu/acis/rad/authmethods/wind/) plugin) +* [A small personal site](http://www.anglofish.net/) (happily hosted at + [Branchable](http://www.branchable.com/)) + +## Non-public + +* At work, team documentation and project planning: product and sprint + backlogs, burndown charts, release plans/procedures/announcements, + aggregating feeds of shared interest, etc. (with the + [[plugins/contrib/dynamiccookies]] and [[plugins/contrib/proxies]] plugins) +* On my laptop, personal to-do and scratch space +* [A small personal site](http://podcast.schmonz.com/) (happily hosted at + [Branchable](http://www.branchable.com/)) + +## Non-yet-ikiwiki + +* [My personal web site](http://www.schmonz.com/) (pending + [[todo/fancypodcast]] integration) From 6e7c51a3bd2469d418e4a388bdd9132d554336b9 Mon Sep 17 00:00:00 2001 From: "184.71.105.78" <184.71.105.78@web> Date: Thu, 30 May 2013 15:13:23 -0400 Subject: [PATCH 32/63] poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 8f04c5e90..0f4b8b5bf 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 70 "Accept only OpenID for logins" 21 "Accept only password logins" 46 "Accept both"]] +[[!poll 70 "Accept only OpenID for logins" 21 "Accept only password logins" 47 "Accept both"]] From ea1bed541087a72ccd318811664aa5f477b20479 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm6gCEo_Z36OJ7x5kyZn52lEVvyjn3zSUc" Date: Fri, 31 May 2013 12:03:04 -0400 Subject: [PATCH 33/63] Added a comment --- ...mment_1_7702cf6d354ab600d6643b075b9f09da._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment diff --git a/doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment b/doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment new file mode 100644 index 000000000..7c9ccbca1 --- /dev/null +++ b/doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawm6gCEo_Z36OJ7x5kyZn52lEVvyjn3zSUc" + nickname="Ángel" + subject="comment 1" + date="2013-05-31T16:03:03Z" + content=""" +Simply add the NE (No escape) flag: + +RewriteEngine on +RewriteCond %{HTTP_HOST} ^www\.ciffer\.net$ +RewriteRule /(.*) http://ciffer.net/$1 [L,R,NE] +"""]] From d2856920ec164fb16b7bfac794f27db01a3392de Mon Sep 17 00:00:00 2001 From: Changaco Date: Tue, 4 Jun 2013 06:14:15 -0400 Subject: [PATCH 34/63] new patch --- .../encoding_issue_in_blogspam_plugin.mdwn | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 doc/bugs/encoding_issue_in_blogspam_plugin.mdwn diff --git a/doc/bugs/encoding_issue_in_blogspam_plugin.mdwn b/doc/bugs/encoding_issue_in_blogspam_plugin.mdwn new file mode 100644 index 000000000..61e75a1c3 --- /dev/null +++ b/doc/bugs/encoding_issue_in_blogspam_plugin.mdwn @@ -0,0 +1,32 @@ +[[!tag patch]] + +
+From 5ad35b2805ca50478f07d810e57e7c9b8f4eddea Mon Sep 17 00:00:00 2001
+From: Changaco <changaco@changaco.net>
+Date: Tue, 4 Jun 2013 02:54:35 +0200
+Subject: [PATCH] fix encoding issue in blogspam plugin
+
+RPC::XML uses ascii as default encoding, we have to tell it to use utf8.
+
+Without this, ikiwiki returns "failed to get response from blogspam server"
+every time a non-ascii character is used in a content that needs checking.
+
+---
+ IkiWiki/Plugin/blogspam.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
+index d32c2f1..e48ed72 100644
+--- a/IkiWiki/Plugin/blogspam.pm
++++ b/IkiWiki/Plugin/blogspam.pm
+@@ -53,6 +53,7 @@ sub checkconfig () {
+ 	eval q{
+ 		use RPC::XML;
+ 		use RPC::XML::Client;
++		$RPC::XML::ENCODING = 'utf-8';
+ 	};
+ 	error $@ if $@;
+ }
+-- 
+1.8.3
+
From adc3c5e7bcccbaa286d7da8dbdbcde035ba4adc0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 4 Jun 2013 17:16:49 -0400 Subject: [PATCH 35/63] update instructions to work with new debian apache packages --- doc/tips/dot_cgi.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index dc88d9595..9067fbea5 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -15,7 +15,10 @@ configuration changes should work anywhere. ## apache 2 -* Edit /etc/apache2/apache2.conf and add a line like this: +* Make sure the cgi module is loaded. (Ie, `a2enmod cgi`) + +* Edit /etc/apache2/apache2.conf (or /etc/apache2/mods-available/mime.conf) + and add a line like this: AddHandler cgi-script .cgi @@ -26,8 +29,6 @@ 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 install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`. - * If your wiki is in `~/public_html` and does not appear when you enter the URL given by the installer, check that you have the userdir mod enabled (there should be simlinks to userdir.load and userdir.conf in /etc/apache2/modes-enabled). If not, run `a2enmod userdir` and reload apache2. From b23e70100c9d7814786320b9b56be309ab8a6235 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/pvrv15ABitOTt9ZqqgZhBq2rPzIWvJFz#e0134" Date: Wed, 5 Jun 2013 21:35:12 -0400 Subject: [PATCH 36/63] --- doc/index.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/index.mdwn b/doc/index.mdwn index 4c22ce0e0..254f51a70 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,3 +27,6 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. + + +[[!img College_of_New_Brunswick.jpg align="right" size="" alt=""]] From c1350a1b1261b04cf0dee20dc18c359ed87e7572 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI" Date: Wed, 5 Jun 2013 22:06:09 -0400 Subject: [PATCH 37/63] revert probable spam This reverts commit b23e70100c9d7814786320b9b56be309ab8a6235 --- doc/index.mdwn | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 254f51a70..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,6 +27,3 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. - - -[[!img College_of_New_Brunswick.jpg align="right" size="" alt=""]] From 9ea61a3642d4831db476acfacf314adf2ac3a6b0 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkq11bTnmln5O-k-utYZYK8N9TzG3T1THk" Date: Fri, 14 Jun 2013 20:45:59 -0400 Subject: [PATCH 38/63] Added bornogtonlist.net to the list --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index b58ef205f..9647b35a3 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -88,6 +88,7 @@ Projects & Organizations * [The RS-232 Club](http://rs232club.org) * [FusionInventory project](http://www.fusioninventory.org) * FabLab Deventer i.o. +* [Börn og tónlist](http://bornogtonlist.net/) - an Icelandic open-content site, primarily for kindergarten teachers, about music and music-related activites with children. Migrated from MediaWiki to IkiWiki in June 2013. Heavily changed appearance with only minimal changes to page.tmpl. Personal sites and blogs ======================== From 9fbdafe606c414c532e81925dc66bd40d18addfa Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkq11bTnmln5O-k-utYZYK8N9TzG3T1THk" Date: Mon, 17 Jun 2013 11:55:14 -0400 Subject: [PATCH 39/63] Added description of mathjax plugin --- doc/plugins/contrib/mathjax.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/plugins/contrib/mathjax.mdwn diff --git a/doc/plugins/contrib/mathjax.mdwn b/doc/plugins/contrib/mathjax.mdwn new file mode 100644 index 000000000..a784b95d9 --- /dev/null +++ b/doc/plugins/contrib/mathjax.mdwn @@ -0,0 +1,13 @@ +[[!template id="plugin" name="mathjax" author="Baldur Kristinsson"]] + +The [mathjax plugin](https://github.com/bk/ikiwiki-plugin-mathjax), available on GitHub, provides easy MathJax support for ikiwiki. + +Features: + +- No change needed to page.tmpl +- Javascript is only loaded on pages which need it. +- Both inline and display math are supported. +- Unlike [[the pandoc plugin|plugins/contrib/pandoc]] or a solution based on editing page.tmpl, no irritating conflicts with the smiley plugin. +- Unlike the pandoc plugin, it is easy to use in shared hosting or other environments where you have difficulty in installing extra software (beyond Perl modules, obviously). + +However, if you need the power of Pandoc, such as bibliography support or pdf generation, then that is probably the better option for you. From f6691309f8ab541ba51ddb10068e8eab9713861f Mon Sep 17 00:00:00 2001 From: soportek Date: Tue, 18 Jun 2013 17:36:59 -0400 Subject: [PATCH 40/63] --- doc/forum/Translating_ikiwiki_interface.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/forum/Translating_ikiwiki_interface.mdwn diff --git a/doc/forum/Translating_ikiwiki_interface.mdwn b/doc/forum/Translating_ikiwiki_interface.mdwn new file mode 100644 index 000000000..4003302e5 --- /dev/null +++ b/doc/forum/Translating_ikiwiki_interface.mdwn @@ -0,0 +1,2 @@ +I am using ikiwiki for a spanish language wiki. I've read the [[translation]] page and [[plugins/po]] plugin page but it is not completely clear to me. As I understand it the po plugin is the recommended way to create translated versions of existing pages in your wiki based on a master language. But I actually don't need that as myself and other users already edit the wiki in spanish. What I would actually like is to have the ikiwiki interface itself translated into spanish. +Is it possible to have my wiki always appear in spanish? I can see that the debian package already includes po files for spanish. How do i activate the spanish translation permanently? Did I miss something obvious? From bdb17a6d3070292ae965b73bf318a53bedd3d79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 19 Jun 2013 09:56:14 -0400 Subject: [PATCH 41/63] i am blocked! --- doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn diff --git a/doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn b/doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn new file mode 100644 index 000000000..bbec2b70b --- /dev/null +++ b/doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn @@ -0,0 +1,8 @@ +I just got this message trying to post to this wiki: + + Error: Sorry, but that looks like spam to blogspam: No reverse DNS entry for 2001:1928:1:9::1 + +So yeah, it seems I have no reverse DNS for my IPv6 address, which may +be quite common for emerging IPv6 deployments... + +This may be related to [[bugs/blogspam_options whitelist vs. IPv6?]]. From c5ea7ea7c8689cdc00fc379b4ef3ccebb441ebc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 19 Jun 2013 09:58:35 -0400 Subject: [PATCH 42/63] mention the fastcgi todo here --- doc/forum/web_service_API__44___fastcgi_support.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/forum/web_service_API__44___fastcgi_support.mdwn b/doc/forum/web_service_API__44___fastcgi_support.mdwn index 4a78fb932..84b227eef 100644 --- a/doc/forum/web_service_API__44___fastcgi_support.mdwn +++ b/doc/forum/web_service_API__44___fastcgi_support.mdwn @@ -11,3 +11,8 @@ Anyway - I've realised that a big part of the interactive todo lists stuff is tr Second, and in a way related, I've been mooting hacking fastcgi support into ikiwiki. Essentially one ikiwiki.cgi process would persist and serve CGI-ish requests on stdin/stdout. The initial content-scanning and dependency generation would happen once and not need to be repeated for future requests. Although, all state-changing operations would need to be careful to ensure the in-memory models were accurate. Also, I don't know how suited the data structures would be for persistence, since the current model is build em up, throw em away, they might not be space-efficient enough for persistence. If I did attempt this, I would want to avoid restructuring things in a way which would impair ikiwiki's core philosophy of being a static compiler. -- [[Jon]] + +> This is quite interesting! There is a related discussion about FastCGI +> support (and therefore better support for Nginx, for example) in +> [[todo/fastcgi_or_modperl_installation_instructions/]]... -- +> [[anarcat]] From 61c469807e8a3d3a2e220df87566c5f72011abca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 19 Jun 2013 09:59:46 -0400 Subject: [PATCH 43/63] try to fix link --- doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn b/doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn index bbec2b70b..9b415a84a 100644 --- a/doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn +++ b/doc/bugs/blogspam_marks_me_as_spam_on_ipv6.mdwn @@ -5,4 +5,4 @@ I just got this message trying to post to this wiki: So yeah, it seems I have no reverse DNS for my IPv6 address, which may be quite common for emerging IPv6 deployments... -This may be related to [[bugs/blogspam_options whitelist vs. IPv6?]]. +This may be related to [[blogspam_options whitelist vs. IPv6?]]. From eae629ee5ace62b2ca985cd5a2faa18116608cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 19 Jun 2013 10:10:21 -0400 Subject: [PATCH 44/63] add a bunch of wikis i have deployed --- doc/ikiwikiusers.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 9647b35a3..ecba46e03 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -89,6 +89,8 @@ Projects & Organizations * [FusionInventory project](http://www.fusioninventory.org) * FabLab Deventer i.o. * [Börn og tónlist](http://bornogtonlist.net/) - an Icelandic open-content site, primarily for kindergarten teachers, about music and music-related activites with children. Migrated from MediaWiki to IkiWiki in June 2013. Heavily changed appearance with only minimal changes to page.tmpl. +* [Réseaulibre.ca](http://wiki.reseaulibre.ca) - a mesh project in Montréal, most data is stored in the wiki, including IP address allocation and geographic data. Features map ([[plugins/osm]]) integration. +* [Foufem](http://foufem.orangeseeds.org/) - Foufem, a feminist hackerspace Personal sites and blogs ======================== @@ -193,3 +195,4 @@ Personal sites and blogs * [Manifesto](http://manifesto.hi.ato.br) Open, free and annoymous blog. No need for account registering and login. It is Brazilian so it is in Portuguese. * [Z is for Zombies](http://blog.zouish.org/) — personal blog/site of Francesca Ciceri * Julien Lefrique's [homepage](http://julien.lefrique.name/), hosted on [GitHub pages](https://github.com/jlefrique/jlefrique.github.com) with CGI disabled +* [Anarcat's homepage](http://anarcat.ath.cx/) - with a custom [[theme|theme_market]] From 759d5ecd561f0ba16203d0856e8169f26f596e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 19 Jun 2013 10:21:45 -0400 Subject: [PATCH 45/63] add bootstrap theme i found --- doc/theme_market.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn index 06526df1a..e9bdaa056 100644 --- a/doc/theme_market.mdwn +++ b/doc/theme_market.mdwn @@ -9,3 +9,5 @@ Feel free to add your own [[theme|themes]] here, but first consider writing a si * **[[AntPortal theme|https://github.com/AntPortal/ikiwiked]]**, contributed by Danny, see an example [[on the Antportal wiki|https://antportal.com/wiki/]] * **[[Night city theme|http://anarcat.ath.cx/night_city/README/]]**, contributed by [[anarcat]], see an example [[on his homepage|http://anarcat.ath.cx/]] + + * **[[Bootstrap theme|http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary]]**, contributed by [[JAK LINUX|http://jak-linux.org/about/]], based on [[Twitter Bootstrap|http://twitter.github.com/bootstrap/]] From 2860b1461dbf6d75e69ddcc7f0cfd1cd16333277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 19 Jun 2013 10:24:25 -0400 Subject: [PATCH 46/63] mention the theme market directly here --- doc/themes.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/themes.mdwn b/doc/themes.mdwn index 7df25e66b..e15248360 100644 --- a/doc/themes.mdwn +++ b/doc/themes.mdwn @@ -3,7 +3,9 @@ ikiwiki a nice look and feel. The local.css [[CSS]] file is left free for you to further customize. Ikiwiki now comes with several themes contributed by users. -You can enable the [[theme_plugin|plugins/theme]] to use any of these: +You can enable the [[theme_plugin|plugins/theme]] to use any of +these, but you can also deploy custom themes maintained by the +community from the [[theme market]]. [[!img actiontabs_small.png align=left]] The **actiontabs** theme, contributed by [[svend]]. This style sheet displays the action list From 40254c85e3a150ddaca157ba03c0474da146f997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 19 Jun 2013 10:28:04 -0400 Subject: [PATCH 47/63] propose the bootstrap theme --- doc/themes/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn index ce79d0f70..d01b7838a 100644 --- a/doc/themes/discussion.mdwn +++ b/doc/themes/discussion.mdwn @@ -7,3 +7,8 @@ For an example of the theme in action, see: [[https://antportal.com/wiki/]] > Shouldn't we just make people post their themes in the [[themes]] page? Or maybe we should make a [[theme market]]? --[[anarcat]] > I did just that. -- [[anarcat]] + +What is the process for merging a theme in Ikiwiki? It seems to me the +[[Bootstrap theme|http://www2.tblein.eu/posts/How_to_have_a_nice_design_for_ikiwiki/]] +could improve the options a lot... See the [[theme market]] for the +links to the actual theme. -- [[anarcat]] From e51169132aaaafb5b90515ad1165e513e8953c91 Mon Sep 17 00:00:00 2001 From: Changaco <<changaco@changaco.net> Date: Tue, 4 Jun 2013 02:54:35 +0200 Subject: [PATCH 48/63] fix encoding issue in blogspam plugin RPC::XML uses ascii as default encoding, we have to tell it to use utf8. Without this, ikiwiki returns "failed to get response from blogspam server" every time a non-ascii character is used in a content that needs checking. --- IkiWiki/Plugin/blogspam.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm index d32c2f169..e48ed729f 100644 --- a/IkiWiki/Plugin/blogspam.pm +++ b/IkiWiki/Plugin/blogspam.pm @@ -53,6 +53,7 @@ sub checkconfig () { eval q{ use RPC::XML; use RPC::XML::Client; + $RPC::XML::ENCODING = 'utf-8'; }; error $@ if $@; } From c204de3ca2a14fa9513da2c65fb841fdfb8eb767 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Jun 2013 14:03:07 -0400 Subject: [PATCH 49/63] blogspam: Fix encoding issue in RPC::XML call. Thanks, Changaco --- debian/changelog | 7 +++++++ doc/bugs/encoding_issue_in_blogspam_plugin.mdwn | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 33795a5da..375a9d0a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20130519) UNRELEASED; urgency=low + + * blogspam: Fix encoding issue in RPC::XML call. + Thanks, Changaco + + -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 + ikiwiki (3.20130518) unstable; urgency=low * Fix test suite to not fail when XML::Twig is not installed. diff --git a/doc/bugs/encoding_issue_in_blogspam_plugin.mdwn b/doc/bugs/encoding_issue_in_blogspam_plugin.mdwn index 61e75a1c3..92318d165 100644 --- a/doc/bugs/encoding_issue_in_blogspam_plugin.mdwn +++ b/doc/bugs/encoding_issue_in_blogspam_plugin.mdwn @@ -30,3 +30,5 @@ index d32c2f1..e48ed72 100644 -- 1.8.3 + +[[done]] --[[Joey]] From c037714b77535c849c8d8ef4807af2b59737a5c5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Jun 2013 14:05:32 -0400 Subject: [PATCH 50/63] comments: The formats allowed to be used in comments can be configured using comments_allowformats. Thanks, Michal Sojka --- debian/changelog | 3 +++ doc/todo/Restrict_formats_allowed_for_comments.mdwn | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 375a9d0a9..b9b46be3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low * blogspam: Fix encoding issue in RPC::XML call. Thanks, Changaco + * comments: The formats allowed to be used in comments can be configured + using comments_allowformats. + Thanks, Michal Sojka -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 diff --git a/doc/todo/Restrict_formats_allowed_for_comments.mdwn b/doc/todo/Restrict_formats_allowed_for_comments.mdwn index cfae38465..9aee29037 100644 --- a/doc/todo/Restrict_formats_allowed_for_comments.mdwn +++ b/doc/todo/Restrict_formats_allowed_for_comments.mdwn @@ -95,3 +95,5 @@ index 285013e..151e839 100644 [[!tag patch]] + +> [[done]] --[[Joey]] From b8d65da266e45e81356dcf60b28209b75a437973 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Jun 2013 14:11:39 -0400 Subject: [PATCH 51/63] calendar: When there are multiple pages for a given day, they're displayed in a popup on mouseover. Thanks, Louis --- IkiWiki/Plugin/calendar.pm | 43 ++++++++++++++++--- debian/changelog | 3 ++ ...dar:_listing_multiple_entries_per_day.mdwn | 2 + doc/style.css | 1 + ...ar:_listing_multiple_entries_per_day_.mdwn | 2 + 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index d443198f6..8ca6dd826 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -86,8 +86,10 @@ sub format_month (@) { my $year = $date[5] + 1900; my $mtag = sprintf("%02d", $month); - # Only one posting per day is being linked to. - $linkcache{"$year/$mtag/$mday"} = $p; + if (! $linkcache{"$year/$mtag/$mday"}) { + $linkcache{"$year/$mtag/$mday"} = []; + } + push(@{$linkcache{"$year/$mtag/$mday"}}, $p); } my $pmonth = $params{month} - 1; @@ -221,11 +223,38 @@ EOF $tag='month-calendar-day-link'; } $calendar.=qq{\t\t}; - $calendar.=htmllink($params{page}, $params{destpage}, - $linkcache{$key}, - noimageinline => 1, - linktext => $day, - title => pagetitle(IkiWiki::basename($linkcache{$key}))); + if (scalar(@{$linkcache{$key}}) == 1) { + # Only one posting on this page + my $page = $linkcache{$key}[0]; + $calendar.=htmllink($params{page}, $params{destpage}, + $page, + noimageinline => 1, + linktext => $day, + title => pagetitle(IkiWiki::basename($page))); + } + else { + $calendar.=qq{
$day
}; + # Several postings on this page + $calendar.=qq{
    }; + foreach my $page (@{$linkcache{$key}}) { + $calendar.= qq{\n\t\t\t
  • }; + my $title; + if (exists $pagestate{$page}{meta}{title}) { + $title = "$pagestate{$page}{meta}{title}"; + } + else { + $title = pagetitle(IkiWiki::basename($page)); + } + $calendar.=htmllink($params{page}, $params{destpage}, + $page, + noimageinline => 1, + linktext => $title, + title => $title); + $calendar.= '
    • '; + } + $calendar.=qq{\n\t\t
}; + $calendar.=qq{
}; + } $calendar.=qq{\n}; } else { diff --git a/debian/changelog b/debian/changelog index b9b46be3d..10e0e84ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low * comments: The formats allowed to be used in comments can be configured using comments_allowformats. Thanks, Michal Sojka + * calendar: When there are multiple pages for a given day, they're + displayed in a popup on mouseover. + Thanks, Louis -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn index 251cd6d9f..c3ecf36be 100644 --- a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn @@ -17,3 +17,5 @@ and a suitable whilst loop looks to be all that's needed... Any pointers appreciated. A [[!taglink patch]] has been proposed in [comment](#comment-d6f94e2b779d1c038b6359aad79ed14b) + +> This has been applied. --[[Joey]] diff --git a/doc/style.css b/doc/style.css index 424d43816..b52c72b6b 100644 --- a/doc/style.css +++ b/doc/style.css @@ -323,6 +323,7 @@ div.progress-done { .popup .paren, .popup .expand { display: none; + text-align: left; } .popup:hover .balloon, .popup:focus .balloon { diff --git a/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn b/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn index 94a4f1577..ba01790b3 100644 --- a/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn +++ b/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn @@ -90,3 +90,5 @@ Regards, } .popup:hover .balloon, .popup:focus .balloon { + +> [[applied|done]] --[[Joey]] From c5f9b016621d20766196a0859508a083a486b4cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Jun 2013 14:14:52 -0400 Subject: [PATCH 52/63] osm: Remove trailing slash from KML maps icon. --- IkiWiki/Plugin/osm.pm | 1 + debian/changelog | 1 + doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn | 2 ++ 3 files changed, 4 insertions(+) diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm index a7baa5f2b..c9650d014 100644 --- a/IkiWiki/Plugin/osm.pm +++ b/IkiWiki/Plugin/osm.pm @@ -192,6 +192,7 @@ sub process_waypoint { } } $icon = urlto($icon, $dest, 1); + $icon =~ s!/*$!!; # hack - urlto shouldn't be appending a slash in the first place $tag = '' unless $tag; register_rendered_files($map, $page, $dest); $pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = { diff --git a/debian/changelog b/debian/changelog index 10e0e84ff..e817deb9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low * calendar: When there are multiple pages for a given day, they're displayed in a popup on mouseover. Thanks, Louis + * osm: Remove trailing slash from KML maps icon. -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 diff --git a/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn b/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn index 0677d0e74..a3a88d138 100644 --- a/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn +++ b/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn @@ -30,3 +30,5 @@ index a7baa5f..c9650d0 100644 """]] I'm not writing this to a branch out of sheer shame of my misunderstanding. ;) There also may be a workaround that could be done in Nginx too. --[[anarcat]] + +> [[applied|done]], but I'm not happy with this either --[[Joey]] From d3a9cb4b126571f6342c3747df40ffd0b8f078b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Jun 2013 14:46:39 -0400 Subject: [PATCH 53/63] code review --- doc/todo/fancypodcast.mdwn | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn index f67c62da1..4b534ee67 100644 --- a/doc/todo/fancypodcast.mdwn +++ b/doc/todo/fancypodcast.mdwn @@ -225,3 +225,44 @@ it with ikiwiki instead. * Configurably generate additional subscription links (such as iTunes) alongside the RSS/Atom ones in [[plugins/inline]]. * Support Apple's "enhanced podcasts" (if they're still relevant). + +### code review + + + # XXX better way to compute relative to srcdir? + + my $file = $absurl; + + $file =~ s|^$config{url}/||; + +I don't think ikiwiki offers a better way to do that, because there is +normally no reason to do that. Why does it need an url of this form here? +--[[Joey]] + + +
+ + + +Can't we avoid adding this div when there's no enclosure? --[[Joey]] + + +Download this episode + +"Download this episode" is pretty specific to particular use cases. +Can this be made more generic, perhaps just "Download"? --[[Joey]] + + - + - <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE> + - + +This change removes the athor name from the title of the rss feed, which +does not seem necessary for fancy podcasts. And it is a change that +could negatively impact eg, Planet style aggregators using ikiwiki. --[[Joey]] + + +++ b/templates/rsspage.tmpl + + xmlns:atom="http://www.w3.org/2005/Atom" + + + +Why is it using atom namespace inside an rss feed? What are the chances +every crummy rss reader on earth is going to understand this? I'd put it at +about 0%; I doubt ikiwiki's own rss reader understands such a mashup. +--[[Joey]] + + +ikiwiki + +Does this added tag provide any benefits? --[[Joey]] From 0eec7acb251af0ff2ae9ee623ee301b105b2d043 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlJ3C5fg1b1hfxd6rDYvcpBi-WujPqEDkM" Date: Tue, 25 Jun 2013 08:21:08 -0400 Subject: [PATCH 54/63] problem description --- doc/plugins/contrib/album/discussion.mdwn | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn index cdb8353e5..f1f60b645 100644 --- a/doc/plugins/contrib/album/discussion.mdwn +++ b/doc/plugins/contrib/album/discussion.mdwn @@ -410,3 +410,40 @@ I've integrated the jquery masonry plugin into the albumitem template and it wor But is there a way to create thumnails of different sizes? I've passed thumnailsize option and value to album directive and while it does create the new thumbnail sizes it doesn't use them, The 96x96 thumbnails still appear on the page no matter what I do. - jaime + +---- + +Hi, the plugin looks great, but I am probably too dumb to use it ;( here is what I did: +created page gal.mdwn with just \[\[!album\]\] directive (no arguments) and subdirectory gal/ with images in form img_1234.jpg + +when I run ikiwiki, I get something completely wrong though: + +generated gal/index.html page contains following code repeated for every image: + +
+
+
+ ↑ +
+
+
+ +So no links to any images, etc. + +The pages for individual images are generated though, but also not correct. Trails section is perfect, but the main part is wrong: + +
+ â†<90>
+
+ + img 2913 +
+
+ +This really seems like this should be in the album page and not individul page. It is only thumbnail and not full image. Also the full image is not in the generated html tree at all! + +I am using ikiwiki 3.20130518, and got the album sources from the links of [this page](http://ikiwiki.info/plugins/contrib/album/) (part manual installation) + +Any hint about what do I do wrong? + +Thanks Lukas From 65d30591e864c89a753d37a9dc48fa0488321f2e Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 25 Jun 2013 08:51:41 -0400 Subject: [PATCH 55/63] --- doc/plugins/contrib/album/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn index f1f60b645..791e5e4ef 100644 --- a/doc/plugins/contrib/album/discussion.mdwn +++ b/doc/plugins/contrib/album/discussion.mdwn @@ -447,3 +447,7 @@ I am using ikiwiki 3.20130518, and got the album sources from the links of [this Any hint about what do I do wrong? Thanks Lukas + +> This plugin is not really finished. I probably need to update it for +> current ikiwiki. I'll try to update it (and also update my demo +> and installation instructions) at some point. --[[smcv]] From 5e1d437fc60722a7076ed3d5398e8db906eca34d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlJ3C5fg1b1hfxd6rDYvcpBi-WujPqEDkM" Date: Wed, 26 Jun 2013 09:10:23 -0400 Subject: [PATCH 56/63] not a problem - in fact, I am to dumb to copy the template correctly... --- doc/plugins/contrib/album/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn index 791e5e4ef..de1180d10 100644 --- a/doc/plugins/contrib/album/discussion.mdwn +++ b/doc/plugins/contrib/album/discussion.mdwn @@ -451,3 +451,8 @@ Thanks Lukas > This plugin is not really finished. I probably need to update it for > current ikiwiki. I'll try to update it (and also update my demo > and installation instructions) at some point. --[[smcv]] + +>> I have to appologize, I accidentally copied the template wrongly and that caused all the issues ;( +>> So now after two days debugging and tracing, I just fixed that and it works. Well, at least a learnt +>> a lot about ikiwiki internal ;-) +>> Thanks for all the work you did on the plugin! --Lukas From a1d42a132ac7d6e7a25bc94abb10ee7ce7a93b1b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 3 Mar 2013 16:45:43 +0000 Subject: [PATCH 57/63] add patch --- doc/bugs/trail_shows_on_cgi_pages.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/bugs/trail_shows_on_cgi_pages.mdwn b/doc/bugs/trail_shows_on_cgi_pages.mdwn index 74f329fbc..0f4766f17 100644 --- a/doc/bugs/trail_shows_on_cgi_pages.mdwn +++ b/doc/bugs/trail_shows_on_cgi_pages.mdwn @@ -1,3 +1,7 @@ When commenting on, or I think editing, a page that uses the trail plugin, the trail is displayed across the top of the page. This should not happen, probably. --[[Joey]] + +> [[!template id=gitbranch branch=smcv/ready/no-trails-if-dynamic author="[[smcv]]"]] +> [[!tag patch]] +> Fixed in my branch. --[[smcv]] From a5f81918c8461c630ada63c90c6593089fb7aae3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 11:25:40 -0400 Subject: [PATCH 58/63] page.tmpl: omit searchform, trails, sidebar and most metadata in CGI (smcv) --- debian/changelog | 2 ++ doc/bugs/trail_shows_on_cgi_pages.mdwn | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e817deb9b..d98af52cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low displayed in a popup on mouseover. Thanks, Louis * osm: Remove trailing slash from KML maps icon. + * page.tmpl: omit searchform, trails, sidebar and most metadata in CGI + (smcv) -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 diff --git a/doc/bugs/trail_shows_on_cgi_pages.mdwn b/doc/bugs/trail_shows_on_cgi_pages.mdwn index 0f4766f17..af1de3028 100644 --- a/doc/bugs/trail_shows_on_cgi_pages.mdwn +++ b/doc/bugs/trail_shows_on_cgi_pages.mdwn @@ -5,3 +5,8 @@ happen, probably. --[[Joey]] > [[!template id=gitbranch branch=smcv/ready/no-trails-if-dynamic author="[[smcv]]"]] > [[!tag patch]] > Fixed in my branch. --[[smcv]] + +>> [[merged|done]], although I am ambivilant about hiding the search box, +>> and unsure about hiding the sidebar. At least the latter fixes an +>> annoying layout problem with the comment page, where the textarea +>> appears below the sidebar due to its width. --[[Joey]] From a9664b9df88b738e6551df17d39c96a489f22287 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 19:59:04 -0400 Subject: [PATCH 59/63] https link --- doc/templates/links.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn index 6c66a02ec..4bd1a85bf 100644 --- a/doc/templates/links.mdwn +++ b/doc/templates/links.mdwn @@ -11,6 +11,6 @@
  • [[TipJar]]
    • -Flattr this
    From 782ad9f4c3a7802f9bd843fa5864e413d587c2b9 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Wed, 26 Jun 2013 20:45:25 -0400 Subject: [PATCH 60/63] response to review (thanks!) --- doc/todo/fancypodcast.mdwn | 45 +++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn index 4b534ee67..21aadf1f7 100644 --- a/doc/todo/fancypodcast.mdwn +++ b/doc/todo/fancypodcast.mdwn @@ -236,24 +236,56 @@ I don't think ikiwiki offers a better way to do that, because there is normally no reason to do that. Why does it need an url of this form here? --[[Joey]] +> In all the popular, production-quality podcast feeds I've looked +> at, enclosure URLs are always absolute (even when they could be +> expressed concisely as relative). [Apple's +> example](http://www.apple.com/itunes/podcasts/specs.html#example) +> does too. So I told \[[!meta]] to call `urlto()` with the third +> parameter true, which means the \[[!inline]] code here gets an +> absolute URL in `$pagestate{$p}{meta}{enclosure}`. To compute the +> enclosure's metadata, though, we of course need it as a local path. +> I didn't see a less +> [ongepotchket](http://www.jewish-languages.org/jewish-english-lexicon/words/1402) +> way at the time. If you have a better idea, I'm happy to hear it; +> if not, I'll add an explanatory comment. --[[schmonz]] + +
    + Can't we avoid adding this div when there's no enclosure? --[[Joey]] +> Sure, I've moved the `` check to outside the +> section-and-div block for `{,inline}page.tmpl`. --[[schmonz]] + +Download this episode "Download this episode" is pretty specific to particular use cases. Can this be made more generic, perhaps just "Download"? --[[Joey]] +> Yep, I got a little carried away. Done. --[[schmonz]] + - - <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE> - -This change removes the athor name from the title of the rss feed, which +This change removes the author name from the title of the rss feed, which does not seem necessary for fancy podcasts. And it is a change that could negatively impact eg, Planet style aggregators using ikiwiki. --[[Joey]] +> While comparing how feeds render in podcatchers, I noticed that +> RSS and Atom were inconsistent in a couple ways, of which this was +> one. The way I noticed it: with RSS, valuable title space was being +> spent to display the author. I figured Atom's display was the one +> worth matching. You're right, of course, that planets using the +> default template and somehow relying on the current author-in-the-title +> rendering for RSS feeds (but not Atom feeds!) would be broken by +> this change. I'm having trouble imagining exactly what would break, +> though, since guids and timestamps are unaffected. Would it suffice +> to provide a note in the changelog warning people to be careful +> upgrading their planets, and to customize `rssitem.tmpl` if they +> really prefer the old behavior (or don't want to take any chances)? +> --[[schmonz]] + +++ b/templates/rsspage.tmpl + xmlns:atom="http://www.w3.org/2005/Atom" + @@ -263,6 +295,17 @@ every crummy rss reader on earth is going to understand this? I'd put it at about 0%; I doubt ikiwiki's own rss reader understands such a mashup. --[[Joey]] +> The validator I used (, I think) told me to. +> Pretty sure it doesn't make anything work better in the podcatchers +> I tried. Hadn't considered that it might break some readers. +> Removed. --[[schmonz]] + +ikiwiki Does this added tag provide any benefits? --[[Joey]] + +> Consistency with the Atom feed, and of course it trumpets ikiwiki +> to software and/or curious humans who inspect their feeds. The tag +> arrived only in RSS 2.0, but that's already the version we're +> claiming to be, and it's over a decade old. Seems much less risky +> than the atom namespace bits. --[[schmonz]] From ef95c1f21d3136b8756d7915c776ca85ae4c027a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 20:59:44 -0400 Subject: [PATCH 61/63] response --- doc/todo/fancypodcast.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn index 21aadf1f7..12ca43d53 100644 --- a/doc/todo/fancypodcast.mdwn +++ b/doc/todo/fancypodcast.mdwn @@ -249,6 +249,10 @@ normally no reason to do that. Why does it need an url of this form here? > way at the time. If you have a better idea, I'm happy to hear it; > if not, I'll add an explanatory comment. --[[schmonz]] +>> I would be more comfortable with this if two two different forms of url +>> you need were both generated by calling urlto. It'd be fine to call +>> it more than once. --[[Joey]] + +
    + @@ -286,6 +290,12 @@ could negatively impact eg, Planet style aggregators using ikiwiki. --[[Joey]] > really prefer the old behavior (or don't want to take any chances)? > --[[schmonz]] +>> A specific example I know of is updo.debian.net, when used with +>> rss2email. Without the author name there, one cannot see who posted +>> an item. It's worth noting that planet.debian.org does the same thing +>> with its rss feed. (That's probably what I copied.) Atom feeds may +>> not have this problem, don't know. --[[Joey]] + +++ b/templates/rsspage.tmpl + xmlns:atom="http://www.w3.org/2005/Atom" + @@ -309,3 +319,5 @@ Does this added tag provide any benefits? --[[Joey]] > arrived only in RSS 2.0, but that's already the version we're > claiming to be, and it's over a decade old. Seems much less risky > than the atom namespace bits. --[[schmonz]] + +>> Sounds ok then. --[[Joey]] From c62b3935211c199d3aff5cd65ca147ada7e2544d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 21:02:50 -0400 Subject: [PATCH 62/63] response --- doc/themes/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn index d01b7838a..5c0766a06 100644 --- a/doc/themes/discussion.mdwn +++ b/doc/themes/discussion.mdwn @@ -12,3 +12,9 @@ What is the process for merging a theme in Ikiwiki? It seems to me the [[Bootstrap theme|http://www2.tblein.eu/posts/How_to_have_a_nice_design_for_ikiwiki/]] could improve the options a lot... See the [[theme market]] for the links to the actual theme. -- [[anarcat]] + +> Step 1 is to not need two versions of page.tmpl to be maintained. +> This is, unfortunately, the reason why I have not pulled in the bootstrap +> theme yet. I recently made `` be available, +> so the page.tmpl could use that to do different things if the boostrap +> theme was enabled. --[[Joey]] From 898ceaf38ca090631a598d0b8b1d6994acc66b59 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Thu, 27 Jun 2013 00:24:08 -0400 Subject: [PATCH 63/63] response --- doc/todo/fancypodcast.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn index 12ca43d53..64af7e8a9 100644 --- a/doc/todo/fancypodcast.mdwn +++ b/doc/todo/fancypodcast.mdwn @@ -253,6 +253,9 @@ normally no reason to do that. Why does it need an url of this form here? >> you need were both generated by calling urlto. It'd be fine to call >> it more than once. --[[Joey]] +>>> Heh, it was even easier than that! (Hooray for tests.) Done. +>>> --[[schmonz]] + +
    + @@ -296,6 +299,10 @@ could negatively impact eg, Planet style aggregators using ikiwiki. --[[Joey]] >> with its rss feed. (That's probably what I copied.) Atom feeds may >> not have this problem, don't know. --[[Joey]] +>>> Okay, that's easy to reproduce. It looks like this _might_ be +>>> a simple matter of getting \[[!aggregate]] to populate author in +>>> `add_page()`. I'll see what I can figure out. --[[schmonz]] + +++ b/templates/rsspage.tmpl + xmlns:atom="http://www.w3.org/2005/Atom" +