-
<%
if (curPage == 1) {
%>
-
-
+ <%
+ /* hidden form data from other pages */
+ if (curPage != 1) {
+ %>
<%
+ }
+ if (curPage != 2) {
+ %>
<%
+ }
+ if (curPage != 3) {
+ String name = net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_name"));
+ if (name.length() == 0)
+ name = "New tunnel";
+ %>
" /><%
+ }
+ if (curPage != 4 && tunnelIsClient &&
+ ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType))) {
+ %>
" /><%
+ }
+ if (curPage != 5) {
+ if (tunnelIsClient) {
+ %>
" /><%
+ } else {
+ String ip = net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost"));
+ if (ip.length() == 0)
+ ip = "127.0.0.1";
+ %>
" /><%
+ }
+ }
+ if (curPage != 6 &&
+ "1".equals(request.getParameter("startOnLoad"))) {
+ %>
" /><%
+ }
+ if (curPage == 7) {
+ /* defaults */
+ %>
<%
+ if (tunnelIsClient) { /* Client-only defaults */
+ %>
<%
+ } else { /* Server-only defaults */
+ %>
<% /* Page 1 - Whether to make a client or server tunnel */
@@ -106,8 +154,6 @@
<%
- } else {
- %><%
} /* curPage 1 */
/* End page 1 */ %>
@@ -197,8 +243,6 @@
<%
- } else {
- %><%
} /* curPage 2 */
/* End page 2 */ %>
@@ -218,19 +262,16 @@
|
<%=intl._t("Name")%>:
- " value="<%=(!"null".equals(request.getParameter("name")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("name")) : "" ) %>" class="freetext" />
+ " value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_name"))%>" class="freetext" />
|
|
<%=intl._t("Description")%>:
- " value="<%=(!"null".equals(request.getParameter("nofilter_description")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_description")) : "" ) %>" class="freetext" />
+ " value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_description"))%>" class="freetext" />
|
<%
- } else {
- %>" />
- " /><%
} /* curPage 3 */
/* End page 3 */ %>
@@ -252,12 +293,10 @@
|
<%=intl._t("Outproxies")%>:
- " value="<%=(!"null".equals(request.getParameter("proxyList")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("proxyList")) : "" ) %>" class="freetext" />
+ " value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("proxyList"))%>" class="freetext" />
|
<%
- } else {
- %>" /><%
} /* curPage 4 */
} else if ("client".equals(tunnelType) || "ircclient".equals(tunnelType)) {
if (curPage == 4) {
@@ -273,14 +312,12 @@
|
<%=intl._t("Tunnel Destination")%>:
- " value="<%=(!"null".equals(request.getParameter("targetDestination")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetDestination")) : "" ) %>" class="freetext" />
+ " value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetDestination")) %>" class="freetext" placeholder="<%=intl._t("required")%>" required />
(<%=intl._t("name, name:port, or destination")%>
)
|
<%
- } else {
- %>" /><%
} /* curPage 4 */
}
} /* tunnelIsClient */
@@ -303,18 +340,9 @@
|
<%=intl._t("Host")%>:
- " placeholder="127.0.0.1" value="<%=(!"null".equals(request.getParameter("targetHost")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost")) : "127.0.0.1" ) %>" class="freetext" />
+ " placeholder="<%=intl._t("required")%>" required value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost"))%>" class="freetext" />
|
- <%
- } else {
- %>" /><%
- } /* curPage 5 */
- } /* streamrclient or !streamrserver */ %>
- <%
- if (!tunnelIsClient) {
- if (curPage == 5) {
- %>
|
@@ -325,12 +353,10 @@
|
|
<%=intl._t("Port")%>:
- " value="<%=(!"null".equals(request.getParameter("targetPort")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort")) : "" ) %>" class="freetext" />
+ " value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort"))%>" class="freetext" placeholder="<%=intl._t("required")%>" required />
|
<%
- } else {
- %>" /><%
} /* curPage 5 */
} /* !tunnelIsClient */ %>
<%
@@ -347,18 +373,9 @@
|
<%=intl._t("Port")%>:
- " value="<%=(!"null".equals(request.getParameter("port")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("port")) : "" ) %>" class="freetext" />
+ " value="<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("port"))%>" class="freetext" placeholder="<%=intl._t("required")%>" required />
|
- <%
- } else {
- %>" /><%
- } /* curPage 5 */
- } /* tunnelIsClient or httpbidirserver */ %>
- <%
- if (tunnelIsClient) {
- if (curPage == 5) {
- %>
|
@@ -375,7 +392,7 @@
|
<%
- } else {
- %>" /><%
} /* curPage 5 */
- } /* (tunnelIsClient && !streamrclient) || httpbidirserver || streamrserver */
+ } /* tunnelIsClient */
/* End page 5 */ %>
@@ -419,10 +434,6 @@
<%
- } else {
- if ("1".equals(request.getParameter("startOnLoad"))) {
- %>" /><%
- }
} /* curPage 6 */
/* End page 6 */ %>
@@ -470,7 +481,7 @@
} %>
| <%=intl._t("Tunnel name")%> |
- <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("name"))%> |
+ <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_name"))%> |
| <%=intl._t("Tunnel description")%> |
<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_description"))%> |
<%
@@ -486,15 +497,11 @@
<%
if (!tunnelIsClient) { %>
| <%=intl._t("Binding address")%> |
- <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost"))%> |
<%
- }
- if (!tunnelIsClient) { %>
+ <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost"))%>
| <%=intl._t("Tunnel port")%> | <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort"))%> |
<%
}
if (tunnelIsClient) { %>
- | <%=intl._t("Port")%> | <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("port"))%> |
<%
- }
- if (tunnelIsClient) { %>
+ | <%=intl._t("Port")%> | <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("port"))%> |
| <%=intl._t("Reachable by")%> | <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("reachableBy"))%> |
<%
} %>
| <%=intl._t("Tunnel auto-start")%> | <%
@@ -513,25 +520,9 @@
<%=intl._t("Alongside these basic settings, there are a number of advanced options for tunnel configuration.")%>
<%=intl._t("The wizard will set reasonably sensible default values for these, but you can view and/or edit these by clicking on the tunnel's name in the main I2PTunnel page.")%>
-
-
-
-
-
-
-
-
- <%
-
- if (tunnelIsClient) { /* Client-only defaults */
- %>
- <%
- } else { /* Server-only defaults */
- %>
|
<%
- } /* tunnelIsClient */
} /* curPage 7 */
/* End page 7 */ %>
@@ -539,7 +530,7 @@
" href="list"><%=intl._t("Cancel")%>
<% if (curPage != 1 && curPage != 7) {
- %><%
+ %><%
} %>
<% if (curPage == 7) {
%><%
@@ -552,8 +543,6 @@
|