From a3d0129dcdb8521ea4453cfb2f2c05059aba56ee Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 21 Apr 2013 23:35:09 +0000
Subject: [PATCH] Bugfix: index mirrors from 1 (mirror=0 is interpreted as
 False)

---
 i2p2www/downloads.py                |  2 +-
 i2p2www/pages/downloads/list.html   | 10 +++++-----
 i2p2www/pages/downloads/select.html |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py
index a8fddd4a..79c6fb9f 100644
--- a/i2p2www/downloads.py
+++ b/i2p2www/downloads.py
@@ -65,5 +65,5 @@ def downloads_redirect(protocol, file, mirror):
         'file': file,
         }
     if mirror:
-        return redirect(mirrors[mirror]['url'] % data)
+        return redirect(mirrors[mirror-1]['url'] % data)
     return redirect(mirrors[randint(0, len(mirrors) - 1)]['url'] % data)
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index c8211cd0..bbb7d6a0 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -23,7 +23,7 @@ or type <tt>java -version</tt> at your command prompt.
 <div class="package">
   <h1>Windows</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pinstall_%s_windows.exe'), mirror=0) }}">i2pinstall_{{ ver() }}_windows.exe</a> (Google Code)
+    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pinstall_%s_windows.exe'), mirror=1) }}">i2pinstall_{{ ver() }}_windows.exe</a> (Google Code)
     (<a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s_windows.exe')) }}">{{ _('select alternate link') }}</a>)
     <div class="sig">
       (SHA256 <code>
@@ -41,7 +41,7 @@ d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
 <div class="package">
   <h1>Mac OS X</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pinstall_%s.jar'), mirror=0) }}">i2pinstall_{{ ver() }}.jar</a> (Google Code)
+    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pinstall_%s.jar'), mirror=1) }}">i2pinstall_{{ ver() }}.jar</a> (Google Code)
     (<a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s.jar')) }}">{{ _('select alternate link') }}</a>)
     <div class="sig">
     (SHA256 <code>
@@ -69,7 +69,7 @@ af251596e034b751dc17b73bd35254b94f92d4a3121a6e96479c45c4d846ab30
 <div class="package">
   <h1>GNU/Linux / BSD / Solaris</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pinstall_%s.jar'), mirror=0) }}">i2pinstall_{{ ver() }}.jar</a> (Google Code)
+    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pinstall_%s.jar'), mirror=1) }}">i2pinstall_{{ ver() }}.jar</a> (Google Code)
     (<a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s.jar')) }}">{{ _('select alternate link') }}</a>)
     <div class="sig">
       (SHA256 <code>
@@ -131,7 +131,7 @@ af251596e034b751dc17b73bd35254b94f92d4a3121a6e96479c45c4d846ab30
 <div class="package">
   <h1>{{ _('Source package') }}</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2psource_%s.tar.bz2'), mirror=0) }}">i2psource_{{ ver() }}.tar.bz2</a> (Google Code)
+    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2psource_%s.tar.bz2'), mirror=1) }}">i2psource_{{ ver() }}.tar.bz2</a> (Google Code)
     (<a href="{{ get_url('downloads_select', file=ver('i2psource_%s.tar.bz2')) }}">{{ _('select alternate link') }}</a>)
     <div class="sig">
       (SHA256 <code>
@@ -257,7 +257,7 @@ receive the release.
 <div class="package">
   <h1>{{ _('Manual updates') }}</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pupdate_%s.zip'), mirror=0) }}">i2pupdate_{{ ver() }}.zip</a> (Google Code)
+    <a href="{{ url_for('downloads_redirect', protocol='http', file=ver('i2pupdate_%s.zip'), mirror=1) }}">i2pupdate_{{ ver() }}.zip</a> (Google Code)
     (<a href="{{ get_url('downloads_select', file=ver('i2pupdate_%s.zip')) }}">{{ _('select alternate link') }}</a>)
     <div class="sig">
       (SHA256 <code>
diff --git a/i2p2www/pages/downloads/select.html b/i2p2www/pages/downloads/select.html
index 4d7a60f8..6811dcd3 100644
--- a/i2p2www/pages/downloads/select.html
+++ b/i2p2www/pages/downloads/select.html
@@ -9,7 +9,7 @@
   <ul>
     <li><a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file) }}">{{ _('Any mirror') }}</a></li>
     {% for mirror in protocol.mirrors -%}
-    <li><img src="{{ url_for('static', filename='images/flags/'+mirror.country+'.png') }}" />&nbsp;{% if mirror.org_url %}<a href="{{ mirror.org_url }}">{% endif %}{{ mirror.org }}{% if mirror.org_url %}</a>{% endif %} <a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file, mirror=loop.index-1) }}">[{{ _('Download') }}]</a></li>
+    <li><img src="{{ url_for('static', filename='images/flags/'+mirror.country+'.png') }}" />&nbsp;{% if mirror.org_url %}<a href="{{ mirror.org_url }}">{% endif %}{{ mirror.org }}{% if mirror.org_url %}</a>{% endif %} <a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file, mirror=loop.index) }}">[{{ _('Download') }}]</a></li>
     {%- endfor %}
   </ul>
 </div>