From e7536715d458d95731c5bb0f494db5d9922b8804 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Thu, 16 Nov 2023 14:32:43 -0500
Subject: [PATCH] Console: Add "required" to input fields where necessary

---
 .../router/web/helpers/ConfigUIHelper.java    |  4 ++--
 .../i2p/router/web/helpers/HomeHelper.java    |  4 ++--
 apps/routerconsole/jsp/config.jsp             |  4 ++--
 apps/routerconsole/jsp/configfamily.jsp       |  4 ++--
 apps/routerconsole/jsp/confighome.jsp         | 20 +++++++++----------
 apps/routerconsole/jsp/configplugins.jsp      |  6 +++---
 apps/routerconsole/jsp/configreseed.jsp       |  4 ++--
 apps/routerconsole/jsp/configsidebar.jsp      |  2 +-
 apps/routerconsole/jsp/configui.jsp           |  2 +-
 apps/routerconsole/jsp/home.jsp               |  2 +-
 apps/routerconsole/jsp/welcome.jsp            | 12 +++++------
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
index fd19f418d..e8bb9e230 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
@@ -255,9 +255,9 @@ public class ConfigUIHelper extends HelperBase {
         }
         buf.append("<tr><td id=\"pw_adduser\" align=\"left\" colspan=\"3\">" +
                    "<b>").append(_t("Username")).append(":</b> " +
-                   "<input type=\"text\" name=\"name\">" +
+                   "<input type=\"text\" name=\"name\" required>" +
                    "<b>").append(_t("Password")).append(":</b> " +
-                   "<input type=\"password\" size=\"40\" name=\"nofilter_pw\">" +
+                   "<input type=\"password\" size=\"40\" name=\"nofilter_pw\" required>" +
                    "</td></tr>" +
                    "</table>\n");
         return buf.toString();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
index bed8ca187..3fc0d658d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
@@ -402,8 +402,8 @@ public class HomeHelper extends HelperBase {
         }
         buf.append("<tr id=\"addnew\"><td colspan=\"2\" align=\"center\"><b>")
            .append(_t("Add")).append(":</b>" +
-                   "</td><td align=\"left\"><input type=\"text\" name=\"nofilter_name\"></td>" +
-                   "<td align=\"left\"><input type=\"text\" size=\"40\" name=\"nofilter_url\"></td></tr>");
+                   "</td><td align=\"left\"><input type=\"text\" name=\"nofilter_name\" required></td>" +
+                   "<td align=\"left\"><input type=\"text\" size=\"40\" name=\"nofilter_url\" required></td></tr>");
         buf.append("</table>\n");
         return buf.toString();
     }
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 35473430a..00f6fa676 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -32,7 +32,7 @@
 <%=intl._t("Your upstream share amount (KBps Out) will determine your overall contribution to the network.")%>
 </p></td></tr>
 <%-- display burst, set standard, handler will fix up --%>
-   <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundBurstRate" />" >
+   <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundBurstRate" />" required>
           <%=intl._t("KBps In")%>
         </td><td>(<jsp:getProperty name="nethelper" property="inboundBurstRateBits" />)</td>
 <%--
@@ -44,7 +44,7 @@
 --%>
     </tr><tr>
 <%-- display burst, set standard, handler will fix up --%>
-        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" >
+        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" required>
          <%=intl._t("KBps Out")%>
         </td><td>(<jsp:getProperty name="nethelper" property="outboundBurstRateBits" />)</td>
 <%--
diff --git a/apps/routerconsole/jsp/configfamily.jsp b/apps/routerconsole/jsp/configfamily.jsp
index 65467411b..02a83362f 100644
--- a/apps/routerconsole/jsp/configfamily.jsp
+++ b/apps/routerconsole/jsp/configfamily.jsp
@@ -34,7 +34,7 @@
  <tr><td colspan="2" class="infohelp"><%=intl._t("Import the secret family key that you exported from an existing router in the family.")%></td></tr>
  <tr>
   <td><b><%=intl._t("Select secret key file")%>:</b>
-<input name="file" type="file" value="" />
+<input name="file" type="file" value="" required/>
   </td>
   <td class="optionsave">
 <input type="submit" name="action" class="download" value="<%=intl._t("Join Family")%>" />
@@ -48,7 +48,7 @@
  <tr><th colspan="2"><%=intl._t("Create New Router Family")%></th></tr>
  <tr>
   <td><b><%=intl._t("Family Name")%>:</b>
