Merge commit 'upstream/master'

[git.ikiwiki.info.git] / IkiWiki / Plugin / mirrorlist.pm

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index 216d870fda45e0e5e257ad08c403c1ce2adb0619..aab60c435d271d60568f6824bcbfe684e3853ac6 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -3,18 +3,37 @@ package IkiWiki::Plugin::mirrorlist;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

+       hook(type => "getsetup", id => "mirrorlist", call => \&getsetup);

        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);
 } # }}}
 
        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+               mirrorlist => {
+                       type => "string",
+                       example => {},
+                       description => "list of mirrors",
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+

 sub pagetemplate (@) { #{{{
        my %params=@_;
         my $template=$params{template};
        
 sub pagetemplate (@) { #{{{
        my %params=@_;
         my $template=$params{template};
        

-       $template->param(extrafooter => mirrorlist($params{page}))
-               if $template->query(name => "extrafooter");
+       if ($template->query(name => "extrafooter")) {
+               my $value=$template->param("extrafooter");
+               $value.=mirrorlist($params{page});
+               $template->param(extrafooter => $value);
+       }

 } # }}}
 
 sub mirrorlist ($) { #{{{
 } # }}}
 
 sub mirrorlist ($) { #{{{


@@ -25,7 +44,7 @@ sub mirrorlist ($) { #{{{
                join(", ",
                        map { 
                                qq{<a href="}.
                join(", ",
                        map { 
                                qq{<a href="}.

-                               $config{mirrorlist}->{$_}."/".$page.
+                               $config{mirrorlist}->{$_}."/".urlto($page, "").

                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).
                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).