diff options
| author | jim-p <jim@pingle.org> | 2010-05-06 15:43:14 -0400 |
|---|---|---|
| committer | jim-p <jim@pingle.org> | 2010-05-06 15:43:14 -0400 |
| commit | 71d61aa52771c9cf9f700a8faa93dd0991bb19f0 (patch) | |
| tree | 17b090efb5495f866e9fa269a865ce53e95af8da /usr/local/www/vpn_ipsec_phase1.php | |
| parent | 2ef1b601209ce2d3fce5e25ac9c064f6be9c44cc (diff) | |
| download | pfsense-71d61aa52771c9cf9f700a8faa93dd0991bb19f0.zip pfsense-71d61aa52771c9cf9f700a8faa93dd0991bb19f0.tar.gz | |
Reorder Auth. Method and PSK field to a more logical sequence. Part of ticket #108.
Diffstat (limited to 'usr/local/www/vpn_ipsec_phase1.php')
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index 7348cad..e902bc6 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -442,7 +442,8 @@ function dpdchkbox_change() { $tab_array = array(); $tab_array[0] = array("Tunnels", true, "vpn_ipsec.php"); $tab_array[1] = array("Mobile clients", false, "vpn_ipsec_mobile.php"); - $tab_array[2] = array("Logs", false, "diag_logs_ipsec.php"); + $tab_array[2] = array("Pre-shared keys", false, "vpn_ipsec_keys.php"); + $tab_array[3] = array("Logs", false, "diag_logs_ipsec.php"); display_top_tabs($tab_array); ?> </td> @@ -519,6 +520,26 @@ function dpdchkbox_change() { </td> </tr> <tr> + <td width="22%" valign="top" class="vncellreq">Authentication method</td> + <td width="78%" class="vtable"> + <select name="authentication_method" class="formselect" onChange="methodsel_change()"> + <?php + foreach ($p1_authentication_methods as $method_type => $method_params): + if (!$pconfig['mobile'] && $method_params['mobile']) + continue; + ?> + <option value="<?=$method_type;?>" <?php if ($method_type == $pconfig['authentication_method']) echo "selected"; ?>> + <?=htmlspecialchars($method_params['name']);?> + </option> + <?php endforeach; ?> + </select> + <br> + <span class="vexpl"> + Must match the setting chosen on the remote side. + </span> + </td> + </tr> + <tr> <td width="22%" valign="top" class="vncellreq">Negotiation mode</td> <td width="78%" class="vtable"> <select name="mode" class="formselect"> @@ -563,6 +584,17 @@ function dpdchkbox_change() { <input name="peerid_data" type="text" class="formfld unknown" id="peerid_data" size="30" value="<?=$pconfig['peerid_data'];?>"> </td> </tr> + <tr id="opt_psk"> + <td width="22%" valign="top" class="vncellreq">Pre-Shared Key</td> + <td width="78%" class="vtable"> + <?=$mandfldhtml;?> + <input name="pskey" type="text" class="formfld unknown" id="pskey" size="40" value="<?=htmlspecialchars($pconfig['pskey']);?>"> + <span class="vexpl"> + <br> + Input your pre-shared key string. + </span> + </td> + </tr> <tr> <td width="22%" valign="top" class="vncellreq">Encryption algorithm</td> <td width="78%" class="vtable"> @@ -623,37 +655,6 @@ function dpdchkbox_change() { seconds </td> </tr> - <tr> - <td width="22%" valign="top" class="vncellreq">Authentication method</td> - <td width="78%" class="vtable"> - <select name="authentication_method" class="formselect" onChange="methodsel_change()"> - <?php - foreach ($p1_authentication_methods as $method_type => $method_params): - if (!$pconfig['mobile'] && $method_params['mobile']) - continue; - ?> - <option value="<?=$method_type;?>" <?php if ($method_type == $pconfig['authentication_method']) echo "selected"; ?>> - <?=htmlspecialchars($method_params['name']);?> - </option> - <?php endforeach; ?> - </select> - <br> - <span class="vexpl"> - Must match the setting chosen on the remote side. - </span> - </td> - </tr> - <tr id="opt_psk"> - <td width="22%" valign="top" class="vncellreq">Pre-Shared Key</td> - <td width="78%" class="vtable"> - <?=$mandfldhtml;?> - <input name="pskey" type="text" class="formfld unknown" id="pskey" size="40" value="<?=htmlspecialchars($pconfig['pskey']);?>"> - <span class="vexpl"> - <br> - Input your pre-shared key string. - </span> - </td> - </tr> <tr id="opt_cert"> <td width="22%" valign="top" class="vncellreq">My Certificate</td> <td width="78%" class="vtable"> |
