Start making I2P urls work on the clearnet with i2pconv()

i2p2www/pages/site/develop/applications.html

@@ -170,7 +170,7 @@ to and from I2P. At this point in time it lacks UDP support, but UDP support
 is planned in the near future. BOB also contains several tools, such as 
 destination key generation, and verification that an address conforms to 
 I2P specifications. Up to date info and applications that use BOB can be 
-found at this <a href="http://bob.i2p/">eepsite</a>.</p>
+found at this <a href="http://{{ i2pconv('bob.i2p') }}/">eepsite</a>.</p>
 
 
 <h3>SAM, SAM V2, SAM V3</h3>
@@ -490,17 +490,16 @@ Using another programming language, SAM or BOB can be used.
 Contact us if you would like to help.
 <ul>
 <li>
-<a href="http://i2pbote.i2p/">I2P-Bote</a> - contact HungryHobo
+<a href="http://{{ i2pconv('i2pbote.i2p') }}/">I2P-Bote</a> - contact HungryHobo
 </li><li>
 <a href="http://syndie.i2p2.de/">Syndie</a>
 </li><li>
-<a href="http://www.imule.i2p/">IMule</a>
+<a href="http://{{ i2pconv('www.imule.i2p') }}/">IMule</a>
 </li><li>
-<a href="http://forum.i2p/viewforum.php?f=25">I2Phex</a> - contact Complication
+<a href="http://{{ i2pconv('forum.i2p') }}/viewforum.php?f=25">I2Phex</a> - contact Complication
-<!--<a href="http://forum.i2p2.de/viewforum.php?f=25">(outside I2P)</a> -->
 </li><li>I2PRufus - contact codevoid
 </li><li>I2P-BT - contact sponge
-</li><li><a href="http://bob.i2p">BOB</a> - contact sponge
+</li><li><a href="http://{{ i2pconv('bob.i2p') }}">BOB</a> - contact sponge
 </li></ul>
 
 <h2>Application Ideas</h2>
@@ -513,7 +512,7 @@ We use eepget to fetch lots of things reliably over i2p, and there's already an
 implementation of a sequential download manager (net.i2p.util.EepGetScheduler),
 but there isn't any sort of user interface to it.  A web based UI would be
 great.
-</li><li>Content Distribution / DHT applications - help out with <a href="http://feedspace.i2p/">feedspace</a>,
+</li><li>Content Distribution / DHT applications - help out with <a href="http://{{ i2pconv('feedspace.i2p') }}/">feedspace</a>,
 port dijjer, look for alternatives
 </li><li>Help out with <a href="http://syndie.i2p2.de/">Syndie</a> development
 </li><li>Web-based applications - The sky is the limit for hosting web-server-based

i2p2www/pages/site/docs/applications/bittorrent.html

@@ -258,17 +258,17 @@ or a list of strings alone.
 <h2>Additional Information</h2>
 <ul>
 <li>
-I2P bittorrent standards are generally discussed on <a href="http://zzz.i2p/">zzz.i2p</a>.
+I2P bittorrent standards are generally discussed on <a href="http://{{ i2pconv('zzz.i2p') }}/">zzz.i2p</a>.
 </li>
 <li>
-A chart of current tracker software capabilities is <a href="http://zzz.i2p/files/trackers.html">also available there</a>.
+A chart of current tracker software capabilities is <a href="http://{{ i2pconv('zzz.i2p') }}/files/trackers.html">also available there</a>.
 </li>
 <li>
 The
-<a href="http://forum.i2p/viewtopic.php?t=2068">I2P bittorrent FAQ</a>
+<a href="http://{{ i2pconv('forum.i2p') }}/viewtopic.php?t=2068">I2P bittorrent FAQ</a>
 </li>
 <li>
-<a href="http://zzz.i2p/topics/812">DHT on I2P discussion</a>
+<a href="http://{{ i2pconv('zzz.i2p') }}/topics/812">DHT on I2P discussion</a>
 </li>
 </ul>
 

i2p2www/pages/site/docs/index.html

