This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, core115 has been updated via 1c1babf44bf3524726c098d787e4a01eb81950d6 (commit) via af6c5929b0034f0d9e802acaf83bfa36a7cea901 (commit) via f32174956eb8dc6d961c0fe09796e092b6846ae4 (commit) via 3a62dca68e411e90565ab4c9654cae88e56dcfdd (commit) via 440cd2cbfdfb2d386c200a05deb14fcd3a7cb1e6 (commit) from 7207d80c4ecf070495b3d3e65c9f50dfad6d6a1a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 1c1babf44bf3524726c098d787e4a01eb81950d6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 15:11:14 2017 +0200

captive: Fix localisations

Voucher was used instead of coupon in English, and Coupon was used instead of Gutschein in German.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit af6c5929b0034f0d9e802acaf83bfa36a7cea901 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 15:05:53 2017 +0200

captive: Simplify coupon time selection

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit f32174956eb8dc6d961c0fe09796e092b6846ae4 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 12:43:42 2017 +0100

captive: Reindent code for better readability

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 3a62dca68e411e90565ab4c9654cae88e56dcfdd Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 12:41:17 2017 +0100

captive: Localise GREEN/BLUE

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 440cd2cbfdfb2d386c200a05deb14fcd3a7cb1e6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 12:29:22 2017 +0100

