Add socks to gui, prevent NPE on socks 4 request, general cleanup

apps/i2ptunnel/jsp/edit.jsp

@@ -14,7 +14,7 @@ String tun = request.getParameter("tunnel");
 } else {
   String type = request.getParameter("type");
   int curTunnel = -1;
-  if ("client".equals(type) || "httpclient".equals(type) || "ircclient".equals(type)) {
+  if (EditBean.isClient(type)) {
     %><jsp:include page="editClient.jsp" /><%
   } else if ("server".equals(type) || "httpserver".equals(type)) {
     %><jsp:include page="editServer.jsp" /><%
@@ -22,4 +22,4 @@ String tun = request.getParameter("tunnel");
     %>Invalid tunnel type<%
   }
 }
-%>
+%>