@@ -14,7 +14,7 @@ The interface between applications and the router is the I2CP (I2P Control Proto
 </p><p>
 The I2P Project is committed to maintaining accurate, current documentation.
 If you find any inaccuracies in the documents linked below, please
-<a href="http://trac.i2p2.de/report/1">enter a ticket identifying the problem</a>.
+<a href="http://{{ i2pconv('trac.i2p2.i2p') }}/report/1">enter a ticket identifying the problem</a>.
 </p>
 
 <h2>Index to Technical Documentation</h2>
@@ -191,35 +191,35 @@ Time synchronization and NTP
 Note: always verify that javadocs are current by checking the release number.
 </li><li>
 Javadocs inside I2P:
-<a href="http://i2p-javadocs.i2p">Server 1</a>
+<a href="http://{{ i2pconv('i2p-javadocs.i2p') }}">Server 1</a>
-<a href="http://i2pdocs.str4d.i2p/i2p.i2p/javadoc/">Server 2</a>
+<a href="http://{{ i2pconv('i2pdocs.str4d.i2p') }}/i2p.i2p/javadoc/">Server 2</a>
-<a href="http://echelon.i2p/javadoc/">Server 3</a>
+<a href="http://{{ i2pconv('echelon.i2p') }}/javadoc/">Server 3</a>
 <!--
-  <a href="http://docs.i2p2.i2p/javadoc/">Server 4 - out of date, incomplete</a>
+  <a href="http://{{ i2pconv('docs.i2p2.i2p') }}/javadoc/">Server 4 - out of date, incomplete</a>
 -->
 Note: always verify that javadocs are current by checking the release number.
 </li><li>
 <a href="ports.html">Ports used by I2P</a>
 </li><li>
-<a href="http://update.killyourtv.i2p/mtn/">Automatic updates to development builds inside I2P</a>
+<a href="http://{{ i2pconv('update.killyourtv.i2p') }}/mtn/">Automatic updates to development builds inside I2P</a>
 </li><li>
 <a href="manualwrapper.html">Updating the wrapper manually</a>
 </li><li>
-<a href="http://forum.i2p">User forum (I2P internal)</a>
+<a href="http://{{ i2pconv('forum.i2p') }}">User forum</a>
 </li><li>
-<a href="http://zzz.i2p/">Developer forum inside I2P</a>
+<a href="http://{{ i2pconv('zzz.i2p') }}/">Developer forum inside I2P</a>
 </li><li>
-<a href="http://trac.i2p2.de/report/1">Bug tracker</a>
+<a href="http://{{ i2pconv('trac.i2p2.i2p') }}/report/1">Bug tracker</a>
 </li><li>
-<a href="http://stats.i2p/cgi-bin/viewmtn/">Viewmtn inside I2P</a>.
+<a href="http://{{ i2pconv('stats.i2p') }}/cgi-bin/viewmtn/">Viewmtn inside I2P</a>.
 </li><li>
 <a href="https://github.com/i2p/i2p.i2p">I2P Source exported to GitHub</a>
 </li><li>
-<a href="http://git.repo.i2p/w/i2p.i2p.git">I2P Source Git Repo inside I2P</a>
+<a href="http://{{ i2pconv('git.repo.i2p') }}/w/i2p.i2p.git">I2P Source Git Repo inside I2P</a>
 </li><li>
 <a href="https://www.transifex.net/projects/p/I2P/">Source translation at Transifex</a>
 </li><li>
-<a href="http://trac.i2p2.de/09roadmap">0.9 roadmap wiki</a> (not current)
+<a href="http://{{ i2pconv('trac.i2p2.i2p') }}/09roadmap">0.9 roadmap wiki</a> (not current)
 </li><li>
 <a href="{{ site_url('volunteer/roadmap') }}">Old roadmap</a> (not current)
 </li><li>

i2p2www/pages/site/volunteer/bounties/index.html

@@ -80,7 +80,7 @@ etc), and the like.</p>
 <table border="1">
  <tr><td><p><b>Name</b></p></td><td><p><b>Status</b></p></td><td><p><b>Judge</b></p></td><td><p><b>Dev <sup>*</sup></b></p></td><td><p><b>Bounty</b></p></td></tr>
  <tr>
-  <td><p><b><a href="http://forum.i2p/viewtopic.php?t=1136">Bundling bounties</a></b></p></td>
+  <td><p><b><a href="http://{{ i2pconv('forum.i2p') }}/viewtopic.php?t=1136">Bundling bounties</a></b></p></td>
   <td><p>Proposed</p></td>
   <td><p>jrandom</p></td>
   <td><p>[vacant]</p></td>
@@ -104,7 +104,7 @@ etc), and the like.</p>
  </tr> 
  <tr>
   <td><p><b><a href="{{ site_url('volunteer/bounties/datastore') }}">Datastore over I2P</a></b></p></td>
-  <td><p><a href="http://killyourtv.i2p/tahoe-lafs/install/">CLAIMED</a> for 700 &euro;</p></td>
+  <td><p><a href="http://{{ i2pconv('killyourtv.i2p') }}/tahoe-lafs/install/">CLAIMED</a> for 700 &euro;</p></td>
   <td><p>duck, smeghead</p></td>
  </tr>
  <tr>
@@ -114,7 +114,7 @@ etc), and the like.</p>
  </tr>
  <tr>
   <td><p><b>Swarming file transfer</b></p></td>
-  <td><p><a href="http://i2p-bt.postman.i2p">CLAIMED</a> for &euro;250 EUR</p></td>
+  <td><p><a href="http://{{ i2pconv('i2p-bt.postman.i2p') }}">CLAIMED</a> for &euro;250 EUR</p></td>
   <td><p>duck, ragnarok, dinoman, connelly, drwoo</p></td>
  </tr>
  <tr>
@@ -134,7 +134,7 @@ etc), and the like.</p>
  </tr>
  <tr>
   <td><p><b><a href="http://gcc.gnu.org/java/">GCJ</a> support</b></p></td>
-  <td><p><a href="https://trac.i2p2.de/browser/Makefile.gcj">Claimed</a></p></td>
+  <td><p><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/browser/Makefile.gcj">Claimed</a></p></td>
   <td><p>jrandom</p></td>
  </tr>
 </table>