Rootfile update

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/perl-Font-TTF | 6 +- config/rootfiles/common/perl-IO-String | 4 +- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 8 +- doc/language_issues.fr | 8 +- doc/language_issues.it | 8 +- doc/language_issues.nl | 8 +- doc/language_issues.pl | 8 +- doc/language_issues.ru | 8 +- doc/language_issues.tr | 8 +- doc/language_missings | 28 ++++- html/cgi-bin/captive.cgi | 220 ++++++++++++++------------------- langs/de/cgi-bin/de.pl | 17 ++- langs/en/cgi-bin/en.pl | 17 ++- 15 files changed, 191 insertions(+), 159 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/perl-Font-TTF b/config/rootfiles/common/perl-Font-TTF index e5d01b0..e21941c 100644 --- a/config/rootfiles/common/perl-Font-TTF +++ b/config/rootfiles/common/perl-Font-TTF @@ -82,9 +82,9 @@ usr/lib/perl5/site_perl/5.12.3/Font/TTF/Woff/MetaData.pm usr/lib/perl5/site_perl/5.12.3/Font/TTF/Woff/PrivateData.pm usr/lib/perl5/site_perl/5.12.3/Font/TTF/XMLparse.pm #usr/lib/perl5/site_perl/5.12.3/ttfmod.pl -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Font -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Font/TTF -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Font/TTF/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Font +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Font/TTF +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Font/TTF/.packlist #usr/share/man/man3/Font::TTF.3 #usr/share/man/man3/Font::TTF::AATKern.3 #usr/share/man/man3/Font::TTF::AATutils.3 diff --git a/config/rootfiles/common/perl-IO-String b/config/rootfiles/common/perl-IO-String index e0b5944..89be911 100644 --- a/config/rootfiles/common/perl-IO-String +++ b/config/rootfiles/common/perl-IO-String @@ -1,4 +1,4 @@ usr/lib/perl5/site_perl/5.12.3/IO/String.pm -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/IO/String -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/IO/String/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/IO/String +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/IO/String/.packlist #usr/share/man/man3/IO::String.3 diff --git a/doc/language_issues.de b/doc/language_issues.de index f5d6d36..0443130 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -14,6 +14,7 @@ WARNING: translation string unused: Captive ip WARNING: translation string unused: Captive logo_set WARNING: translation string unused: Captive logo_upload WARNING: translation string unused: Captive logo_upload1 +WARNING: translation string unused: Captive noexpiretime WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive time WARNING: translation string unused: Captive voactive diff --git a/doc/language_issues.en b/doc/language_issues.en index 1a22e28..eebb5d6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -14,6 +14,7 @@ WARNING: translation string unused: Captive invalid logosize 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 noexpiretime WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive please enter a coupon code WARNING: translation string unused: Captive time diff --git a/doc/language_issues.es b/doc/language_issues.es index 38cf210..4ade5d5 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -635,12 +635,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -813,6 +813,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1059,6 +1060,7 @@ WARNING: untranslated string: notice WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1180,6 +1182,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 351d8a2..eae0337 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -644,12 +644,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -822,6 +822,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1077,6 +1078,7 @@ WARNING: untranslated string: ntp sync WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1193,6 +1195,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.it b/doc/language_issues.it index 36af273..13508b6 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -712,12 +712,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -774,6 +774,7 @@ WARNING: untranslated string: firewall graph port WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port +WARNING: untranslated string: four hours WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon WARNING: untranslated string: fwdfw limitconcon @@ -848,6 +849,7 @@ WARNING: untranslated string: none WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: outgoing compression in bytes per second WARNING: untranslated string: outgoing overhead in bytes per second WARNING: untranslated string: ovpn add conf @@ -862,6 +864,8 @@ WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain WARNING: untranslated string: search +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 91fca78..74590a2 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -708,12 +708,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -787,6 +787,7 @@ WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country +WARNING: untranslated string: four hours WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon WARNING: untranslated string: fwdfw limitconcon @@ -880,6 +881,7 @@ WARNING: untranslated string: not a valid dh key WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: outgoing compression in bytes per second WARNING: untranslated string: outgoing overhead in bytes per second WARNING: untranslated string: ovpn add conf @@ -908,6 +910,8 @@ WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ta key +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 38cf210..4ade5d5 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -635,12 +635,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -813,6 +813,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1059,6 +1060,7 @@ WARNING: untranslated string: notice WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1180,6 +1182,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 25227c4..6468d5f 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -637,12 +637,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -807,6 +807,7 @@ WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first WARNING: untranslated string: flag +WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -1061,6 +1062,7 @@ WARNING: untranslated string: notice WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used WARNING: untranslated string: openvpn fragment allowed with udp @@ -1175,6 +1177,8 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 733c664..ade6c89 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -720,12 +720,12 @@ WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupon +WARNING: untranslated string: Captive generate coupons +WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -750,6 +750,7 @@ WARNING: untranslated string: firewall graph port WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port +WARNING: untranslated string: four hours WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: guardian @@ -795,10 +796,13 @@ WARNING: untranslated string: no data WARNING: untranslated string: one hour WARNING: untranslated string: one month WARNING: untranslated string: one week +WARNING: untranslated string: one year WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: twelve hours +WARNING: untranslated string: two weeks WARNING: untranslated string: unlimited WARNING: untranslated string: uplink bit rate WARNING: untranslated string: vpn broken diff --git a/doc/language_missings b/doc/language_missings index 64c184d..2fc918c 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -58,7 +58,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -230,6 +231,7 @@ < first < flag < forward firewall +< four hours < fw default drop < fwdfw ACCEPT < fwdfw action @@ -490,6 +492,7 @@ < ntp common settings < ntp sync < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -610,6 +613,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all @@ -755,7 +760,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -926,6 +932,7 @@ < first < flag < forward firewall +< four hours < fw default drop < fwdfw ACCEPT < fwdfw action @@ -1174,6 +1181,7 @@ < not a valid dh key < notice < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -1312,6 +1320,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all @@ -1434,7 +1444,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -1597,6 +1608,7 @@ < first < flag < forward firewall +< four hours < fw default drop < fwdfw ACCEPT < fwdfw action @@ -1855,6 +1867,7 @@ < not a valid dh key < notice < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -1977,6 +1990,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all @@ -2100,7 +2115,8 @@ < Captive expiry time < Captive export coupons < Captive GAIN ACCESS -< Captive generate coupon +< Captive generate coupons +< Captive generated coupon no < Captive genvoucher < Captive invalid logosize < Captive invalid_voucher @@ -2266,6 +2282,7 @@ < first < flag < forward firewall +< four hours < frequency < fw default drop < fwdfw ACCEPT @@ -2528,6 +2545,7 @@ < not a valid dh key < notice < Number of Countries for the pie chart +< one year < openvpn default < openvpn destination port used < openvpn disabled @@ -2647,6 +2665,8 @@ < tor traffic limit soft < tor traffic read written < tor use exit nodes +< twelve hours +< two weeks < unblock < unblock all < uncheck all diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index c595c0e..242549d 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -34,6 +34,19 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl";

