X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fcaptive.cgi;h=2f85b17c2febb3f04e706aac917bc71e5512a275;hp=261150400fdf410e03b8f8c588d5d62e7d68d374;hb=0a219160ac7dfe243c94c1f04c182d29206df8ec;hpb=45129439bc2b16b712f015a661af4bdfbd815f60 diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 261150400f..2f85b17c2f 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,74 +59,52 @@ unless (-e $voucherout) { system("touch $voucherout"); } &Header::showhttpheaders(); -#actions -if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ - #Check Expiretime - if($cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'} == 0 && $cgiparams{'UNLIMITED'} == ''){ - $errormessage=$Lang::tr{'Captive noexpiretime'}; - } - - 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'}; } } + + $settings{'ENABLE_GREEN'} = $cgiparams{'ENABLE_GREEN'}; + $settings{'ENABLE_BLUE'} = $cgiparams{'ENABLE_BLUE'}; + $settings{'AUTH'} = $cgiparams{'AUTH'}; + $settings{'TITLE'} = $cgiparams{'TITLE'}; + $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); } - #saves the Captiveportal settings to disk - if ($cgiparams{'UNLIMITED'} eq 'on'){ - $cgiparams{'EXP_HOUR'} = '0'; - $cgiparams{'EXP_DAY'} = '0'; - $cgiparams{'EXP_WEEK'} = '0'; - $cgiparams{'EXP_MONTH'} = '0'; - } - - $settings{'ENABLE_GREEN'} = $cgiparams{'ENABLE_GREEN'}; - $settings{'ENABLE_BLUE'} = $cgiparams{'ENABLE_BLUE'}; - $settings{'AUTH'} = $cgiparams{'AUTH'}; - $settings{'EXPIRE'} = $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'}; - $settings{'EXP_HOUR'} = $cgiparams{'EXP_HOUR'}; - $settings{'EXP_DAY'} = $cgiparams{'EXP_DAY'}; - $settings{'EXP_WEEK'} = $cgiparams{'EXP_WEEK'}; - $settings{'EXP_MONTH'} = $cgiparams{'EXP_MONTH'}; - $settings{'TITLE'} = $cgiparams{'TITLE'}; - $settings{'UNLIMITED'} = $cgiparams{'UNLIMITED'}; &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"); @@ -133,16 +114,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ } } -if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive voucherout'}"){ - #generates a voucher and writes it to /var/ipfire/voucher_out - - #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'}){ - $errormessage=$Lang::tr{'Captive err doublevoucher'}; - last; - } +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'}; } #check valid remark @@ -150,61 +125,90 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive voucherout'}"){ $errormessage=$Lang::tr{'fwhost err remark'}; } - #if no error detected, write to disk - if (!$errormessage){ - my $date=time(); #seconds in utc - - #first get new key from hash - my $key=&General::findhasharraykey (\%voucherhash); - #initialize all fields with '' - foreach my $i (0 .. 3) { $voucherhash{$key}[$i] = "";} - #define fields - $voucherhash{$key}[0] = $date; - $voucherhash{$key}[1] = $cgiparams{'CODE'}; - $voucherhash{$key}[2] = $settings{'EXPIRE'}; - $voucherhash{$key}[3] = $cgiparams{'REMARK'}; - #write values to disk - &General::writehasharray("$voucherout", \%voucherhash); - - #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]); - - #write logfile entry - &General::log("Captive", "Generated new voucher $voucherhash{$key}[1] $voucherhash{$key}[2] hours valid expires on $expdate remark $rem"); + if (!$errormessage) { + # Remember selected values + foreach my $val (("UNLIMITED", "EXP_HOUR", "EXP_DAY", "EXP_WEEK", "EXP_MONTH")) { + $settings{$val} = $cgiparams{$val}; + } + &General::writehash($settingsfile, \%settings); + + &General::readhasharray($coupons, \%couponhash) if (-e $coupons); + my $now = time(); + + # Calculate expiry time in seconds + my $expires = 0; + + 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; + while($count-- > 0) { + # Generate a new code + my $code = &gencode(); + + # Check if the coupon code already exists + foreach my $key (keys %couponhash) { + if($couponhash{$key}[1] eq $code) { + # Code already exists, so try again + $code = ""; + $count++; + last; + } + } + + next if ($code eq ""); + + # Get a new key from hash + my $key = &General::findhasharraykey(\%couponhash); + + # Initialize all fields + foreach my $i (0 .. 3) { $couponhash{$key}[$i] = ""; } + + $couponhash{$key}[0] = $now; + $couponhash{$key}[1] = $code; + $couponhash{$key}[2] = $expires; + $couponhash{$key}[3] = $cgiparams{'REMARK'}; + } + + # Save everything to disk + &General::writehasharray($coupons, \%couponhash); } } -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; @@ -220,203 +224,168 @@ 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_set'}$logopath/logo.png
$Lang::tr{'Captive logo_set'}
$Lang::tr{'no'}
$Lang::tr{'Captive vouchervalid'}"; - print "
"; - print ""; - - #print hour-dropdownbox - my $hrs=3600; - print ""; - - print ""; - - print "
$Lang::tr{'hours'}$Lang::tr{'days'}$Lang::tr{'weeks'}$Lang::tr{'months'}
"; - - #print day-dropdownbox - my $days=3600*24; - print ""; - - #print week-dropdownbox - my $week=3600*24*7; - print ""; - - #print month-dropdownbox - my $month=3600*24*30; - print "    $Lang::tr{'Captive nolimit'}
"; - -print< + 		$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(); +} + +# Show active clients +&show_clients(); + +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(){ @@ -427,157 +396,249 @@ sub gencode(){ return $randomstring; } -sub voucher(){ - #show voucher part - #calculate expiredate - my $expire; - if ($settings{'UNLIMITED'} eq 'on'){ - $expire = $Lang::tr{'Captive nolimit'}; - }else{ - $expire = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime(time()+$settings{'EXPIRE'})); - } - - &Header::openbox('100%', 'left', $Lang::tr{'Captive voucher'}); -print< - - - +sub coupons() { + &Header::openbox('100%', 'left', $Lang::tr{'Captive generate coupon'}); + print < +
$Lang::tr{'Captive voucher'}$Lang::tr{'Captive expire'}$Lang::tr{'remark'}
+ + + + +
+ $Lang::tr{'Captive vouchervalid'} + + + + + + + + + END -; - $cgiparams{'CODE'} = &gencode(); - print ""; - print "
$Lang::tr{'hours'}$Lang::tr{'days'}$Lang::tr{'weeks'}$Lang::tr{'months'}
$cgiparams{'CODE'}
$expire

