Changeset 7bdfd07


Ignore:
Timestamp:
May 23, 2019 11:12:19 AM (11 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
47c64c2e
Parents:
7858dbe
Message:

i2ptunnel: select box for sig type

Location:
apps/i2ptunnel/jsp
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • apps/i2ptunnel/jsp/editClient.jsi

    r7858dbe r7bdfd07  
    498498        </tr><tr>
    499499            <td colspan="2">
    500                 <span class="multiOption">
    501                     <label title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>"><input value="0" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
    502                     DSA-SHA1</label>
    503                 </span>
     500                <select id="sigType" name="sigType" class="selectbox">
     501                    <option title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>" value="0" <%=(currentSigType==0 ? " selected=\"selected\"" : disabled)%> >
     502                    DSA-SHA1</option>
    504503<%
    505504              if (editBean.isSigTypeAvailable(1)) {
    506505%>
    507                 <span class="multiOption">
    508                     <label><input value="1" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
    509                     ECDSA-P256</label>
    510                 </span>
     506                    <option value="1" <%=(currentSigType==1 ? " selected=\"selected\"" : disabled)%> >
     507                    ECDSA-P256</option>
    511508<%
    512509              }
    513510              if (editBean.isSigTypeAvailable(2)) {
    514511%>
    515                 <span class="multiOption">
    516                     <label><input value="2" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
    517                     ECDSA-P384</label>
    518                 </span>
     512                    <option value="2" <%=(currentSigType==2 ? " selected=\"selected\"" : disabled)%> >
     513                    ECDSA-P384</option>
    519514<%
    520515              }
    521516              if (editBean.isSigTypeAvailable(3)) {
    522517%>
    523                 <span class="multiOption">
    524                     <label><input value="3" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
    525                     ECDSA-P521</label>
    526                 </span>
     518                    <option value="3" <%=(currentSigType==3 ? " selected=\"selected\"" : disabled)%> >
     519                    ECDSA-P521</option>
    527520<%
    528521              }
    529522              if (editBean.isSigTypeAvailable(7)) {
    530523%>
    531                 <span class="multiOption">
    532                     <label title="<%=intl._t("This is the default, recommended option")%>"><input value="7" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
    533                     Ed25519-SHA-512</label>
    534                 </span>
     524                    <option title="<%=intl._t("This is the default, recommended option")%>" value="7" <%=(currentSigType==7 ? " selected=\"selected\"" : disabled)%> >
     525                    Ed25519-SHA-512</option>
    535526<%
    536527              }   // isAvailable
    537528%>
     529                </select>
    538530            </td>
    539531        </tr>

  • apps/i2ptunnel/jsp/editServer.jsi

    r7858dbe r7bdfd07  
    438438                   String curEncryptMode = editBean.getEncryptMode(curTunnel);
    439439%>
    440                 <select id="encryptMode" name="encryptMode">" class="selectbox">
    441                 <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="0" <%=(curEncryptMode.equals("0") ? " selected=\"selected\"" : "")%>  />
     440                <select id="encryptMode" name="encryptMode" class="selectbox">
     441                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="0" <%=(curEncryptMode.equals("0") ? " selected=\"selected\"" : "")%> >
    442442                    <%=intl._t("Disable")%></option>
    443443<%
    444444                if (editBean.isAdvanced() || curEncryptMode.equals("10")) {
    445445%>
    446                 <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="10" <%=(curEncryptMode.equals("10") ? " selected=\"selected\"" : "")%>  />
     446                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="10" <%=(curEncryptMode.equals("10") ? " selected=\"selected\"" : "")%> >
    447447                    <%=intl._t("Disable")%> (LS2)</option>
    448448<%
    449449                } // isAdvanced()
    450450%>
    451                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%>  />
     451                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%> >
    452452                    <%=intl._t("Encrypted")%></option>
    453453<%
    … …  
    456456                if (allowBlinding) {
    457457%>
    458                 <option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2" <%=(curEncryptMode.equals("2") ? " selected=\"selected\"" : "")%>  />
     458                <option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2" <%=(curEncryptMode.equals("2") ? " selected=\"selected\"" : "")%> >
    459459                    <%=intl._t("Blinded")%></option>
    460460<%
    461461                     if (editBean.isAdvanced()) {
    462462%>
    463                 <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%>  />
     463                <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
    464464                    <%=intl._t("Blinded with lookup password")%></option>
    465465<%
    466466                         // TODO, unimplemented
    467467%>
    468                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%>  />
     468                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%> >
    469469                    <%=intl._t("Blinded with shared key")%></option>
    470                 <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%>  />
     470                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%> >
    471471                    <%=intl._t("Blinded with lookup password and shared key")%></option>
    472                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%>  />
     472                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%> >
    473473                    <%=intl._t("Blinded with per-user key")%> (PSK)</option>
    474                 <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%>  />
     474                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%> >
    475475                    <%=intl._t("Blinded with lookup password and per-user key")%> (PSK)</option>
    476                 <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%>  />
     476                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%> >
    477477                    <%=intl._t("Blinded with per-user key")%> (DH)</option>
    478                 <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%>  />
     478                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%> >
    479479                    <%=intl._t("Blinded with lookup password and per-user key")%> (DH)</option>
    480480<%
    … …  
    744744        </tr><tr>
    745745            <td colspan="2">
    746                 <span class="multiOption">
    747                     <label title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>"><input value="0" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
    748                     DSA-SHA1</label>
    749                 </span>
     746                <select id="sigType" name="sigType" class="selectbox">
     747                    <option title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>" value="0" <%=(currentSigType==0 ? " selected=\"selected\"" : disabled)%> >
     748                    DSA-SHA1</option>
    750749<%           if (editBean.isSigTypeAvailable(1)) { %>
    751                 <span class="multiOption">
    752                     <label><input value="1" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
    753                     ECDSA-P256</label>
    754                 </span>
     750                    <option value="1" <%=(currentSigType==1 ? " selected=\"selected\"" : disabled)%> >
     751                    ECDSA-P256</option>
    755752<%            }
    756753              if (editBean.isSigTypeAvailable(2)) { %>
    757                 <span class="multiOption">
    758                     <label><input value="2" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
    759                     ECDSA-P384</label>
    760                 </span>
     754                    <option value="2" <%=(currentSigType==2 ? " selected=\"selected\"" : disabled)%> >
     755                    ECDSA-P384</option>
    761756<%            }
    762757              if (editBean.isSigTypeAvailable(3)) { %>
    763                 <span class="multiOption">
    764                     <label><input value="3" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
    765                     ECDSA-P521</label>
    766                 </span>
     758                    <option value="3" <%=(currentSigType==3 ? " selected=\"selected\"" : disabled)%> >
     759                    ECDSA-P521</option>
    767760<%            }
    768761              if (editBean.isSigTypeAvailable(7)) { %>
    769                 <span class="multiOption">
    770                     <label title="<%=intl._t("This is the default, recommended option")%>"><input value="7" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
    771                     Ed25519-SHA-512</label>
    772                 </span>
     762                    <option title="<%=intl._t("This is the default, recommended option")%>" value="7" <%=(currentSigType==7 ? " selected=\"selected\"" : disabled)%> >
     763                    Ed25519-SHA-512</option>
    773764<%            }
    774765              if (editBean.isSigTypeAvailable(11)) { %>
    775                 <span class="multiOption">
    776                     <label title="<%=intl._t("Experimental")%>"><input value="11" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==11 ? " checked=\"checked\"" : "")%> class="tickbox" />
    777                     Red25519-SHA-512</label>
    778                 </span>
     766                    <option title="<%=intl._t("Experimental")%>" value="11" <%=(currentSigType==11 ? " selected=\"selected\"" : disabled)%> >
     767                    Red25519-SHA-512</option>
    779768<%            }   // isAvailable
    780769%>
     770                </select>
    781771            </td>
    782772        </tr>
Note: See TracChangeset for help on using the changeset viewer.