+my %session_times = ( + 3600 => $Lang::tr{'one hour'}, + 14400 => $Lang::tr{'four hours'}, + 28800 => $Lang::tr{'eight hours'}, + 43200 => $Lang::tr{'twelve hours'}, + 86400 => $Lang::tr{'24 hours'}, + 604800 => $Lang::tr{'one week'}, + 1209600 => $Lang::tr{'two weeks'}, + 18144000 => $Lang::tr{'one month'}, + 31536000 => $Lang::tr{'one year'}, + 0 => "- $Lang::tr{'unlimited'} -", +); + my %selected = ();

my $coupons = "${General::swroot}/captive/coupons"; @@ -129,12 +142,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { } }

-if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") { - # Check expiry time - if ($cgiparams{'EXP_HOUR'} + $cgiparams{'EXP_DAY'} + $cgiparams{'EXP_WEEK'} + $cgiparams{'EXP_MONTH'} == 0 && $cgiparams{'UNLIMITED'} == '') { - $errormessage = $Lang::tr{'Captive noexpiretime'}; - } - +if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupons'}") { #check valid remark if ($cgiparams{'REMARK'} ne '' && !&validremark($cgiparams{'REMARK'})){ $errormessage=$Lang::tr{'fwhost err remark'}; @@ -142,7 +150,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") {

if (!$errormessage) { # Remember selected values - foreach my $val (("UNLIMITED", "EXP_HOUR", "EXP_DAY", "EXP_WEEK", "EXP_MONTH")) { + foreach my $val (("SESSION_TIME", "COUNT", "REMARK")) { $settings{$val} = $cgiparams{$val}; } &General::writehash($settingsfile, %settings); @@ -150,17 +158,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") { &General::readhasharray($coupons, %couponhash) if (-e $coupons); my $now = time();

- # Calculate expiry time in seconds - my $expires = 0; + # Expiry time in seconds + my $expires = $settings{'SESSION_TIME'};

- if ($settings{'UNLIMITED'} ne 'on') { - $expires += $settings{'EXP_HOUR'}; - $expires += $settings{'EXP_DAY'}; - $expires += $settings{'EXP_WEEK'}; - $expires += $settings{'EXP_MONTH'}; - } - - my $count = $cgiparams{'COUNT'} || 1; + my $count = $settings{'COUNT'} || 1; while($count-- > 0) { # Generate a new code my $code = &gencode(); @@ -186,7 +187,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") { $couponhash{$key}[0] = $now; $couponhash{$key}[1] = $code; $couponhash{$key}[2] = $expires; - $couponhash{$key}[3] = $cgiparams{'REMARK'}; + $couponhash{$key}[3] = $settings{'REMARK'}; }

# Save everything to disk @@ -251,7 +252,6 @@ if ($errormessage) { print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}' enctype="multipart/form-data">\n <table width='100%' border="0"> - <tr> END ;

@@ -274,14 +274,34 @@ $selected{'AUTH'}{'TERMS'} = ""; $selected{'AUTH'}{$settings{'AUTH'}} = "selected";

if ($netsettings{'GREEN_DEV'}){ - print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourgreen'>Green</font></td><td><input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} /></td></tr>"; + print <<END; + <tr> + <td width='30%'> + $Lang::tr{'Captive active on'} + <font color='$Header::colourgreen'>$Lang::tr{'green'}</font> + </td> + <td> + <input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} /> + </td> + </tr> +END } + if ($netsettings{'BLUE_DEV'}){ - print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourblue'>Blue</font></td><td><input type='checkbox' name='ENABLE_BLUE' $checked{'ENABLE_BLUE'}{'on'} /></td></tr>"; + print <<END; + <tr> + <td width='30%'> + $Lang::tr{'Captive active on'} + <font color='$Header::colourblue'>$Lang::tr{'blue'}</font> + </td> + <td> + <input type='checkbox' name='ENABLE_BLUE' $checked{'ENABLE_BLUE'}{'on'} /> + </td> + </tr> +END }

print<<END - </tr> <tr> <td> $Lang::tr{'Captive authentication'} @@ -298,12 +318,9 @@ END

if ($settings{'AUTH'} eq 'TERMS') { $selected{'SESSION_TIME'} = (); - $selected{'SESSION_TIME'}{'0'} = ""; - $selected{'SESSION_TIME'}{'3600'} = ""; - $selected{'SESSION_TIME'}{'28800'} = ""; - $selected{'SESSION_TIME'}{'86400'} = ""; - $selected{'SESSION_TIME'}{'604800'} = ""; - $selected{'SESSION_TIME'}{'18144000'} = ""; + foreach my $session_time (keys %session_times) { + $selected{'SESSION_TIME'}{$session_time} = ""; + } $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected";

print <<END; @@ -311,12 +328,17 @@ if ($settings{'AUTH'} eq 'TERMS') { <td>$Lang::tr{'Captive client session expiry time'}</td> <td> <select name="SESSION_TIME"> - <option value="0" $selected{'SESSION_TIME'}{'0'}>- $Lang::tr{'unlimited'} -</option> - <option value="3600" $selected{'SESSION_TIME'}{'3600'}>$Lang::tr{'one hour'}</option> - <option value="28800" $selected{'SESSION_TIME'}{'28800'}>$Lang::tr{'eight hours'}</option> - <option value="86400" $selected{'SESSION_TIME'}{'86400'}>$Lang::tr{'24 hours'}</option> - <option value="604800" $selected{'SESSION_TIME'}{'604800'}>$Lang::tr{'one week'}</option> - <option value="18144000" $selected{'SESSION_TIME'}{'18144000'}>$Lang::tr{'one month'}</option> +END + + foreach my $session_time (sort { $a <=> $b } keys %session_times) { + print <<END; + <option value="$session_time" $selected{'SESSION_TIME'}{$session_time}> + $session_times{$session_time} + </option> +END + } + + print <<END; </select> </td> </tr> @@ -412,7 +434,14 @@ sub gencode(){ }

sub coupons() { - &Header::openbox('100%', 'left', $Lang::tr{'Captive generate coupon'}); + &Header::openbox('100%', 'left', $Lang::tr{'Captive generate coupons'}); + + $selected{'SESSION_TIME'} = (); + foreach my $session_time (keys %session_times) { + $selected{'SESSION_TIME'}{$session_time} = ""; + } + $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected"; + print <<END; <form method='post' action='$ENV{'SCRIPT_NAME'}'> <table border='0' width='100%'> @@ -421,108 +450,51 @@ sub coupons() { $Lang::tr{'Captive vouchervalid'} </td> <td width='70%'> - <table class='tbl' border='0' width='100%'> - <tr> - <th>$Lang::tr{'hours'}</th> - <th>$Lang::tr{'days'}</th> - <th>$Lang::tr{'weeks'}</th> - <th>$Lang::tr{'months'}</th> - <th></th> - </tr> + <select name="SESSION_TIME"> END

- #print hour-dropdownbox - my $hrs=3600; - print "<tr height='40px'><td><select name='EXP_HOUR' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_HOUR'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<25; $i++){ - my $exp_sec = $i * $hrs; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_HOUR'} eq $exp_sec); - print ">$i</option>"; - } - print "</td><td>"; - - #print day-dropdownbox - my $days=3600*24; - print "<select name='EXP_DAY' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_DAY'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<8; $i++){ - my $exp_sec = $i * $days; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_DAY'} eq $exp_sec); - print ">$i</option>"; - } - print "</td><td>"; - - #print week-dropdownbox - my $week=3600*24*7; - print "<select name='EXP_WEEK' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_WEEK'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<5; $i++){ - my $exp_sec = $i * $week; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_WEEK'} eq $exp_sec); - print ">$i</option>"; - } - print "</td><td>"; - - #print month-dropdownbox - my $month=3600*24*30; - print "<select name='EXP_MONTH' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_MONTH'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<13; $i++){ - my $exp_sec = $i * $month; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_MONTH'} eq $exp_sec); - print ">$i</option>"; - } + foreach my $session_time (sort { $a <=> $b } keys %session_times) { print <<END; - </td> - <td> - <label> - <input type='checkbox' name='UNLIMITED' $checked{'UNLIMITED'}{'on'} /> - $Lang::tr{'Captive nolimit'} - </label> - </td> - </tr> - </table> + <option value="$session_time" $selected{'SESSION_TIME'}{$session_time}> + $session_times{$session_time} + </option> +END + } + + print <<END; + </select> </td> </tr> <tr> <td>$Lang::tr{'remark'}</td> <td> - <input type='text' style='width: 98%;' name='REMARK' align='left'> + <input type='text' name='REMARK' size=40> + </td> + </tr> + <tr> + <td>$Lang::tr{'Captive generated coupon no'}</td> + <td> + <select name="COUNT"> + <option value="1">1</option> + <option value="2">2</option> + <option value="3">3</option> + <option value="4">4</option> + <option value="5">5</option> + <option value="6">6</option> + <option value="7">7</option> + <option value="8">8</option> + <option value="9">9</option> + <option value="10">10</option> + <option value="20">20</option> + <option value="50">50</option> + <option value="100">100</option> + </select> </td> </tr> </table>

<div align="right"> - <select name="COUNT"> - <option value="1">1</option> - <option value="2">2</option> - <option value="3">3</option> - <option value="4">4</option> - <option value="5">5</option> - <option value="6">6</option> - <option value="7">7</option> - <option value="8">8</option> - <option value="9">9</option> - <option value="10">10</option> - <option value="20">20</option> - <option value="50">50</option> - <option value="100">100</option> - </select> - - <input type="submit" name="ACTION" value="$Lang::tr{'Captive generate coupon'}"> + <input type="submit" name="ACTION" value="$Lang::tr{'Captive generate coupons'}"> </div> </form> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 1398329..6dff5d7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -12,7 +12,7 @@ 'Captive 1week' => '1 Woche', 'Captive ACTIVATE' => 'AKTIVIEREN', 'Captive GAIN ACCESS' => 'ZUGANG', -'Captive WiFi coupon' => 'WLAN-Coupon', +'Captive WiFi coupon' => 'WLAN-Gutschein', 'Captive activate' => 'Aktivieren', 'Captive activated' => 'Aktiviert', 'Captive active on' => 'Aktiviert auf', @@ -25,17 +25,18 @@ 'Captive client session expiry time' => 'Ablaufzeit', 'Captive clients' => 'Clients', 'Captive config' => 'Konfiguration', -'Captive coupon' => 'Coupon', +'Captive coupon' => 'Gutschein', 'Captive err doublevoucher' => 'Ein Gutschein mit diesem Code ist bereits im Umlauf', 'Captive expire' => 'Ablauf', 'Captive expiry time' => 'Ablaufzeit', -'Captive export coupons' => 'Coupons exportieren', -'Captive generate coupon' => 'Coupon generieren', +'Captive export coupons' => 'Gutscheine exportieren', +'Captive generate coupons' => 'Gutscheine generieren', +'Captive generated coupon no' => 'Anzahl der generierten Gutscheine', 'Captive genvoucher' => 'Gutschein generieren', 'Captive invalid logosize' => 'Die hochgeladene Datei entspricht nicht der vorgegeben Auflösung von mindestens 1280x400 und maximal 1920x800 Pixeln', 'Captive invalid_voucher' => 'Dieser Code ist ungültig. Bitte versuchen Sie es erneut', 'Captive ip' => 'IP-Addresse', -'Captive issued coupons' => 'Ausgestellte Coupons', +'Captive issued coupons' => 'Ausgestellte Gutscheine', 'Captive logo uploaded' => 'Logo hochgeladen', 'Captive logo_set' => 'Aktuelles Logo', 'Captive logo_upload' => 'Logo hochladen', @@ -47,7 +48,7 @@ 'Captive nr' => 'Nummer', 'Captive please accept the terms and conditions' => 'Bitte akzeptieren Sie die Bedingungen', 'Captive portal' => 'IPFire Captive-Portal', -'Captive portal coupons' => 'Captive-Portal-Coupons', +'Captive portal coupons' => 'Captive-Portal-Gutscheine', 'Captive terms' => 'Bedingungen', 'Captive terms short' => 'Bedingungen', 'Captive time' => 'Erlaubter Nutzungszeitraum nach Aktivierung (Stunden)', @@ -1030,6 +1031,7 @@ 'forwarding rule added' => 'Weiterleitungsregel hinzugefügt. Starte Weiterleitung neu', 'forwarding rule removed' => 'Weiterleitungsregel entfernt. Starte Weiterleitung neu', 'forwarding rule updated' => 'Weiterleitungsregel aktualisiert; starte Weiterleitung neu', +'four hours' => '4 Stunden', 'free' => 'Frei', 'free memory' => 'Freier Speicher ', 'free swap' => 'Freier Swap', @@ -1722,6 +1724,7 @@ 'ok' => 'OK', 'older' => 'Älter', 'on' => 'on', +'one year' => 'Ein Jahr', 'online help en' => 'Online-Hilfe (auf Deutsch)', 'only digits allowed in holdoff field' => 'Im Holdoff-Feld sind nur Ziffern erlaubt', 'only digits allowed in max retries field' => 'Im Feld &quot;Maximale Wiederholversuche&quot; sind nur Ziffern erlaubt.', @@ -2312,6 +2315,8 @@ 'tripwirewarningkeys' => 'ACHTUNG - Sie löschen hiermit ihre bestehenden Schlüssel, ihre Konfiguration und Datenbank und legen alles neu an.', 'tripwirewarningpolicy' => 'ACHTUNG - Ihr Policy wird neu erzeugt, anschließen wird die Datenbank neu initialisiert. Hierfür wird der Site-Key und Local-Key benötigt.', 'tuesday' => 'Dienstag', +'twelve hours' => '12 Stunden', +'two weeks' => 'Zwei Wochen', 'type' => 'Typ', 'umount' => 'Abmelden', 'umount removable media before to unplug' => 'Wechselmedien vor dem Entfernen unbedingt abmelden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 29c87db..4efff6e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -26,13 +26,14 @@ 'Captive client session expiry time' => 'Session Expiry Time', 'Captive config' => 'Settings', 'Captive coupon' => 'Coupon', -'Captive err doublevoucher' => 'A voucher with this code already exists', +'Captive err doublevoucher' => 'A coupon with this code already exists', 'Captive expire' => 'Expire', 'Captive expiry time' => 'Expiry Time', 'Captive export coupons' => 'Export Coupons', -'Captive generate coupon' => 'Generate Coupon', +'Captive generate coupons' => 'Generate Coupons', +'Captive generated coupon no' => 'Number of coupons', 'Captive heading terms' => 'Terms &amp; Conditions', -'Captive heading voucher' => 'Voucher or Access Code', +'Captive heading voucher' => 'Coupon or Access Code', 'Captive invalid coupon' => 'You entered an invalid coupon code. Please try again.', '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', @@ -56,9 +57,9 @@ 'Captive upload logo' => 'Upload Logo', 'Captive upload logo recommendations' => '(PNG or JPEG, recommended 1280x720 pixels)', 'Captive valid for' => 'Valid for', -'Captive voactive' => 'Active Vouchers', -'Captive voucher' => 'Voucher', -'Captive vouchervalid' => 'Allowed time for this voucher', +'Captive voactive' => 'Active Coupons', +'Captive voucher' => 'Coupon', +'Captive vouchervalid' => 'Allowed time for this coupon', 'Captive vout' => 'Issued Vouchers', 'Captive wrong ext' => 'Uploaded file has wrong filetype', 'Choose Rule' => 'Choose <u>one</u> of the following rules.', @@ -1058,6 +1059,7 @@ 'forwarding rule added' => 'Forwarding rule added; restarting forwarder', 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', +'four hours' => '4 Hours', 'free' => 'Free', 'free memory' => 'Free Memory ', 'free swap' => 'Free Swap', @@ -1759,6 +1761,7 @@ 'one hour' => 'One Hour', 'one month' => 'One Month', 'one week' => 'One Week', +'one year' => 'One Year', 'online help en' => 'Online help (in english)', 'only digits allowed in holdoff field' => 'Only digits allowed in holdoff field', 'only digits allowed in max retries field' => 'Only digits allowed in max retries field.', @@ -2357,6 +2360,8 @@ 'tripwirewarningkeys' => 'WARNING - This will erase your current keys, config, and database and generate them new.', 'tripwirewarningpolicy' => 'WARNING - Your policy will be rebuild, after that your database will be reinitalised. Therefor the site-key and the local-key are neeeded.', 'tuesday' => 'Tuesday', +'twelve hours' => '12 Hours', +'two weeks' => 'Two Weeks', 'type' => 'Type', 'umount' => 'Umount', 'umount removable media before to unplug' => 'Umount removable media before unplugging the device',

hooks/post-receive -- IPFire 2.x development tree