X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fcaptive.cgi;h=9851aba70d89ebf46f3bad243b913b3bc86490d7;hp=a89039265a12283cb9089abe703bd92a4a0f6b33;hb=e2752bfe719b51b1cb2f9153b8ddfab5d4483938;hpb=9735e1670aa846e8e022a88260943bfc348927fc diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index a89039265a..9851aba70d 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); @@ -58,7 +61,7 @@ unless (-e $voucherout) { system("touch $voucherout"); } #actions if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ - my $file = $cgiparams{'uploaded_file'}; + my $file = $cgiparams{'logo'}; if ($file){ #Check if extension is png chomp $file; @@ -74,29 +77,22 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ $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); @@ -119,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; @@ -135,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; } @@ -154,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; @@ -266,25 +262,13 @@ END print "$Lang::tr{'Captive active on'} Blue"; } - print< - -
- $Lang::tr{'Captive title'} - -
- - - -END -; - print< -
+ $Lang::tr{'Captive authentication'} -
+ + + + $Lang::tr{'Captive client session expiry time'} + + + + END } - #Logo Upload - print "
$Lang::tr{'Captive logo_upload'}
$Lang::tr{'Captive logo_upload1'}
"; - #Show Logo in webinterface with 1/2 size if set - if (-f "$logopath/logo.png"){ - print"$Lang::tr{'Captive logo_set'}"; - print"$logopath/logo.png"; - }else{ - print"$Lang::tr{'Captive logo_set'}"; - print"
$Lang::tr{'no'}"; - } -print< + +
+ $Lang::tr{'Captive branding'} + + + + + $Lang::tr{'Captive title'} + + + + + $Lang::tr{'Captive brand color'} +END + # Logo Upload + print < + $Lang::tr{'Captive logo_upload'} +
+ $Lang::tr{'Captive logo_upload1'} + + + + +END + + if (-e $logo) { + print < + $Lang::tr{'Captive logo uploaded'} + $Lang::tr{'yes'} + +END + } + + print < + - + - -

+ END -; - print ""; &Header::closebox(); - #if settings is set to use vouchers, the voucher part has to be displayed - if ($settings{'AUTH'} eq 'VOUCHER'){ - &voucher(); + #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(); @@ -364,9 +394,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'}
"; @@ -435,11 +464,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(){ @@ -451,11 +487,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; @@ -474,7 +510,7 @@ END } print ""; + print ""; $count++; } @@ -482,27 +518,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){ @@ -513,11 +548,11 @@ END print" "; } - print ""; + print ""; print ""; print ""; - print ""; - print ""; + print ""; + print ""; $count++; } @@ -525,8 +560,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; @@ -534,10 +569,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) @@ -560,7 +595,7 @@ END print ""; + print ""; $count++; }
$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 "