-<input name="family" type="text" size="30" value="" />
+<input name="family" type="text" size="30" value="" required/>
   </td>
   <td class="optionsave">
 <input type="submit" name="action" class="accept" value="<%=intl._t("Create Family")%>" />
diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp
index 1f9838fcc..04e3d2f73 100644
--- a/apps/routerconsole/jsp/confighome.jsp
+++ b/apps/routerconsole/jsp/confighome.jsp
@@ -50,9 +50,9 @@ input.default {
  <jsp:getProperty name="homehelper" property="configSearch" />
  <div class="formaction" id="homesearch">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add item")%>" >
-  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
+  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" formnovalidate>
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
-  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" >
+  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" formnovalidate>
   <input type="submit" name="action" class="add" value="<%=intl._t("Add item")%>" >
  </div>
 </form>
@@ -67,9 +67,9 @@ input.default {
  <jsp:getProperty name="homehelper" property="configServices" />
  <div class="formaction" id="homeapps">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add item")%>" >
-  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
+  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" formnovalidate>
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
-  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" >
+  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" formnovalidate>
   <input type="submit" name="action" class="add" value="<%=intl._t("Add item")%>" >
  </div>
 </form>
@@ -81,9 +81,9 @@ input.default {
  <jsp:getProperty name="homehelper" property="configFavorites" />
  <div class="formaction" id="homesites">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add item")%>" >
-  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
+  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" formnovalidate>
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
-  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" >
+  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" formnovalidate>
   <input type="submit" name="action" class="add" value="<%=intl._t("Add item")%>" >
  </div>
 </form>
@@ -95,9 +95,9 @@ input.default {
  <jsp:getProperty name="homehelper" property="configConfig" />
  <div class="formaction" id="homeconfig">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add item")%>" >
-  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
+  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" formnovalidate>
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
-  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" >
+  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" formnovalidate>
   <input type="submit" name="action" class="add" value="<%=intl._t("Add item")%>" >
  </div>
 </form>
@@ -109,9 +109,9 @@ input.default {
  <jsp:getProperty name="homehelper" property="configMonitoring" />
  <div class="formaction" id="homemonitor">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add item")%>" >
-  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
+  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" formnovalidate>
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
-  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" >
+  <input type="submit" name="action" class="reload" value="<%=intl._t("Restore defaults")%>" formnovalidate>
   <input type="submit" name="action" class="add" value="<%=intl._t("Add item")%>" >
  </div>
 </form>
diff --git a/apps/routerconsole/jsp/configplugins.jsp b/apps/routerconsole/jsp/configplugins.jsp
index 50e3c60d3..8ab7b647a 100644
--- a/apps/routerconsole/jsp/configplugins.jsp
+++ b/apps/routerconsole/jsp/configplugins.jsp
@@ -62,7 +62,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
    String url = request.getParameter("pluginURL");
    String value = url != null ? "value=\"" + net.i2p.data.DataHelper.escapeHTML(url) + '"' : "";
 %>
- <input type="text" size="60" name="pluginURL" title="<%=intl._t("To install a plugin, enter the download URL:")%>" <%=value%>>
+ <input type="text" size="60" name="pluginURL" title="<%=intl._t("To install a plugin, enter the download URL:")%>" <%=value%> required>
 </td>
 <td class="optionsave" align="right">
  <input type="submit" name="action" class="default hideme" value="<%=intl._t("Install Plugin")%>" />
@@ -84,11 +84,11 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
    String file = request.getParameter("pluginFile");
    if (file != null && file.length() > 0) {
 %>
-<input type="text" size="60" name="pluginFile" value="<%=net.i2p.data.DataHelper.escapeHTML(file)%>">
+<input type="text" size="60" name="pluginFile" value="<%=net.i2p.data.DataHelper.escapeHTML(file)%>" required>
 <%
    } else {
 %>
-<input type="file" name="pluginFile" accept=".xpi2p,.su3" >
+<input type="file" name="pluginFile" accept=".xpi2p,.su3" required>
 <%
    }
 %>
diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp
index fc1d2f341..d488eee92 100644
--- a/apps/routerconsole/jsp/configreseed.jsp
+++ b/apps/routerconsole/jsp/configreseed.jsp
@@ -72,7 +72,7 @@
    String url = request.getParameter("url");
    String value = url != null ? "value=\"" + net.i2p.data.DataHelper.escapeHTML(url) + '"' : "";
 %>
-<input name="url" type="text" size="60" <%=value%> />
+<input name="url" type="text" size="60" <%=value%> required/>
   </td>
   <td class="optionsave">
 <input type="submit" name="action" class="download" value="<%=intl._t("Reseed from URL")%>" />
@@ -97,7 +97,7 @@
 <%
    } else {
 %>
-<input name="file" type="file" accept=".zip,.su3" value="" />
+<input name="file" type="file" accept=".zip,.su3" value="" required/>
 <%
    }
 %>
diff --git a/apps/routerconsole/jsp/configsidebar.jsp b/apps/routerconsole/jsp/configsidebar.jsp
index cd7984819..1980f6ea4 100644
--- a/apps/routerconsole/jsp/configsidebar.jsp
+++ b/apps/routerconsole/jsp/configsidebar.jsp
@@ -40,7 +40,7 @@ input.default {
     else
         rval = intl.getRefresh();
 %>
- <input type="text" name="refreshInterval" value="<%=rval%>">
+ <input type="text" name="refreshInterval" value="<%=rval%>" required>
  <%=intl._t("seconds")%>
   </td>
   <td class="optionsave">
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index 4d3b5c277..2712635d7 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/apps/routerconsole/jsp/configui.jsp
@@ -66,7 +66,7 @@ input.default {
  <jsp:getProperty name="uihelper" property="passwordForm" />
  <div class="formaction" id="consolepass">
   <input type="submit" name="action" class="default" value="<%=intl._t("Add user")%>" >
-  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" >
+  <input type="submit" name="action" class="delete" value="<%=intl._t("Delete selected")%>" formnovalidate>
   <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
   <input type="submit" name="action" class="add" value="<%=intl._t("Add user")%>" >
  </div>
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index d6d70f7c5..df96b83a4 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -71,7 +71,7 @@
   <div class="search">
     <form action="/search.jsp" target="_blank" method="POST">
       <table class="search"><tr><td align="right">
-        <input size="40" type="text" class="search" name="query" />
+        <input size="40" type="text" class="search" name="query" required/>
       </td><td align="left">
         <button type="submit" value="search" class="search"><%=intl._t("Search")%></button>
       </td><td align="left">
diff --git a/apps/routerconsole/jsp/welcome.jsp b/apps/routerconsole/jsp/welcome.jsp
index 28513c26c..8e0ca3c18 100644
--- a/apps/routerconsole/jsp/welcome.jsp
+++ b/apps/routerconsole/jsp/welcome.jsp
@@ -249,13 +249,13 @@
 <tr><td class="infohelp infodiv" colspan="2">
 <%=intl._t("I2P will work best if you configure your rates to match the speed of your internet connection.")%>
 </td></tr>
-<tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="wizhelper" property="inboundBurstRate" />" >
+<tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="wizhelper" property="inboundBurstRate" />" required>
 <%=intl._t("KBps In")%>
 </td><td>(<jsp:getProperty name="wizhelper" property="inboundBurstRateBits" />)</td>
 </tr>
 <tr>
 <%-- display burst, set standard, handler will fix up --%>
-<td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="wizhelper" property="outboundBurstRate" />" >
+<td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="wizhelper" property="outboundBurstRate" />" required>
 <%=intl._t("KBps Out")%>
 </td><td>(<jsp:getProperty name="wizhelper" property="outboundBurstRateBits" />)</td>
 </tr>
@@ -352,20 +352,20 @@
 <%
     if (ipg != FIRST_PAGE) {
 %>
-<input type="submit" class="back wizardbutton" name="prev" value="<%=intl._t("Previous")%>" >
+<input type="submit" class="back wizardbutton" name="prev" value="<%=intl._t("Previous")%>" formnovalidate>
 <%
     }
     if (ipg != LAST_PAGE) {
 %>
-<input type="submit" class="cancel wizardbutton" name="skip" value="<%=intl._t("Skip Setup")%>" >
+<input type="submit" class="cancel wizardbutton" name="skip" value="<%=intl._t("Skip Setup")%>" formnovalidate>
 <%
         if (ipg == PAGE_CHECK) {
 %>
-<input type="submit" class="cancel wizardbutton" name="skipbw" value="<%=intl._t("Skip Bandwidth Test")%>" >
+<input type="submit" class="cancel wizardbutton" name="skipbw" value="<%=intl._t("Skip Bandwidth Test")%>" formnovalidate>
 <%
         } else if (ipg == PAGE_TEST) {
 %>
-<input type="submit" class="cancel wizardbutton" name="cancelbw" value="<%=intl._t("Cancel Bandwidth Test")%>" >
+<input type="submit" class="cancel wizardbutton" name="cancelbw" value="<%=intl._t("Cancel Bandwidth Test")%>" formnovalidate>
 <%
         }
 %>