* meta: Add redir support, based on a patch by Thomas Schwinge.

master
Joey Hess 2007-12-08 14:58:29 -05:00
parent 655d7925c6
commit 2c78477387
4 changed files with 49 additions and 20 deletions

View File

@ -13,6 +13,7 @@ my %author;
my %authorurl; my %authorurl;
my %license; my %license;
my %copyright; my %copyright;
my %redirected;
sub import { #{{{ sub import { #{{{
hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1); hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
@ -59,7 +60,9 @@ sub preprocess (@) { #{{{
if ($key eq 'link') { if ($key eq 'link') {
if (%params) { if (%params) {
$meta{$page}.=scrub("<link href=\"".encode_entities($value)."\" ". $meta{$page}.=scrub("<link href=\"".encode_entities($value)."\" ".
join(" ", map { encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\"" } keys %params). join(" ", map {
encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
} keys %params).
" />\n"); " />\n");
} }
else { else {
@ -67,6 +70,32 @@ sub preprocess (@) { #{{{
push @{$links{$page}}, $value; push @{$links{$page}}, $value;
} }
} }
elsif ($key eq 'redir') {
$redirected{$page}=1;
my $safe=0;
if ($value =~ /^$config{wiki_link_regexp}$/) {
my $link=bestlink($page, $value);
if (! length $link) {
return "[[meta ".gettext("redir page not found")."]]";
}
if ($redirected{$link}) {
# TODO this is a cheap way of avoiding
# redir cycles, but it is really too strict.
return "[[meta ".gettext("redir to page that itself redirs is not allowed")."]]";
}
$value=urlto($link, $destpage);
$safe=1;
}
else {
$value=encode_entities($value);
}
my $delay=int(exists $params{delay} ? $params{delay} : 0);
my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\">";
if (! $safe) {
$redir=scrub($redir);
}
$meta{$page}.=$redir;
}
elsif ($key eq 'title') { elsif ($key eq 'title') {
$title{$page}=HTML::Entities::encode_numeric($value); $title{$page}=HTML::Entities::encode_numeric($value);
} }
@ -111,25 +140,6 @@ sub preprocess (@) { #{{{
$meta{$page}.="<link rel=\"copyright\" href=\"#page_copyright\" />\n"; $meta{$page}.="<link rel=\"copyright\" href=\"#page_copyright\" />\n";
$copyright{$page}=$value; $copyright{$page}=$value;
} }
elsif ($key eq 'forward') {
my $delay=0;
my $dest_url;
my $text;
if (exists $params{delay}) {
$delay=$params{delay};
}
# Is this a wikilink?
if ($value =~ /^\[\[(.*)\]\]$/) {
$text=htmllink($page, $destpage, $1);
$dest_url=urlto(bestlink($page, $1), $destpage);
} else {
$text="<a href=\"$dest_url\">$dest_url</a>";
$dest_url=$value;
}
# TODO. $meta{$page}.=scrub("<meta http-equiv=\"refresh\" content=\"$delay; URL=$dest_url\">");
$meta{$page}.="<meta http-equiv=\"refresh\" content=\"$delay; URL=$dest_url\">";
return "You are being forwarded to $text.";
}
else { else {
$meta{$page}.=scrub("<meta name=\"".encode_entities($key). $meta{$page}.=scrub("<meta name=\"".encode_entities($key).
"\" content=\"".encode_entities($value)."\" />\n"); "\" content=\"".encode_entities($value)."\" />\n");

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
ikiwiki (2.16) UNRELEASED; urgency=low ikiwiki (2.16) UNRELEASED; urgency=low
* Remove .otl file from sandbox to avoid build ugliness. Closes: #454181 * Remove .otl file from sandbox to avoid build ugliness. Closes: #454181
* meta: Add redir support, based on a patch by Thomas Schwinge.
-- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500 -- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500

View File

@ -30,6 +30,22 @@ You can use any field names you like, but here are some predefined ones:
However, this latter syntax won't be allowed if the [[htmlscrubber]] is However, this latter syntax won't be allowed if the [[htmlscrubber]] is
enabled, since it can be used to insert unsafe content. enabled, since it can be used to insert unsafe content.
* redir
Causes the page to redirect to another page in the wiki.
\[[meta redir=otherpage]]
Optionally, a delay (in seconds) can be specified. The default is to
redirect without delay.
It can also be used to redirect to an external url. For example:
\[[meta redir="http://example.com/"]]
However, this latter syntax won't be allowed if the [[htmlscrubber]] is
enabled, since it can be used to insert unsafe content.
* title * title
Overrides the title of the page, which is generally the same as the Overrides the title of the page, which is generally the same as the

View File

@ -1,6 +1,8 @@
Here is a patch [[tag patch]] to add a *forward*ing functionality Here is a patch [[tag patch]] to add a *forward*ing functionality
to the [[`meta`_plugin|plugins/meta]]. to the [[`meta`_plugin|plugins/meta]].
> [[done]], with some changes --[[Joey]]
Find the most recent version at Find the most recent version at
<http://www.schwinge.homeip.net/~thomas/tmp/meta_forward.patch>. <http://www.schwinge.homeip.net/~thomas/tmp/meta_forward.patch>.