Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index d0a6107efe8baa6cadd540eb710f5f8f422c6778..5afd9ec1a8aca4b3ca2275dbf5d8dfaf77500690 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -15,6 +15,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 1,
                plugin => {
                        safe => 1,
                        rebuild => 1,

+                       section => "web",

                },
                mirrorlist => {
                        type => "string",
                },
                mirrorlist => {
                        type => "string",


@@ -23,6 +24,19 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 1,
                },
                        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 (@) {


@@ -39,17 +53,19 @@ sub pagetemplate (@) {
 
 sub mirrorlist ($) {
        my $page=shift;
 
 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="}.
                (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}}
                ).
                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).

-               "</p>";
+               ($config{html5} ? '</nav>' : '</div>');

 }
 
 1
 }
 
 1