webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

captive: Rename "License" mode to "Terms & Conditions"

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-04-26 12:27:35 +01:00
parent f8d35875d8
commit 9735e1670a
13 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,12 +151,12 @@ $tmpl->param(TITLE => $settings{'TITLE'});
$tmpl->param(COLOR => $settings{'COLOR'});
$tmpl->param(ERROR => $errormessage);
$tmpl->param(TAC => &gettac());
$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_TAC => $Lang::tr{'Captive heading tac'});
$tmpl->param(L_HEADING_TERMS => $Lang::tr{'Captive heading terms'});
$tmpl->param(L_HEADING_VOUCHER => $Lang::tr{'Captive heading voucher'});
$tmpl->param(L_AGREE_TAC => $Lang::tr{'Captive agree tac'});
@@ -201,20 +201,20 @@ sub getcgihash {
return;
}
sub gettac() {
my @tac = ();
sub getterms() {
my @terms = ();
open(my $handle, "<:utf8", "/var/ipfire/captive/agb.txt" ) or die("$!");
open(my $handle, "<:utf8", "/var/ipfire/captive/terms.txt");
while(<$handle>) {
$_ = HTML::Entities::decode_entities($_);
push(@tac, $_);
push(@terms, $_);
}
close($handle);
my $tac = join("\n", @tac);
my $terms = join("\n", @terms);
# Format paragraphs
$tac =~ s/\n\n/<\/p>\n<p>/g;
$terms =~ s/\n\n/<\/p>\n<p>/g;
return $tac;
return $terms;
}