* SusiDNS: Set target=_top in all external links to break out of console iframe

apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java

@@ -187,7 +187,7 @@ public class AddressBean
 	public String getSource() {
 		String rv = getProp("s");
                 if (rv.startsWith("http://"))
-                    rv = "<a href=\"" + rv + "\">" + rv + "</a>";
+                    rv = "<a href=\"" + rv + "\" target=\"_top\">" + rv + "</a>";
 		return rv;
 	}
 

apps/susidns/src/jsp/addressbook.jsp

@@ -155,9 +155,9 @@ ${book.loadBookMessages}
 <c:if test="${book.master || book.router || book.published || book.private}">
 <td class="checkbox"><input type="checkbox" name="checked" value="${addr.name}" title="<%=intl._("Mark for deletion")%>"></td>
 </c:if>
-<td class="names"><a href="http://${addr.name}/">${addr.displayName}</a>
+<td class="names"><a href="http://${addr.name}/" target="_top">${addr.displayName}</a>
 </td><td class="names">
-<span class="addrhlpr"><a href="http://${addr.b32}/" title="<%=intl._("Base 32 address")%>">b32</a></span>
+<span class="addrhlpr"><a href="http://${addr.b32}/" target="_top" title="<%=intl._("Base 32 address")%>">b32</a></span>
 </td><td class="names">
 <span class="addrhlpr"><a href="details?h=${addr.name}" title="<%=intl._("More information on this entry")%>"><%=intl._("details")%></a></span>
 </td>
@@ -204,7 +204,7 @@ ${book.loadBookMessages}
 
 <div id="footer">
 <hr>
-<p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005</p>
+<p class="footer">susidns v${version.version} &copy; <a href="${version.url}" target="_top">susi</a> 2005</p>
 </div>
 </div>
 </body>

apps/susidns/src/jsp/config.jsp

@@ -137,7 +137,7 @@
 </div>
 <div id="footer">
 <hr>
-<p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005 </p>
+<p class="footer">susidns v${version.version} &copy; <a href="${version.url}" target="_top">susi</a> 2005 </p>
 </div>
 </div>
 </body>

apps/susidns/src/jsp/details.jsp

@@ -83,25 +83,25 @@
 <table class="book" cellspacing="0" cellpadding="5">
 <tr class="list${book.trClass}">
 <td><%=intl._("Host Name")%></td>
-<td><a href="http://<%=addr.getName()%>/"><%=addr.getDisplayName()%></a></td>
+<td><a href="http://<%=addr.getName()%>/" target="_top"><%=addr.getDisplayName()%></a></td>
 </tr><tr class="list${book.trClass}">
 <%
     if (addr.isIDN()) {
 %>
 <td><%=intl._("Encoded Name")%></td>
-<td><a href="http://<%=addr.getName()%>/"><%=addr.getName()%></a></td>
+<td><a href="http://<%=addr.getName()%>/" target="_top"><%=addr.getName()%></a></td>
 </tr><tr class="list${book.trClass}">
 <%
     }
 %>
 <td><%=intl._("Base 32 Address")%></td>
-<td><a href="http://<%=b32%>/"><%=b32%></a></td>
+<td><a href="http://<%=b32%>/" target="_top"><%=b32%></a></td>
 </tr><tr class="list${book.trClass}">
 <td><%=intl._("Base 64 Hash")%></td>
 <td><%=addr.getB64()%></td>
 </tr><tr class="list${book.trClass}">
 <td><%=intl._("Address Helper")%></td>
-<td><a href="http://<%=addr.getName()%>/?i2paddresshelper=<%=addr.getDestination()%>"><%=intl._("link")%></a></td>
+<td><a href="http://<%=addr.getName()%>/?i2paddresshelper=<%=addr.getDestination()%>" target="_top"><%=intl._("link")%></a></td>
 </tr><tr class="list${book.trClass}">
 <td><%=intl._("Public Key")%></td>
 <td><%=intl._("ElGamal 2048 bit")%></td>
@@ -145,7 +145,7 @@
 %>
 <div id="footer">
 <hr>
-<p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005</p>
+<p class="footer">susidns v${version.version} &copy; <a href="${version.url}" target="_top">susi</a> 2005</p>
 </div>
 </div>
 </body>

apps/susidns/src/jsp/index.jsp

@@ -74,7 +74,7 @@
 <%=intl._("Subscribing to additional sites is easy, just add them to your <a href=\"subscriptions\">subscriptions</a> file.")%>
 </p>
 <p>
-<%=intl._("For more information on naming in I2P, see <a href=\"http://www.i2p2.i2p/naming.html\">the overview on www.i2p2.i2p</a>.")%>
+<%=intl._("For more information on naming in I2P, see <a href=\"http://www.i2p2.i2p/naming.html\" target=\"_top\">the overview on www.i2p2.i2p</a>.")%>
 </p>
 <h3><%=intl._("How does the addressbook application work?")%></h3>
 <p>
@@ -90,7 +90,7 @@
 </div>
 <div id="footer">
 <hr>
-<p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005</p>
+<p class="footer">susidns v${version.version} &copy; <a href="${version.url}" target="_top">susi</a> 2005</p>
 </div>
 </div>
 </body>

apps/susidns/src/jsp/subscriptions.jsp

@@ -83,12 +83,12 @@
 <%=intl._("Those URLs refer to published hosts.txt files.")%>
 <%=intl._("The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently.")%>
 <%=intl._("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%>
-<a href="http://www.i2p2.i2p/faq.html#subscriptions"><%=intl._("See the FAQ for a list of subscription URLs.")%></a>
+<a href="http://www.i2p2.i2p/faq.html#subscriptions" target="_top"><%=intl._("See the FAQ for a list of subscription URLs.")%></a>
 </p>
 </div>
 <div id="footer">
 <hr>
-<p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005</p>
+<p class="footer">susidns v${version.version} &copy; <a href="${version.url}" target="_top">susi</a> 2005</p>
 </div>
 </div>
 </body>

history.txt

@@ -1,5 +1,7 @@
 2013-04-17 zzz
  * Console: Better handling of missing font for graphing (ticket #915)
+ * i2ptunnel: Fix default form action (ticket #882)
+ * SusiDNS: Set target=_top in all external links to break out of console iframe
  * Systray: Better detection of 64-bit Windows (tickets #756, #912)
 
 2013-04-16 zzz

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";