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

factored out an urlabs from aggregate and cgi

master
Joey Hess 2011-01-05 16:18:25 -04:00
parent 49928906b0
commit c91b39fdb5
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki.pm
View File

@ -1068,6 +1068,14 @@ sub baseurl (;$) {
return $page;
}
sub urlabs ($$) {
my $url=shift;
my $urlbase=shift;
eval q{use URI};
URI->new_abs($url, $urlbase)->as_string;
}
sub abs2rel ($$) {
# Work around very innefficient behavior in File::Spec if abs2rel
# is passed two relative paths. It's much faster if paths are

14
IkiWiki/CGI.pm
View File

@ -59,26 +59,16 @@ sub showform_preview ($$$$;@) {
my %params=@_;
# The base url needs to be a full URL, and urlto may return a path.
my $baseurl = absurl(urlto($params{page}), $cgi);
my $baseurl = urlabs(urlto($params{page}), $cgi->url);
showform($form, $buttons, $session, $cgi, @_,
forcebaseurl => $baseurl);
}
# Forces a partial url (path only) to absolute, using the same
# URL scheme as the CGI. Full URLs are left unchanged.
sub absurl ($$) {
my $partialurl=shift;
my $q=shift;
eval q{use URI};
return URI->new_abs($partialurl, $q->url);
}
sub redirect ($$) {
my $q=shift;
eval q{use URI};
my $url=URI->new(absurl(shift, $q));
my $url=URI->new(urlabs(shift, $q->url));
if (! $config{w3mmode}) {
print $q->redirect($url);
}

12
IkiWiki/Plugin/aggregate.pm
View File

@ -8,7 +8,6 @@ use IkiWiki 3.00;
use HTML::Parser;
use HTML::Tagset;
use HTML::Entities;
use URI;
use open qw{:utf8 :std};
my %feeds;
@ -660,7 +659,7 @@ sub add_page (@) {
$template->param(url => $feed->{url});
$template->param(copyright => $params{copyright})
if defined $params{copyright} && length $params{copyright};
$template->param(permalink => urlabs($params{link}, $feed->{feedurl}))
$template->param(permalink => IkiWiki::urlabs($params{link}, $feed->{feedurl}))
if defined $params{link};
if (ref $feed->{tags}) {
$template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
@ -688,13 +687,6 @@ sub wikiescape ($) {
return encode_entities(shift, '\[\]');
}
sub urlabs ($$) {
my $url=shift;
my $urlbase=shift;
URI->new_abs($url, $urlbase)->as_string;
}
sub htmlabs ($$) {
# Convert links in html from relative to absolute.
# Note that this is a heuristic, which is not specified by the rss
@ -720,7 +712,7 @@ sub htmlabs ($$) {
next unless $v_offset; # 0 v_offset means no value
my $v = substr($text, $v_offset, $v_len);
$v =~ s/^([\'\"])(.*)\1$/$2/;
my $new_v=urlabs($v, $urlbase);
my $new_v=IkiWiki::urlabs($v, $urlbase);
$new_v =~ s/\"/"/g; # since we quote with ""
substr($text, $v_offset, $v_len) = qq("$new_v");
}