img: stop ImageMagick trying to be clever if filenames contain a colon

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

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index eb273561db4cec5769a7b623f7377bbcd8cea1d8..5afd9ec1a8aca4b3ca2275dbf5d8dfaf77500690 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -3,45 +3,69 @@ 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",
-                       default => {},
+                       example => {},
                        description => "list of mirrors",
                        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};
        
-       $template->param(extrafooter => mirrorlist($params{page}))
-               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' : '<div').' id="mirrorlist">'.
                (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