webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

captive: Show a message when no coupon code was entered

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-05-01 12:06:11 +01:00
parent 8b0679cc89
commit aed55ef9f8
4 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/language_issues.en
View File

@@ -14,6 +14,7 @@ WARNING: translation string unused: Captive invalid_voucher
WARNING: translation string unused: Captive ip
WARNING: translation string unused: Captive logo_set
WARNING: translation string unused: Captive nr
WARNING: translation string unused: Captive please enter a coupon code
WARNING: translation string unused: Captive time
WARNING: translation string unused: Captive voactive
WARNING: translation string unused: Captive voucher

48
html/cgi-bin/captive/index.cgi
View File

@@ -78,36 +78,42 @@ if ($cgiparams{'ACTION'} eq "SUBMIT") {
if ($settings{"AUTH"} eq "COUPON") {
&General::readhasharray($coupons, \%couponhash);
# Convert coupon input to uppercase
$cgiparams{'COUPON'} = uc $cgiparams{'COUPON'};
if ($cgiparams{'COUPON'}) {
# Convert coupon input to uppercase
$cgiparams{'COUPON'} = uc $cgiparams{'COUPON'};
# Walk through all valid coupons and find the right one
my $found = 0;
foreach my $coupon (keys %couponhash) {
if ($couponhash{$coupon}[1] eq $cgiparams{'COUPON'}) {
$found = 1;
# Walk through all valid coupons and find the right one
my $found = 0;
foreach my $coupon (keys %couponhash) {
if ($couponhash{$coupon}[1] eq $cgiparams{'COUPON'}) {
$found = 1;
# Copy expiry time
$clientshash{$key}[3] = $couponhash{$coupon}[2];
# Copy expiry time
$clientshash{$key}[3] = $couponhash{$coupon}[2];
# Save coupon code
$clientshash{$key}[4] = $cgiparams{'COUPON'};
# Save coupon code
$clientshash{$key}[4] = $cgiparams{'COUPON'};
# Copy coupon remark
$clientshash{$key}[5] = $couponhash{$coupon}[3];
# Copy coupon remark
$clientshash{$key}[5] = $couponhash{$coupon}[3];
# Delete used coupon
delete $couponhash{$coupon};
&General::writehasharray($coupons, \%couponhash);
# Delete used coupon
delete $couponhash{$coupon};
&General::writehasharray($coupons, \%couponhash);
last;
last;
}
}
}
if ($found == 1) {
&General::log("Captive", "Internet access granted via coupon ($clientshash{$key}[4]) for $ip_address until $clientshash{$key}[3]");
if ($found == 1) {
&General::log("Captive", "Internet access granted via coupon ($clientshash{$key}[4]) for $ip_address until $clientshash{$key}[3]");
} else {
$errormessage = $Lang::tr{"Captive invalid coupon"};
}
# No coupon given
} else {
$errormessage = $Lang::tr{"Captive invalid coupon"};
$errormessage = $Lang::tr{"Captive please enter a coupon code"};
}
# License

10
html/html/captive/template.html
View File

@@ -38,7 +38,7 @@
<input type="hidden" name="url" value="<TMPL_VAR NAME="URL">">
<TMPL_IF NAME="COUPON">
<input class="form-text" type="text" name="COUPON">
<input class="form-text <TMPL_IF NAME="ERROR">error</TMPL_IF>" type="text" name="COUPON">
<input class="form-submit" type="submit"
value="<TMPL_VAR NAME="L_ACTIVATE">">
<TMPL_ELSE>
@@ -46,10 +46,16 @@
value="<TMPL_VAR NAME="L_GAIN_ACCESS">">
</TMPL_IF>
<TMPL_IF NAME="ERROR">
<p class="error">
<TMPL_VAR NAME="ERROR">
</p>
</TMPL_IF>
<TMPL_IF NAME="TERMS">
<div class="checkbox">
<label>
<input class="form-checkbox" type="checkbox">
<input class="form-checkbox <TMPL_IF NAME="ERROR">error</TMPL_IF>" type="checkbox">
<TMPL_VAR NAME="L_AGREE_TERMS">
</label>
</div>

1
langs/en/cgi-bin/en.pl
View File

@@ -42,6 +42,7 @@
'Captive noexpiretime' => 'No valid connection time range given',
'Captive nolimit' => 'unlimited',
'Captive nr' => 'Number',
'Captive please enter a coupon code' => 'Please enter a coupon code',
'Captive terms' => 'Terms &amp; Conditions',
'Captive terms short' => 'T&Cs',
'Captive time' => 'Access time post activation (hours)',