From debaee826d4d8ab0c0b2a884259114ddfcf036b3 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 25 Nov 2015 16:14:22 +0000
Subject: [PATCH] (legacy) ipsec phase 2 protocol selection glitch

---
 src/www/vpn_ipsec_phase2.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/www/vpn_ipsec_phase2.php b/src/www/vpn_ipsec_phase2.php
index 123a38362..d9cdbc542 100644
--- a/src/www/vpn_ipsec_phase2.php
+++ b/src/www/vpn_ipsec_phase2.php
@@ -157,8 +157,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // initialize form data
     $pconfig = array();
 
-    $phase2_fields = "ikeid,mode,descr,uniqid,proto,hash-algorithm-option
-    ,pfsgroup,pfsgroup,lifetime,pinghost";
+    $phase2_fields = "ikeid,mode,descr,uniqid,proto,hash-algorithm-option,pfsgroup,pfsgroup,lifetime,pinghost,protocol";
     if ($p2index !== null) {
         // 1-on-1 copy
         foreach (explode(",", $phase2_fields) as $fieldname) {
@@ -378,8 +377,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
     if (count($input_errors) == 0) {
         $ph2ent = array();
-        $copy_fields = "ikeid,uniqid,mode,pfsgroup,lifetime,pinghost,descr
-        ,protocol";
+        $copy_fields = "ikeid,uniqid,mode,pfsgroup,lifetime,pinghost,descr,protocol";
 
         // 1-on-1 copy
         foreach (explode(",", $copy_fields) as $fieldname) {
@@ -814,8 +812,7 @@ endif; ?>
     <?php
     foreach (array('esp' => 'ESP','ah' => 'AH') as $proto => $protoname) :
     ?>
-    <option value="<?=$proto;
-?>" <?= $proto == $pconfig['protocol'] ? "selected=\"selected\"" : "";?>>
+    <option value="<?=$proto;?>" <?= $proto == $pconfig['protocol'] ? "selected=\"selected\"" : "";?>>
         <?=$protoname;?>
     </option>
     <?php