Changeset 13841


Ignorieren:
Zeitstempel:
30.07.2016 13:09:04 (vor 14 Monaten)
Autor:
MaxMuster
Nachricht:

openvpn-cgi:

  • add missing parts of addidions to webif incidentially allready commited in changeset:13840
  • add some GUI stuff to enable tap config w/o another IP by just using lan IP
Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/openvpn-cgi/files/root/usr/lib/cgi-bin/openvpn.cgi

    r13803 r13841  
    210210    <td> 
    211211      <div id="div_add_tap"> 
    212         <input id="id_act_tap2lan" type="checkbox" title="$(lang de:"Das TAP-Interface wird automatisch zum LAN-Interface gebr&uuml;ckt (brctl)" en:"TAP interface will be bridged to LAN using brctl")" name="my_tap2lan" value="yes" onclick='(local_tap2lan[act_conf]=(this.checked)? "yes" : ""); changeval();'> 
    213         <label for="id_act_tap2lan">$(lang de:"mit LAN br&uuml;cken" en:"bridge to LAN")</label> 
     212        <select id="id_act_tap2lan" title="$(lang de:"Das TAP-Interface wird automatisch zum LAN-Interface gebr&uuml;ckt (brctl). LAN-IP ignoriert die eingegebene IP und nutzt die IP des LAN Interfaces" en:"TAP interface will be bridged to LAN using brctl. LAN IP will ignore the local IP and use the IP of the interface lan.")" name="my_tap2lan" onchange='local_tap2lan[act_conf]=this.value; changeval();'> 
     213        <option value="">$(lang de:"tap nicht br&uuml;cken" en:"don't bridge tap")</option> 
     214        <option value="yes">$(lang de:"mit LAN br&uuml;cken" en:"bridge to LAN")</option> 
     215        <option value="uselanip">$(lang de:"br&uuml;cken und LAN-IP nutzen" en:"bridge and use LAN IP")</option> 
     216        </select> 
    214217      </div> 
    215218    </td> 
     
    650653    if ( local_debug[act_conf] == "yes" ) { document.getElementById("id_act_debug").checked = true } else { document.getElementById("id_act_debug").checked = false }; 
    651654    document.getElementById("id_act_no_certtype").checked = ( local_no_certtype[act_conf] == "yes" ) ? "checked" : "" 
    652     document.getElementById("id_act_tap2lan").checked = ( local_tap2lan[act_conf] == "yes" ) ? "checked" : "" 
     655//  document.getElementById("id_act_tap2lan").checked = ( local_tap2lan[act_conf] == "yes" ) ? "checked" : "" 
    653656    if ( local_client_info[act_conf] == "yes" ) { document.getElementById("id_act_client_info").checked = true } else { document.getElementById("id_act_client_info").checked = false }; 
    654657 
     
    685688    document.getElementById("id_act_box_ip").value=local_box_ip[act_conf]; 
    686689    document.getElementById("id_act_box_mask").value=local_box_mask[act_conf]; 
     690    document.getElementById("id_act_tap2lan").value=local_tap2lan[act_conf]; 
    687691    document.getElementById("id_act_remote_ip").value=local_remote_ip[act_conf]; 
    688692    document.getElementById("id_act_dhcp_range").value=local_dhcp_range[act_conf]; 
     
    939943 
    940944        if ( document.getElementById("id_act_tap").checked ) { 
    941             document.getElementById("div_ip_and_net").style.display = "block"; 
     945            document.getElementById("id_act_box_ip").value = ( document.getElementById("id_act_tap2lan").value == "uselanip" ) ? "-- (LAN IP)": local_box_ip[act_conf]; 
     946            document.getElementById("div_ip_and_net").style.display = ( document.getElementById("id_act_tap2lan").value == "uselanip" ) ? "none": "block"; 
    942947            document.getElementById("div_ip_loc_rem").style.display = "none"; 
    943948        } 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.