From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 28 Apr 2017 13:38:59 +0000 (+0100)
Subject: captive: Cleanup authentication selection
X-Git-Tag: v2.19-core115~60^2~35
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e7d16ea553d56ad24240f1f6fe1276ecadaa647f

captive: Cleanup authentication selection

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 10198721f4..99412074ad 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -244,6 +244,11 @@ $checked{'UNLIMITED'}{'off'} = '';
 $checked{'UNLIMITED'}{'on'} = '';
 $checked{'UNLIMITED'}{$settings{'UNLIMITED'}} = "checked='checked'";
 
+$selected{'AUTH'} = ();
+$selected{'AUTH'}{'COUPON'} = "";
+$selected{'AUTH'}{'TERMS'} = "";
+$selected{'AUTH'}{$settings{'AUTH'}} = "selected";
+
 if ($netsettings{'GREEN_DEV'}){
 	print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourgreen'>Green</font></td><td><input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} /></td></tr>";
 }
@@ -259,18 +264,8 @@ print<<END
 		</td>
 		<td>
 			<select name='AUTH'>
-END
-;
-
-print "<option value='TERMS' ";
-print " selected='selected'" if ($settings{'AUTH'} eq 'TERMS');
-print ">$Lang::tr{'Captive terms'}</option>";
-
-print "<option value='COUPON' ";
-print " selected='selected'" if ($settings{'AUTH'} eq 'COUPON');
-print ">$Lang::tr{'Captive coupon'}</option>";
-
-print<<END
+				<option value="TERMS"  $selected{'AUTH'}{'TERMS'} >$Lang::tr{'Captive terms'}</option>
+				<option value="COUPON" $selected{'AUTH'}{'COUPON'}>$Lang::tr{'Captive coupon'}</option>
 			</select>
 		</td>
 	</tr>