From 252f9ccee29ad09f8736e10dd8e5d6b1100c7bdc Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 30 Jan 2012 22:04:30 +0000
Subject: [PATCH]   * SusiDNS: Reduce listings to 50/page

---
 .../src/i2p/susi/dns/AddressbookBean.java     |  2 +-
 apps/susidns/src/jsp/addressbook.jsp          | 74 +++++++++----------
 apps/susidns/src/jsp/details.jsp              | 10 +--
 history.txt                                   |  5 ++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 5 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
index b60fb25f7..b3404e339 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
@@ -50,7 +50,7 @@ public class AddressbookBean
 	private int trClass;
 	protected final LinkedList<String> deletionMarks;
 	protected static final Comparator<AddressBean> sorter;
-	private static final int DISPLAY_SIZE=100;
+	private static final int DISPLAY_SIZE = 50;
 
 	static {
 		sorter = new AddressByNameSorter();
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 044c4c5a1..4736a4dc0 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -55,10 +55,10 @@
 <div id="navi">
 <p>
 <%=intl._("Address books")%>:
-<a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> |
-<a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> |
-<a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> |
-<a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> *
+<a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("private")%></a> |
+<a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("master")%></a> |
+<a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("router")%></a> |
+<a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("published")%></a> *
 <a href="subscriptions"><%=intl._("Subscriptions")%></a> *
 <a href="config"><%=intl._("Configuration")%></a> *
 <a href="index"><%=intl._("Overview")%></a>
@@ -77,45 +77,45 @@ ${book.loadBookMessages}
 <c:if test="${book.notEmpty}">
 <div id="filter">
 <p><%=intl._("Filter")%>:
-<a href="addressbook?filter=a&amp;begin=0&amp;end=99">a</a>
-<a href="addressbook?filter=b&amp;begin=0&amp;end=99">b</a>
-<a href="addressbook?filter=c&amp;begin=0&amp;end=99">c</a> 
-<a href="addressbook?filter=d&amp;begin=0&amp;end=99">d</a>
-<a href="addressbook?filter=e&amp;begin=0&amp;end=99">e</a>
-<a href="addressbook?filter=f&amp;begin=0&amp;end=99">f</a>
-<a href="addressbook?filter=g&amp;begin=0&amp;end=99">g</a>
-<a href="addressbook?filter=h&amp;begin=0&amp;end=99">h</a>
-<a href="addressbook?filter=i&amp;begin=0&amp;end=99">i</a>
-<a href="addressbook?filter=j&amp;begin=0&amp;end=99">j</a>
-<a href="addressbook?filter=k&amp;begin=0&amp;end=99">k</a>
-<a href="addressbook?filter=l&amp;begin=0&amp;end=99">l</a>
-<a href="addressbook?filter=m&amp;begin=0&amp;end=99">m</a>
-<a href="addressbook?filter=n&amp;begin=0&amp;end=99">n</a>
-<a href="addressbook?filter=o&amp;begin=0&amp;end=99">o</a>
-<a href="addressbook?filter=p&amp;begin=0&amp;end=99">p</a>
-<a href="addressbook?filter=q&amp;begin=0&amp;end=99">q</a>
-<a href="addressbook?filter=r&amp;begin=0&amp;end=99">r</a>
-<a href="addressbook?filter=s&amp;begin=0&amp;end=99">s</a>
-<a href="addressbook?filter=t&amp;begin=0&amp;end=99">t</a>
-<a href="addressbook?filter=u&amp;begin=0&amp;end=99">u</a>
-<a href="addressbook?filter=v&amp;begin=0&amp;end=99">v</a>
-<a href="addressbook?filter=w&amp;begin=0&amp;end=99">w</a>
-<a href="addressbook?filter=x&amp;begin=0&amp;end=99">x</a>
-<a href="addressbook?filter=y&amp;begin=0&amp;end=99">y</a>
-<a href="addressbook?filter=z&amp;begin=0&amp;end=99">z</a>
-<a href="addressbook?filter=0-9&amp;begin=0&amp;end=99">0-9</a>
-<a href="addressbook?filter=xn--&amp;begin=0&amp;end=99"><%=intl._("other")%></a>
-<a href="addressbook?filter=none&amp;begin=0&amp;end=99"><%=intl._("all")%></a></p>
+<a href="addressbook?filter=a&amp;begin=0&amp;end=49">a</a>
+<a href="addressbook?filter=b&amp;begin=0&amp;end=49">b</a>
+<a href="addressbook?filter=c&amp;begin=0&amp;end=49">c</a> 
+<a href="addressbook?filter=d&amp;begin=0&amp;end=49">d</a>
+<a href="addressbook?filter=e&amp;begin=0&amp;end=49">e</a>
+<a href="addressbook?filter=f&amp;begin=0&amp;end=49">f</a>
+<a href="addressbook?filter=g&amp;begin=0&amp;end=49">g</a>
+<a href="addressbook?filter=h&amp;begin=0&amp;end=49">h</a>
+<a href="addressbook?filter=i&amp;begin=0&amp;end=49">i</a>
+<a href="addressbook?filter=j&amp;begin=0&amp;end=49">j</a>
+<a href="addressbook?filter=k&amp;begin=0&amp;end=49">k</a>
+<a href="addressbook?filter=l&amp;begin=0&amp;end=49">l</a>
+<a href="addressbook?filter=m&amp;begin=0&amp;end=49">m</a>
+<a href="addressbook?filter=n&amp;begin=0&amp;end=49">n</a>
+<a href="addressbook?filter=o&amp;begin=0&amp;end=49">o</a>
+<a href="addressbook?filter=p&amp;begin=0&amp;end=49">p</a>
+<a href="addressbook?filter=q&amp;begin=0&amp;end=49">q</a>
+<a href="addressbook?filter=r&amp;begin=0&amp;end=49">r</a>
+<a href="addressbook?filter=s&amp;begin=0&amp;end=49">s</a>
+<a href="addressbook?filter=t&amp;begin=0&amp;end=49">t</a>
+<a href="addressbook?filter=u&amp;begin=0&amp;end=49">u</a>
+<a href="addressbook?filter=v&amp;begin=0&amp;end=49">v</a>
+<a href="addressbook?filter=w&amp;begin=0&amp;end=49">w</a>
+<a href="addressbook?filter=x&amp;begin=0&amp;end=49">x</a>
+<a href="addressbook?filter=y&amp;begin=0&amp;end=49">y</a>
+<a href="addressbook?filter=z&amp;begin=0&amp;end=49">z</a>
+<a href="addressbook?filter=0-9&amp;begin=0&amp;end=49">0-9</a>
+<a href="addressbook?filter=xn--&amp;begin=0&amp;end=49"><%=intl._("other")%></a>
+<a href="addressbook?filter=none&amp;begin=0&amp;end=49"><%=intl._("all")%></a></p>
 <c:if test="${book.hasFilter}">
 <p><%=intl._("Current filter")%>: ${book.filter}
-(<a href="addressbook?filter=none&amp;begin=0&amp;end=99"><%=intl._("clear filter")%></a>)</p>
+(<a href="addressbook?filter=none&amp;begin=0&amp;end=49"><%=intl._("clear filter")%></a>)</p>
 </c:if>
 </div>
 
 <div id="search">
 <form method="POST" action="addressbook">
 <input type="hidden" name="begin" value="0">
-<input type="hidden" name="end" value="99">
+<input type="hidden" name="end" value="49">
 <table><tr>
 <td class="search"><%=intl._("Search")%>: <input class="search" type="text" name="search" value="${book.search}" size="20" ></td>
 <td class="search"><input class="search" type="submit" name="submitsearch" value="<%=intl._("Search")%>" ></td>
@@ -132,7 +132,7 @@ ${book.loadBookMessages}
 <form method="POST" action="addressbook">
 <input type="hidden" name="serial" value="<%=susiNonce%>">
 <input type="hidden" name="begin" value="0">
-<input type="hidden" name="end" value="99">
+<input type="hidden" name="end" value="49">
 <jsp:setProperty name="book" property="trClass"	value="0" />
 <div id="book">
 <table class="book" cellspacing="0" cellpadding="5">
@@ -184,7 +184,7 @@ ${book.loadBookMessages}
 <form method="POST" action="addressbook">
 <input type="hidden" name="serial" value="<%=susiNonce%>">
 <input type="hidden" name="begin" value="0">
-<input type="hidden" name="end" value="99">
+<input type="hidden" name="end" value="49">
 <div id="add">
 <h3><%=intl._("Add new destination")%>:</h3>
 <table><tr><td>
diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp
index fae6e0720..f9769ecac 100644
--- a/apps/susidns/src/jsp/details.jsp
+++ b/apps/susidns/src/jsp/details.jsp
@@ -49,10 +49,10 @@
 <div id="navi">
 <p>
 <%=intl._("Address books")%>:
-<a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> |
-<a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> |
-<a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> |
-<a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> *
+<a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("private")%></a> |
+<a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("master")%></a> |
+<a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("router")%></a> |
+<a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=49"><%=intl._("published")%></a> *
 <a href="subscriptions"><%=intl._("Subscriptions")%></a> *
 <a href="config"><%=intl._("Configuration")%></a> *
 <a href="index"><%=intl._("Overview")%></a>
@@ -127,7 +127,7 @@
 <p class="buttons">
 <input type="hidden" name="serial" value="${book.serial}">
 <input type="hidden" name="begin" value="0">
-<input type="hidden" name="end" value="99">
+<input type="hidden" name="end" value="49">
 <input type="hidden" name="checked" value="<%=detail%>">
 <input class="delete" type="submit" name="action" value="<%=intl._("Delete Entry")%>" >
 </p>
diff --git a/history.txt b/history.txt
index df478a191..a40939ec8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2012-01-30 zzz
+  * i2psnark: More illegal chars
+  * LogWriter: Don't rotate and open file until first message
+  * SusiDNS: Reduce listings to 50/page
+
 2012-01-27 zzz
   * Build: Repack release jars with pack200 -r, saves about 1% and
            might save a little memory at runtime too
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2522cd4e..7ca1a3ec2 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/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 = 9;
+    public final static long BUILD = 10;
 
     /** for example "-test" */
     public final static String EXTRA = "";