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 597d5301446594a292a3b3647cb2edbdc59e38ca..963b890e8c04a16742adb6b68541c3faf7950ff2 100755 (executable)
--- 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 15f9b59e1b11e2298996751a51f304290d980e94..504920c64f482b4a2ca89c6846b3a93081847ce6 100644 (file)
--- 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>