urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add support for links of the form [[../foo]], this links to the page 

* Fix code to make absolute urls for rss feeds, was missing some urls.
* Fix double-escaping of html entities in titles etc in rss feeds
  that occured if escaped characters were present in the page filename.
master
joey 2006-12-21 21:52:06 +00:00
parent a00bc110b1
commit 31d0021e9c
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki.pm
View File

@ -327,10 +327,18 @@ sub isinlinableimage ($) { #{{{
$file=~/\.(png|gif|jpg|jpeg)$/i; $file=~/\.(png|gif|jpg|jpeg)$/i;
} #}}} } #}}}
sub pagetitle ($) { #{{{ sub pagetitle ($;$) { #{{{
my $page=shift; my $page=shift;
$page=~s/__(\d+)__/&#$1;/g; my $unescaped=shift;
if ($unescaped) {
$page=~s/__(\d+)__/chr($1)/eg;
}
else {
$page=~s/__(\d+)__/&#$1;/g;
}
$page=~y/_/ /; $page=~y/_/ /;
return $page; return $page;
} #}}} } #}}}

13
IkiWiki/Plugin/inline.pm
View File

@ -37,7 +37,6 @@ sub checkconfig () { #{{{
error("Must specify url to wiki with --url when using --rss or --atom"); error("Must specify url to wiki with --url when using --rss or --atom");
} }
if ($config{rss}) { if ($config{rss}) {
print STDERR "!!\n";
push @{$config{wiki_file_prune_regexps}}, qr/\.rss$/; push @{$config{wiki_file_prune_regexps}}, qr/\.rss$/;
} }
if ($config{atom}) { if ($config{atom}) {
@ -265,8 +264,8 @@ sub absolute_urls ($$) { #{{{
$url=~s/[^\/]+$//; $url=~s/[^\/]+$//;
$content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(#[^"]+)"/$1 href="$baseurl$2"/ig; $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(#[^"]+)"/$1 href="$baseurl$2"/ig;
$content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(?![^:]+:\/\/)([^"]+)"/$1 href="$url$2"/ig; $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/ig;
$content=~s/(<img(?:\s+(?:class|id)="?\w+"?)?)\s+src="(?![^:]+:\/\/)([^"]+)"/$1 src="$url$2"/ig; $content=~s/(<img(?:\s+(?:class|id)="?\w+"?)?)\s+src="(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/ig;
return $content; return $content;
} #}}} } #}}}
@ -300,7 +299,7 @@ sub genfeed ($$$$@) { #{{{
my $pcontent = absolute_urls(get_inline_content($p, $page), $url); my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
$itemtemplate->param( $itemtemplate->param(
title => pagetitle(basename($p)), title => pagetitle(basename($p), 1),
url => $u, url => $u,
permalink => $u, permalink => $u,
date_822 => date_822($pagectime{$p}), date_822 => date_822($pagectime{$p}),
@ -344,7 +343,7 @@ sub genfeed ($$$$@) { #{{{
my $template=template($feedtype."page.tmpl", blind_cache => 1); my $template=template($feedtype."page.tmpl", blind_cache => 1);
$template->param( $template->param(
title => $page ne "index" ? pagetitle($page) : $config{wikiname}, title => $page ne "index" ? pagetitle($page, 1) : $config{wikiname},
wikiname => $config{wikiname}, wikiname => $config{wikiname},
pageurl => $url, pageurl => $url,
content => $content, content => $content,
@ -384,14 +383,14 @@ sub pingurl (@) { #{{{
IkiWiki::unlockwiki(); IkiWiki::unlockwiki();
foreach my $page (keys %toping) { foreach my $page (keys %toping) {
my $title=pagetitle(basename($page)); my $title=pagetitle(basename($page), 0);
my $url="$config{url}/".htmlpage($page); my $url="$config{url}/".htmlpage($page);
foreach my $pingurl (@{$config{pingurl}}) { foreach my $pingurl (@{$config{pingurl}}) {
debug("Pinging $pingurl for $page"); debug("Pinging $pingurl for $page");
eval { eval {
my $client = RPC::XML::Client->new($pingurl); my $client = RPC::XML::Client->new($pingurl);
my $req = RPC::XML::request->new('weblogUpdates.ping', my $req = RPC::XML::request->new('weblogUpdates.ping',
$title, $url); $title, $url);
my $res = $client->send_request($req); my $res = $client->send_request($req);
if (! ref $res) { if (! ref $res) {
debug("Did not receive response to ping"); debug("Did not receive response to ping");

7
debian/changelog vendored
View File

@ -18,11 +18,14 @@ ikiwiki (1.36) UNRELEASED; urgency=low
like, if you want. like, if you want.
* Patch from Emanuele Aina to fix modification time code in mercurual * Patch from Emanuele Aina to fix modification time code in mercurual
backend. backend.
* Add support for links of the form [[../foo]], this links to the page * Add support for links of the form [[../foo]], this links to the page
foo a level higher in the directory hierarchy than the one it would link foo a level higher in the directory hierarchy than the one it would link
to by default. to by default.
* Fix code to make absolute urls for rss feeds, was missing some urls.
* Fix double-escaping of html entities in titles etc in rss feeds
that occured if escaped characters were present in the page filename.
-- Joey Hess <joeyh@debian.org> Thu, 21 Dec 2006 15:10:03 -0500 -- Joey Hess <joeyh@debian.org> Thu, 21 Dec 2006 16:28:54 -0500
ikiwiki (1.35) unstable; urgency=low ikiwiki (1.35) unstable; urgency=low