From: Alexander Marx Date: Thu, 4 Feb 2016 06:30:05 +0000 (+0100) Subject: Captive-Portal: SHow always licencebox in config X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41d4c6f08bd42fb0825ba1231c5abc9d6815168c;p=people%2Fms%2Fipfire-2.x.git Captive-Portal: SHow always licencebox in config Also fix index.cgi to show individual title Signed-off-by: Alexander Marx --- diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 0a16dc12b1..841f946b3c 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -28,7 +28,7 @@ use HTML::Entities(); require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; -unless (-e "${General::swroot}/captive/settings") { system("touch ${General::swroot}/captive/settings"); } + my %settings=(); my %mainsettings; my %color; @@ -42,6 +42,7 @@ my %voucherhash=(); my %clientshash=(); my $settingsfile="${General::swroot}/captive/settings"; +unless (-e $settingsfile) { system("touch $settingsfile"); } unless (-e $voucherout) { system("touch $voucherout"); } &Header::getcgihash(\%cgiparams); @@ -256,12 +257,9 @@ END END ; - if($settings{'AUTH'} eq 'LICENSE'){ - &agbbox(); - } + &agbbox(); print"$Lang::tr{'Captive vouchervalid'}"; - print "
"; print ""; diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi index dd45931996..975bd61d5f 100755 --- a/html/cgi-bin/captive/index.cgi +++ b/html/cgi-bin/captive/index.cgi @@ -168,7 +168,7 @@ print<
-

$settings{'TITLE'} +

$settings{'TITLE'}


@@ -196,7 +196,7 @@ sub voucher(){
-

LOGIN

+

$settings{'TITLE'}


$Lang::tr{'hours'}$Lang::tr{'days'}$Lang::tr{'weeks'}$Lang::tr{'months'}