WARNING: translation string unused: Captive 1month
WARNING: translation string unused: Captive 1week
WARNING: translation string unused: Captive activate
+WARNING: translation string unused: Captive auth_lic
WARNING: translation string unused: Captive invalid_voucher
WARNING: translation string unused: Captive ip
WARNING: translation string unused: Captive nr
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Captive GAIN ACCESS
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: bytes
WARNING: translation string unused: Captive 1month
WARNING: translation string unused: Captive 1week
WARNING: translation string unused: Captive activate
+WARNING: translation string unused: Captive auth_lic
WARNING: translation string unused: Captive invalid_voucher
WARNING: translation string unused: Captive ip
WARNING: translation string unused: Captive nr
WARNING: untranslated string: Captive activated
WARNING: untranslated string: Captive active on
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive auth_lic
WARNING: untranslated string: Captive auth_vou
WARNING: untranslated string: Captive authentication
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive genvoucher
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
WARNING: untranslated string: Captive invalid logosize
WARNING: untranslated string: Captive logo_set
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive voucher
WARNING: untranslated string: Captive activated
WARNING: untranslated string: Captive active on
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive auth_lic
WARNING: untranslated string: Captive auth_vou
WARNING: untranslated string: Captive authentication
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive genvoucher
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
WARNING: untranslated string: Captive invalid logosize
WARNING: untranslated string: Captive logo_set
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive voucher
WARNING: untranslated string: Captive activated
WARNING: untranslated string: Captive active on
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive auth_lic
WARNING: untranslated string: Captive auth_vou
WARNING: untranslated string: Captive authentication
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive genvoucher
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
WARNING: untranslated string: Captive invalid logosize
WARNING: untranslated string: Captive logo_set
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive voucher
WARNING: untranslated string: Captive activated
WARNING: untranslated string: Captive active on
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive auth_lic
WARNING: untranslated string: Captive auth_vou
WARNING: untranslated string: Captive authentication
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive genvoucher
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
WARNING: untranslated string: Captive invalid logosize
WARNING: untranslated string: Captive logo_set
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive voucher
WARNING: untranslated string: Captive activated
WARNING: untranslated string: Captive active on
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive auth_lic
WARNING: untranslated string: Captive auth_vou
WARNING: untranslated string: Captive authentication
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive genvoucher
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
WARNING: untranslated string: Captive invalid logosize
WARNING: untranslated string: Captive logo_set
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive voucher
WARNING: untranslated string: Captive activated
WARNING: untranslated string: Captive active on
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive auth_lic
WARNING: untranslated string: Captive auth_vou
WARNING: untranslated string: Captive authentication
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive genvoucher
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
WARNING: untranslated string: Captive invalid logosize
WARNING: untranslated string: Captive logo_set
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive voucher
WARNING: untranslated string: Captive activated
WARNING: untranslated string: Captive active on
WARNING: untranslated string: Captive agree tac
-WARNING: untranslated string: Captive auth_lic
WARNING: untranslated string: Captive auth_vou
WARNING: untranslated string: Captive authentication
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive genvoucher
-WARNING: untranslated string: Captive heading tac
+WARNING: untranslated string: Captive heading terms
WARNING: untranslated string: Captive heading voucher
WARNING: untranslated string: Captive invalid logosize
WARNING: untranslated string: Captive logo_set
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
+WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive voucher
&General::writehash("$settingsfile", \%settings);
- #write Licensetext if defined
- if ($cgiparams{'AGB'}){
- $cgiparams{'AGB'} = &Header::escape($cgiparams{'AGB'});
- open( FH, ">:utf8", "/var/ipfire/captive/agb.txt" ) or die("$!");
- print FH $cgiparams{'AGB'};
- close( FH );
- $cgiparams{'AGB'}="";
+ # Save terms
+ if ($cgiparams{'TERMS'}){
+ $cgiparams{'TERMS'} = &Header::escape($cgiparams{'TERMS'});
+ open(FH, ">:utf8", "/var/ipfire/captive/terms.txt") or die("$!");
+ print FH $cgiparams{'TERMS'};
+ close(FH);
+ $cgiparams{'TERMS'} = "";
}
+
#execute binary to reload firewall rules
system("/usr/local/bin/captivectrl");
#call config() to display the configuration box
&config();
-sub getagb(){
- #open textfile from /var/ipfire/captive/agb.txt
- open( my $handle, "<:utf8", "/var/ipfire/captive/agb.txt" ) or die("$!");
- while(<$handle>){
- #read line by line and print on screen
- $cgiparams{'AGB'}.= HTML::Entities::decode_entities($_);
- }
- close( $handle );
+sub getterms(){
+ my @ret;
+
+ open(FILE, "<:utf8", "/var/ipfire/captive/terms.txt");
+ while(<FILE>) {
+ push(@ret, HTML::Entities::decode_entities($_));
+ }
+ close(FILE);
+
+ return join(/\n/, @ret);
}
sub config(){
$Lang::tr{'Captive authentication'}
</td>
<td><br>
- <select name='AUTH' style='width:8em;'>
+ <select name='AUTH'>
END
;
- print "<option value='LICENSE' ";
- print " selected='selected'" if ($settings{'AUTH'} eq 'LICENSE');
- print ">$Lang::tr{'Captive auth_lic'}</option>";
+ print "<option value='TERMS' ";
+ print " selected='selected'" if ($settings{'AUTH'} eq 'TERMS');
+ print ">$Lang::tr{'Captive terms'}</option>";
print "<option value='VOUCHER' ";
print " selected='selected'" if ($settings{'AUTH'} eq 'VOUCHER');
</tr>
END
;
- if ($settings{'AUTH'} eq 'LICENSE'){ &agbbox(); };
+ if ($settings{'AUTH'} eq 'TERMS') {
+ my $terms = &getterms();
+ print <<END;
+ <tr>
+ <td></td>
+ <td>
+ <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
+ </td>
+ </tr>
+END
+ }
#Logo Upload
print "<tr><td><br>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><br><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>";
}
}
-sub agbbox(){
- &getagb();
-print<<END
- <tr>
- <td>
- License agreement
- </td>
- <td>
- <br>
- <textarea cols="50" rows="10" name="AGB">$cgiparams{'AGB'}</textarea>
- </td>
- </tr>
-END
-;
-}
-
sub gencode(){
#generate a random code only letters from A-Z except 'O' and 0-9
my @chars = ("A".."N", "P".."Z", "0".."9");
$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'});
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;
}
<TMPL_IF NAME="VOUCHER">
<h4><TMPL_VAR NAME="L_HEADING_VOUCHER"></h4>
<TMPL_ELSE>
- <h4><TMPL_VAR NAME="L_HEADING_TAC"></h4>
+ <h4><TMPL_VAR NAME="L_HEADING_TERMS"></h4>
</TMPL_IF>
<form action="" method="POST">
value="<TMPL_VAR NAME="L_GAIN_ACCESS">">
</TMPL_IF>
- <TMPL_IF NAME="TAC">
+ <TMPL_IF NAME="TERMS">
<div class="checkbox">
<label>
<input class="form-checkbox" type="checkbox">
- <TMPL_VAR NAME="L_AGREE_TAC">
+ <TMPL_VAR NAME="L_AGREE_TERMS">
</label>
</div>
</TMPL_IF>
</form>
</div>
- <TMPL_IF NAME="TAC">
- <TMPL_VAR NAME="TAC">
+ <TMPL_IF NAME="TERMS">
+ <TMPL_VAR NAME="TERMS">
</TMPL_IF>
</div>
</div>
'Captive err doublevoucher' => 'A voucher with this code already exists',
'Captive expire' => 'Expire',
'Captive genvoucher' => 'Generate voucher',
-'Captive heading tac' => 'Terms & Conditions',
+'Captive heading terms' => 'Terms & Conditions',
'Captive heading voucher' => 'Voucher or Access Code',
'Captive invalid logosize' => 'The uploaded image file does not meet the required resolution of at least 1280x400 but not larger than 1920x800 pixels',
'Captive invalid_voucher' => 'Invalid code. Please try again',
'Captive noexpiretime' => 'No valid connection time range given',
'Captive nolimit' => 'unlimited',
'Captive nr' => 'Number',
+'Captive terms' => 'Terms & Conditions',
'Captive time' => 'Access time post activation (hours)',
'Captive title' => 'Title of Login Page',
'Captive voactive' => 'Active Vouchers',