From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 1 May 2017 10:47:04 +0000 (+0100)
Subject: captive: Fix some template updates that I forgot
X-Git-Tag: v2.19-core115~60^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b0679cc89926ccd7e6f8b42e4a20dd3b3c4e371;p=ipfire-2.x.git

captive: Fix some template updates that I forgot

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

diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
index 597d530144..963b890e8c 100755
--- a/html/cgi-bin/captive/index.cgi
+++ b/html/cgi-bin/captive/index.cgi
@@ -142,9 +142,12 @@ my $tmpl = HTML::Template->new(
 
 $tmpl->param(REDIRECT_URL => $url);
 
-# Voucher
+# Coupon
 if ($settings{'AUTH'} eq "COUPON") {
 	$tmpl->param(COUPON => 1);
+	$tmpl->param(L_HEADING => $Lang::tr{'Captive coupon'});
+} else {
+	$tmpl->param(L_HEADING => $Lang::tr{'Captive terms'});
 }
 
 $tmpl->param(TITLE => $settings{'TITLE'});
@@ -156,9 +159,7 @@ $tmpl->param(TERMS => &getterms());
 # Some translated strings
 $tmpl->param(L_ACTIVATE        => $Lang::tr{'Captive ACTIVATE'});
 $tmpl->param(L_GAIN_ACCESS     => $Lang::tr{'Captive GAIN ACCESS'});
-$tmpl->param(L_HEADING_COUPON  => $Lang::tr{'Captive coupon'});
-$tmpl->param(L_HEADING_TERMS   => $Lang::tr{'Captive terms'});
-$tmpl->param(L_AGREE_TAC       => $Lang::tr{'Captive agree tac'});
+$tmpl->param(L_AGREE_TERMS     => $Lang::tr{'Captive agree tac'});
 
 # Print header
 print "Pragma: no-cache\n";
diff --git a/html/html/captive/template.html b/html/html/captive/template.html
index 15f9b59e1b..504920c64f 100644
--- a/html/html/captive/template.html
+++ b/html/html/captive/template.html
@@ -31,18 +31,14 @@
 						</div>
 
 						<div class="box-block">
-							<TMPL_IF NAME="VOUCHER">
-								<h4><TMPL_VAR NAME="L_HEADING_VOUCHER"></h4>
-							<TMPL_ELSE>
-								<h4><TMPL_VAR NAME="L_HEADING_TERMS"></h4>
-							</TMPL_IF>
+							<h4><TMPL_VAR NAME="L_HEADING"></h4>
 
 							<form action="" method="POST">
 								<input type="hidden" name="ACTION" value="SUBMIT">
 								<input type="hidden" name="url" value="<TMPL_VAR NAME="URL">">
 
-								<TMPL_IF NAME="VOUCHER">
-										<input class="form-text" type="text" name="VOUCHER">
+								<TMPL_IF NAME="COUPON">
+										<input class="form-text" type="text" name="COUPON">
 										<input class="form-submit" type="submit"
 											value="<TMPL_VAR NAME="L_ACTIVATE">">
 								<TMPL_ELSE>