"; - print "
"; - &Header::closebox(); - if (! -z $voucherout) { &show_voucher_out();} - if (! -z $clients) { &show_voucher_in_use();} -} - -sub show_license_connections(){ - #if there are active clients, show the box with active connections - return if ( -z $clients || ! -f $clients ); - my $count=0; - my $col; - &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'}); -print< - - -END -; - #read all clients from hash and show table - &General::readhasharray("$clients", \%clientshash); - 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; - if ($clientshash{$key}[3] eq '0'){ - $endtime=$Lang::tr{'Captive nolimit'}; - }else{ - $endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2]+$clientshash{$key}[3])); + #print hour-dropdownbox + my $hrs=3600; + print ""; - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - print" "; + print ""; - $count++; - } - - print "
$Lang::tr{'Captive voucher'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expire'}$Lang::tr{'Captive mac'}$Lang::tr{'delete'}
"; + + #print day-dropdownbox + my $days=3600*24; + print "
$clientshash{$key}[4]
$starttime "; - print "
$endtime "; - print "
$clientshash{$key}[0]
"; + print "
"; + + #print week-dropdownbox + my $week=3600*24*7; + print ""; + + #print month-dropdownbox + my $month=3600*24*30; + print " + +
+ + + + $Lang::tr{'remark'} + + + + + + +
+ + + +
+ +END + &Header::closebox(); + + # Show all coupons if exist + if (! -z $coupons) { + &show_coupons(); + } } -sub show_voucher_out(){ - #if there are already generated but unsused vouchers, print a table - return if ( -z $voucherout); - my $count=0; - my $col; - &Header::openbox('100%', 'left', $Lang::tr{'Captive vout'}); - print< - - +sub show_coupons() { + &General::readhasharray($coupons, \%couponhash) if (-e $coupons); + + #if there are already generated but unsused coupons, print a table + &Header::openbox('100%', 'left', $Lang::tr{'Captive issued coupons'}); + + print < + + + + + + END -; - &General::readhasharray("$voucherout", \%voucherhash); - foreach my $key (keys %voucherhash) - { - my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($voucherhash{$key}[0])); - my $endtime; - if ($voucherhash{$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])); + + foreach my $key (keys %couponhash) { + my $expirytime = $Lang::tr{'Captive nolimit'}; + if ($couponhash{$key}[2] > 0) { + $expirytime = &General::format_time($couponhash{$key}[2]); } - if ($count % 2){ - print" "; + if ($count++ % 2) { $col="bgcolor='$color{'color20'}'"; - }else{ + } else { $col="bgcolor='$color{'color22'}'"; - print" "; } - print ""; - print ""; - print ""; - print ""; - print ""; - $count++; + print < + + + + + +END } print "
$Lang::tr{'Captive voucher'}$Lang::tr{'date'}$Lang::tr{'Captive expire'}$Lang::tr{'remark'}$Lang::tr{'delete'}
+ $Lang::tr{'Captive coupon'} + $Lang::tr{'Captive expiry time'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$voucherhash{$key}[1]
$starttime
$endtime
$voucherhash{$key}[3]
+ $couponhash{$key}[1] + + $expirytime + + $couponhash{$key}[3] + +
+ + + +
+
"; + &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; - &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'}); -print< - - + + &Header::openbox('100%', 'left', $Lang::tr{'Captive clients'}); + + print < + + + + + + + + END -; - &General::readhasharray("$clients", \%clientshash); - foreach my $key (keys %clientshash) - { + + &General::readhasharray($clients, \%clientshash) if (-e $clients); + foreach my $key (keys %clientshash) { #calculate time from clientshash (starttime) my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2])); + #calculate endtime from clientshash my $endtime; if ($clientshash{$key}[3] eq '0'){ $endtime=$Lang::tr{'Captive nolimit'}; - }else{ + } else { $endtime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2]+$clientshash{$key}[3])); } - if ($count % 2){ - print" "; - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - print" "; - } + if ($count++ % 2) { + $col="bgcolor='$color{'color20'}'"; + } else { + $col="bgcolor='$color{'color22'}'"; + } - print ""; - $count++; + my $coupon = ($clientshash{$key}[4] eq "LICENSE") ? $Lang::tr{'Captive terms short'} : $clientshash{$key}[4]; + + print < + + + + + + + +END } print "
$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 expiry time'}$Lang::tr{'Captive mac'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$clientshash{$key}[4]
$starttime "; - print "
$endtime
$clientshash{$key}[0]
$clientshash{$key}[5]
"; - print "
$coupon$starttime$endtime$clientshash{$key}[0]$clientshash{$key}[5] +
+ + + +
+
"; + &Header::closebox(); } @@ -601,29 +662,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();