IkiWiki::Plugin::openid: as a precaution, do not call non-coderefs

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

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index aab60c435d271d60568f6824bcbfe684e3853ac6..b7e53248500d8a31337e582e81d24a5870ebb074 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -3,18 +3,19 @@ package IkiWiki::Plugin::mirrorlist;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "mirrorlist", call => \&getsetup);
        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return
                plugin => {
                        safe => 1,
                        rebuild => 1,
+                       section => "web",
                },
                mirrorlist => {
                        type => "string",
@@ -23,32 +24,48 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 1,
                },
-} #}}}
+               mirrorlist_use_cgi => {
+                       type => 'boolean',
+                       example => 1,
+                       description => "generate links that point to the mirrors' ikiwiki CGI",
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub checkconfig () {
+       if (! defined $config{mirrorlist_use_cgi}) {
+               $config{mirrorlist_use_cgi}=0;
+       }
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
        my %params=@_;
         my $template=$params{template};
        
-       if ($template->query(name => "extrafooter")) {
+       if ($template->query(name => "extrafooter") &&
+           keys %{$config{mirrorlist}} > 0) {
                my $value=$template->param("extrafooter");
                $value.=mirrorlist($params{page});
                $template->param(extrafooter => $value);
        }
-} # }}}
+}
 
-sub mirrorlist ($) { #{{{
+sub mirrorlist ($) {
        my $page=shift;
-       return "<p>".
+       return ($config{html5} ? '<nav id="mirrorlist">' : '<div>').
                (keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")).
                ": ".
                join(", ",
                        map { 
                                qq{<a href="}.
-                               $config{mirrorlist}->{$_}."/".urlto($page, "").
+                               ( $config{mirrorlist_use_cgi} ?
+                                 $config{mirrorlist}->{$_}."?do=goto&page=$page" :
+                                 $config{mirrorlist}->{$_}."/".urlto($page, "") ).
                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).
-               "</p>";
-} # }}}
+               ($config{html5} ? '</nav>' : '</div>');
+}
 
 1