X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fcaptive.cgi;h=6a1467752bfd6db0db0b6f0f3efc567ac88a44fc;hp=a8add4d87fbf8971c94464b9c7f7ae9c739e3ad9;hb=810198110e60d29c6ca9e73b622ab350ae9f9f82;hpb=0806170370f87f949efd327e1ad7377050b3626f diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index a8add4d87f..6a1467752b 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -31,6 +31,13 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +my %selected = (); + +my $coupons = "${General::swroot}/captive/coupons"; +my %couponhash = (); + +my $logo = "${General::swroot}/captive/logo.dat"; + my %settings=(); my %mainsettings; my %color; @@ -38,14 +45,10 @@ my %cgiparams=(); my %netsettings=(); my %checked=(); my $errormessage=''; -my $voucherout="${General::swroot}/captive/voucher_out"; my $clients="${General::swroot}/captive/clients"; -my %voucherhash=(); my %clientshash=(); my $settingsfile="${General::swroot}/captive/settings"; -my $logopath = "/srv/web/ipfire/html/captive/logo"; unless (-e $settingsfile) { system("touch $settingsfile"); } -unless (-e $voucherout) { system("touch $voucherout"); } &Header::getcgihash(\%cgiparams); @@ -56,15 +59,15 @@ unless (-e $voucherout) { system("touch $voucherout"); } &Header::showhttpheaders(); -#actions -if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ - my $file = $cgiparams{'uploaded_file'}; - if ($file){ - #Check if extension is png +if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { + my $file = $cgiparams{'logo'}; + if ($file) { + # Check if the file extension is PNG/JPEG chomp $file; + my ($name, $path, $ext) = fileparse($file, qr/\.[^.]*$/); - if ($ext ne ".png"){ - $errormessage=$Lang::tr{'Captive wrong ext'}; + if ($ext ne ".png" && $ext ne ".jpg" && $ext ne ".jpeg") { + $errormessage = $Lang::tr{'Captive wrong ext'}; } } @@ -73,41 +76,36 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ $settings{'AUTH'} = $cgiparams{'AUTH'}; $settings{'TITLE'} = $cgiparams{'TITLE'}; $settings{'UNLIMITED'} = $cgiparams{'UNLIMITED'}; + $settings{'COLOR'} = $cgiparams{'COLOR'}; + $settings{'SESSION_TIME'} = $cgiparams{'SESSION_TIME'}; if (!$errormessage){ #Check if we need to upload a new logo - if($file){ - #Save File - my ($filehandle) = CGI::upload('uploaded_file'); - open (UPLOADFILE, ">$logopath/logo.png"); + if ($file) { + # Save logo + my ($filehandle) = CGI::upload("logo"); + + # XXX check filesize + + open(FILE, ">$logo"); binmode $filehandle; - while ( <$filehandle> ) { - print UPLOADFILE; - } - close (UPLOADFILE); - - #Open file to check if dimensions are within rang - open (PNG , "<$logopath/logo.png"); - local $/; - my $PNG1=; - close(PNG); - my ($width,$height)=&pngsize($PNG1); - if($width > 1920 || $height > 800 || $width < 1280 || $height < 400){ - $errormessage.="$Lang::tr{'Captive invalid logosize'}
Filedimensions width: $width height: $height "; - unlink("$logopath/logo.png"); + while (<$filehandle>) { + print FILE; } + close(FILE); } &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"); @@ -117,8 +115,8 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ } } -if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive genvoucher'}"){ - #generates a voucher and writes it to /var/ipfire/voucher_out +if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}"){ + # Generates a new coupon #calculate expiredate my $expire; @@ -133,10 +131,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive genvoucher'}"){ if($cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'} == 0 && $cgiparams{'UNLIMITED'} == ''){ $errormessage=$Lang::tr{'Captive noexpiretime'}; } - #check if we already have a voucher with same code - &General::readhasharray("$voucherout", \%voucherhash); - foreach my $key (keys %voucherhash) { - if($voucherhash{$key}[1] eq $cgiparams{'CODE'}){ + #check if we already have a coupon with same code + &General::readhasharray($coupons, \%couponhash) if (-e $coupons); + foreach my $key (keys %couponhash) { + if($couponhash{$key}[1] eq $cgiparams{'CODE'}){ $errormessage=$Lang::tr{'Captive err doublevoucher'}; last; } @@ -152,56 +150,56 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive genvoucher'}"){ my $date=time(); #seconds in utc #first get new key from hash - my $key=&General::findhasharraykey (\%voucherhash); + my $key=&General::findhasharraykey (\%couponhash); #initialize all fields with '' - foreach my $i (0 .. 3) { $voucherhash{$key}[$i] = "";} + foreach my $i (0 .. 3) { $couponhash{$key}[$i] = "";} #define fields - $voucherhash{$key}[0] = $date; - $voucherhash{$key}[1] = $cgiparams{'CODE'}; - $voucherhash{$key}[2] = $settings{'EXPIRE'}; - $voucherhash{$key}[3] = $cgiparams{'REMARK'}; + $couponhash{$key}[0] = $date; + $couponhash{$key}[1] = $cgiparams{'CODE'}; + $couponhash{$key}[2] = $settings{'EXPIRE'}; + $couponhash{$key}[3] = $cgiparams{'REMARK'}; #write values to disk - &General::writehasharray("$voucherout", \%voucherhash); + &General::writehasharray($coupons, \%couponhash); #now prepare log entry, get expiring date for voucher and decode remark for logfile - my $expdate=localtime(time()+$voucherhash{$key}[3]); - my $rem=HTML::Entities::decode_entities($voucherhash{$key}[4]); + my $expdate=localtime(time()+$couponhash{$key}[3]); + my $rem=HTML::Entities::decode_entities($couponhash{$key}[4]); #write logfile entry - &General::log("Captive", "Generated new voucher $voucherhash{$key}[1] $voucherhash{$key}[2] hours valid expires on $expdate remark $rem"); + &General::log("Captive", "Generated new coupon $couponhash{$key}[1] $couponhash{$key}[2] hours valid expires on $expdate remark $rem"); } } -if ($cgiparams{'ACTION'} eq 'delvoucherout'){ +if ($cgiparams{'ACTION'} eq 'delete-coupon') { #deletes an already generated but unused voucher #read all generated vouchers - &General::readhasharray("$voucherout", \%voucherhash); - foreach my $key (keys %voucherhash) { - if($cgiparams{'key'} eq $voucherhash{$key}[0]){ + &General::readhasharray($coupons, \%couponhash) if (-e $coupons); + foreach my $key (keys %couponhash) { + if($cgiparams{'key'} eq $couponhash{$key}[0]){ #write logenty with decoded remark - my $rem=HTML::Entities::decode_entities($voucherhash{$key}[4]); - &General::log("Captive", "Delete unused voucher $voucherhash{$key}[1] $voucherhash{$key}[2] hours valid expires on $voucherhash{$key}[3] remark $rem"); + my $rem=HTML::Entities::decode_entities($couponhash{$key}[4]); + &General::log("Captive", "Delete unused coupon $couponhash{$key}[1] $couponhash{$key}[2] hours valid expires on $couponhash{$key}[3] remark $rem"); #delete line from hash - delete $voucherhash{$key}; + delete $couponhash{$key}; last; } } #write back hash - &General::writehasharray("$voucherout", \%voucherhash); + &General::writehasharray($coupons, \%couponhash); } -if ($cgiparams{'ACTION'} eq 'delvoucherinuse'){ +if ($cgiparams{'ACTION'} eq 'delete-client') { #delete voucher and connection in use #read all active clients - &General::readhasharray("$clients", \%clientshash); + &General::readhasharray($clients, \%clientshash) if (-e $clients); foreach my $key (keys %clientshash) { if($cgiparams{'key'} eq $clientshash{$key}[0]){ #prepare log entry with decoded remark my $rem=HTML::Entities::decode_entities($clientshash{$key}[7]); #write logentry - &General::log("Captive", "Delete voucher in use $clientshash{$key}[1] $clientshash{$key}[2] hours valid expires on $clientshash{$key}[3] remark $rem - Connection will be terminated"); + &General::log("Captive", "Deleted client in use $clientshash{$key}[1] $clientshash{$key}[2] hours valid expires on $clientshash{$key}[3] remark $rem - Connection will be terminated"); #delete line from hash delete $clientshash{$key}; last; @@ -217,139 +215,167 @@ if ($cgiparams{'ACTION'} eq 'delvoucherinuse'){ &Header::openpage($Lang::tr{'Captive menu'}, 1, ''); &Header::openbigbox(); -#call error() to see if we have to print an errormessage on website -&error(); - -#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 ); +# If an error message exists, show a box with the error message +if ($errormessage) { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print $errormessage; + &Header::closebox(); } -sub config(){ - #prints the config box on the website - &Header::openbox('100%', 'left', $Lang::tr{'Captive config'}); - print <\n +# Prints the config box on the website +&Header::openbox('100%', 'left', $Lang::tr{'Captive config'}); +print <\n END ; - #check which parameters have to be enabled (from settings file) - $checked{'ENABLE_GREEN'}{'off'} = ''; - $checked{'ENABLE_GREEN'}{'on'} = ''; - $checked{'ENABLE_GREEN'}{$settings{'ENABLE_GREEN'}} = "checked='checked'"; - $checked{'ENABLE_BLUE'}{'off'} = ''; - $checked{'ENABLE_BLUE'}{'on'} = ''; - $checked{'ENABLE_BLUE'}{$settings{'ENABLE_BLUE'}} = "checked='checked'"; +#check which parameters have to be enabled (from settings file) +$checked{'ENABLE_GREEN'}{'off'} = ''; +$checked{'ENABLE_GREEN'}{'on'} = ''; +$checked{'ENABLE_GREEN'}{$settings{'ENABLE_GREEN'}} = "checked='checked'"; - $checked{'UNLIMITED'}{'off'} = ''; - $checked{'UNLIMITED'}{'on'} = ''; - $checked{'UNLIMITED'}{$settings{'UNLIMITED'}} = "checked='checked'"; +$checked{'ENABLE_BLUE'}{'off'} = ''; +$checked{'ENABLE_BLUE'}{'on'} = ''; +$checked{'ENABLE_BLUE'}{$settings{'ENABLE_BLUE'}} = "checked='checked'"; - if ($netsettings{'GREEN_DEV'}){ - print ""; - } - if ($netsettings{'BLUE_DEV'}){ - print ""; - } +$checked{'UNLIMITED'}{'off'} = ''; +$checked{'UNLIMITED'}{'on'} = ''; +$checked{'UNLIMITED'}{$settings{'UNLIMITED'}} = "checked='checked'"; - print< - - "; +} +if ($netsettings{'BLUE_DEV'}){ + print ""; +} + +print< + + - - + END ; -print< + - -END -; - &agbbox(); - - #Logo Upload - print ""; - #Show Logo in webinterface with 1/2 size if set - if (-f "$logopath/logo.png"){ - print""; - print""; - }else{ - print""; - print""; - } -print< + - -
$Lang::tr{'Captive active on'} Green
$Lang::tr{'Captive active on'} Blue

- $Lang::tr{'Captive title'} +$selected{'AUTH'} = (); +$selected{'AUTH'}{'COUPON'} = ""; +$selected{'AUTH'}{'TERMS'} = ""; +$selected{'AUTH'}{$settings{'AUTH'}} = "selected"; + +if ($netsettings{'GREEN_DEV'}){ + print "		$Lang::tr{'Captive active on'} Green
$Lang::tr{'Captive active on'} Blue
+ $Lang::tr{'Captive authentication'}
- + 		+
- $Lang::tr{'Captive authentication'} - -
$Lang::tr{'Captive logo_upload'}
$Lang::tr{'Captive logo_upload1'}
$Lang::tr{'Captive logo_set'}$logopath/logo.png
$Lang::tr{'Captive logo_set'}
$Lang::tr{'no'}
$Lang::tr{'Captive client session expiry time'} - - +
-

END -; - print ""; - - &Header::closebox(); - - #if settings is set to use vouchers, the voucher part has to be displayed - if ($settings{'AUTH'} eq 'VOUCHER'){ - &voucher(); - }else{ - #otherwise we show the licensepart - &show_license_connections(); - } } -sub agbbox(){ - &getagb(); -print< + +
+ $Lang::tr{'Captive branding'} + + - License agreement + $Lang::tr{'Captive title'} -
- + + + + + $Lang::tr{'Captive brand color'} + + + + + + + $Lang::tr{'Captive upload logo'} + + + +
$Lang::tr{'Captive upload logo recommendations'} END -; + +if (-e $logo) { + print < + $Lang::tr{'Captive logo uploaded'} + $Lang::tr{'yes'} + +END +} + +print < + + + + + + +END + +&Header::closebox(); + +#if settings is set to use coupons, the coupon part has to be displayed +if ($settings{'AUTH'} eq 'COUPON') { + &coupons(); +} else { + #otherwise we show the licensepart + &show_license_connections(); +} + +sub getterms() { + my @ret; + + open(FILE, "<:utf8", "/var/ipfire/captive/terms.txt"); + while() { + push(@ret, HTML::Entities::decode_entities($_)); + } + close(FILE); + + return join(/\n/, @ret); } sub gencode(){ @@ -360,9 +386,8 @@ sub gencode(){ return $randomstring; } -sub voucher(){ - #show voucher part - &Header::openbox('100%', 'left', $Lang::tr{'Captive genvoucher'}); +sub coupons() { + &Header::openbox('100%', 'left', $Lang::tr{'Captive generate coupon'}); print "
"; print ""; print ""; print "

$Lang::tr{'Captive vouchervalid'}
"; @@ -431,11 +456,18 @@ sub voucher(){ print "

$Lang::tr{'remark'}
 


"; $cgiparams{'CODE'} = &gencode(); - print "
"; + print "
"; &Header::closebox(); - if (! -z $voucherout) { &show_voucher_out();} - if (! -z $clients) { &show_voucher_in_use();} + + # Show all coupons if exist + if (! -z $coupons) { + &show_coupons(); + } + + if (! -z $clients) { + &show_clients(); + } } sub show_license_connections(){ @@ -447,11 +479,11 @@ sub show_license_connections(){ print< - + END ; #read all clients from hash and show table - &General::readhasharray("$clients", \%clientshash); + &General::readhasharray($clients, \%clientshash) if (-e $clients); foreach my $key (keys %clientshash){ my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2])); my $endtime; @@ -470,7 +502,7 @@ END } print ""; + print ""; $count++; } @@ -478,27 +510,26 @@ END &Header::closebox(); } -sub show_voucher_out(){ - #if there are already generated but unsused vouchers, print a table - return if ( -z $voucherout); +sub show_coupons() { + #if there are already generated but unsused coupons, print a table my $count=0; my $col; &Header::openbox('100%', 'left', $Lang::tr{'Captive vout'}); print<
$Lang::tr{'Captive voucher'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expire'}$Lang::tr{'Captive mac'}$Lang::tr{'delete'}
$Lang::tr{'Captive coupon'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expire'}$Lang::tr{'Captive mac'}$Lang::tr{'delete'}
$clientshash{$key}[4]
$starttime "; print "
$endtime "; - print "
$clientshash{$key}[0]
$clientshash{$key}[0]
- + END ; - &General::readhasharray("$voucherout", \%voucherhash); - foreach my $key (keys %voucherhash) + &General::readhasharray($coupons, \%couponhash) if (-e $coupons); + foreach my $key (keys %couponhash) { - my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($voucherhash{$key}[0])); + my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($couponhash{$key}[0])); my $endtime; - if ($voucherhash{$key}[2] eq '0'){ + if ($couponhash{$key}[2] eq '0'){ $endtime=$Lang::tr{'Captive nolimit'}; }else{ - $endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime(time()+$voucherhash{$key}[2])); + $endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime(time()+$couponhash{$key}[2])); } if ($count % 2){ @@ -509,11 +540,11 @@ END print" "; } - print ""; + print ""; print ""; print ""; - print ""; - print ""; + print ""; + print ""; $count++; } @@ -521,8 +552,8 @@ END &Header::closebox(); } -sub show_voucher_in_use(){ - #if there are active clients which use vouchers show table +sub show_clients() { + #if there are active clients which use coupons show table return if ( -z $clients || ! -f $clients ); my $count=0; my $col; @@ -530,10 +561,10 @@ sub show_voucher_in_use(){ print<
$Lang::tr{'Captive voucher'}$Lang::tr{'date'}$Lang::tr{'Captive expire'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$Lang::tr{'Captive coupon'}$Lang::tr{'date'}$Lang::tr{'Captive expire'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$voucherhash{$key}[1]
$couponhash{$key}[1]
$starttime
$endtime
$voucherhash{$key}[3]
$couponhash{$key}[3]
- + END ; - &General::readhasharray("$clients", \%clientshash); + &General::readhasharray($clients, \%clientshash) if (-e $clients); foreach my $key (keys %clientshash) { #calculate time from clientshash (starttime) @@ -556,7 +587,7 @@ END print ""; + print ""; $count++; } @@ -584,29 +615,5 @@ sub validremark return 1; } -sub pngsize { - my $Buffer = shift; - my ($width,$height) = ( undef, undef ); - - if ($Buffer =~ /IHDR(.{8})/) { - my $PNG = $1; - ($width,$height) = unpack( "NN", $PNG ); - } else { - $width="invalid"; - $height= "invalid"; - }; - return ($width,$height); -} - -sub error{ - #if an errormessage exits, show a box with errormessage - if ($errormessage) { - &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); - print "$errormessage\n"; - print " \n"; - &Header::closebox(); - } -} - &Header::closebigbox(); &Header::closepage();
$Lang::tr{'Captive voucher'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expire'}$Lang::tr{'Captive mac'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$Lang::tr{'Captive coupon'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expire'}$Lang::tr{'Captive mac'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$clientshash{$key}[4]
$starttime "; print "
$endtime
$clientshash{$key}[0]
$clientshash{$key}[5]
"; - print "