diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-02 17:37:56 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-02 17:37:56 -0500 |
| commit | fad728ab92e26a1b5817816474d3814c71c394db (patch) | |
| tree | 7a80243da0d2e23bb79a0cf297caddbf7fa4c333 /usr/local/www/vpn_ipsec_phase1.php | |
| parent | 045c9cc995a4f75ca2634a00c8ed23b1c711506d (diff) | |
| download | pfsense-fad728ab92e26a1b5817816474d3814c71c394db.zip pfsense-fad728ab92e26a1b5817816474d3814c71c394db.tar.gz | |
Move { and } to same line.
Diffstat (limited to 'usr/local/www/vpn_ipsec_phase1.php')
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index 5b8fb25..7348cad 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -58,8 +58,7 @@ if (isset($_GET['dup'])) { $p1index = $_GET['dup']; } -if (isset($p1index) && $a_phase1[$p1index]) -{ +if (isset($p1index) && $a_phase1[$p1index]) { // don't copy the ikeid on dup if (!isset($_GET['dup'])) $pconfig['ikeid'] = $a_phase1[$p1index]['ikeid']; @@ -91,7 +90,7 @@ if (isset($p1index) && $a_phase1[$p1index]) $pconfig['lifetime'] = $a_phase1[$p1index]['lifetime']; $pconfig['authentication_method'] = $a_phase1[$p1index]['authentication_method']; - if (($pconfig['authentication_method'] == "pre_shared_key")|| + if (($pconfig['authentication_method'] == "pre_shared_key") || ($pconfig['authentication_method'] == "xauth_psk_server")) { $pconfig['pskey'] = $a_phase1[$p1index]['pre-shared-key']; } else { @@ -106,9 +105,7 @@ if (isset($p1index) && $a_phase1[$p1index]) $pconfig['dpd_delay'] = $a_phase1[$p1index]['dpd_delay']; $pconfig['dpd_maxfail'] = $a_phase1[$p1index]['dpd_maxfail']; } -} -else -{ +} else { /* defaults */ $pconfig['interface'] = "wan"; if($config['interfaces']['lan']) |
