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;
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);
&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'};
}
}
$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=<PNG>;
- close(PNG);
- my ($width,$height)=&pngsize($PNG1);
- if($width > 1920 || $height > 800 || $width < 1280 || $height < 400){
- $errormessage.="$Lang::tr{'Captive invalid logosize'} <br>Filedimensions width: $width height: $height ";
- unlink("$logopath/logo.png");
+ while (<$filehandle>) {
+ print FILE;
}
+ close(FILE);
}
&General::writehash("$settingsfile", \%settings);
}
}
-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;
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;
}
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;
&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 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);
+# 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 <<END
- <form method='post' action='$ENV{'SCRIPT_NAME'}' enctype="multipart/form-data">\n
+# Prints the config box on the website
+&Header::openbox('100%', 'left', $Lang::tr{'Captive config'});
+print <<END
+ <form method='post' action='$ENV{'SCRIPT_NAME'}' enctype="multipart/form-data">\n
<table width='100%' border="0">
<tr>
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 "<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>";
- }
- 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>";
- }
+$checked{'UNLIMITED'}{'off'} = '';
+$checked{'UNLIMITED'}{'on'} = '';
+$checked{'UNLIMITED'}{$settings{'UNLIMITED'}} = "checked='checked'";
- print<<END
- </tr>
- <tr>
- <td><br>
- $Lang::tr{'Captive title'}
+$selected{'AUTH'} = ();
+$selected{'AUTH'}{'COUPON'} = "";
+$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>";
+}
+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>
+ <tr>
+ <td>
+ $Lang::tr{'Captive authentication'}
</td>
- <td><br>
- <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
+ <td>
+ <select name='AUTH'>
+ <option value="TERMS" $selected{'AUTH'}{'TERMS'} >$Lang::tr{'Captive terms'}</option>
+ <option value="COUPON" $selected{'AUTH'}{'COUPON'}>$Lang::tr{'Captive coupon'}</option>
+ </select>
</td>
- </tr>
+ </tr>
END
;
-print<<END
+if ($settings{'AUTH'} eq 'TERMS') {
+ $selected{'SESSION_TIME'} = ();
+ $selected{'SESSION_TIME'}{'0'} = "";
+ $selected{'SESSION_TIME'}{'3600'} = "";
+ $selected{'SESSION_TIME'}{'86400'} = "";
+ $selected{'SESSION_TIME'}{'604800'} = "";
+ $selected{'SESSION_TIME'}{'18144000'} = "";
+ $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected";
+
+ my $terms = &getterms();
+ print <<END;
<tr>
- <td><br>
- $Lang::tr{'Captive authentication'}
+ <td></td>
+ <td>
+ <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
</td>
- <td><br>
- <select name='AUTH'>
-END
-;
- 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');
- print ">$Lang::tr{'Captive auth_vou'}</option>";
+ </tr>
- print<<END
- </select>
+ <tr>
+ <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="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>
+ </select>
</td>
</tr>
END
-;
- 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>
+}
+
+print<<END;
+ <tr>
+ <td colspan="2">
+ <br>
+ <strong>$Lang::tr{'Captive branding'}</strong>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ $Lang::tr{'Captive title'}
+ </td>
+ <td>
+ <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
+ </td>
+ </tr>
+ <tr>
+ <td>$Lang::tr{'Captive brand color'}</td>
+ <td>
+ <input type="color" name="COLOR" value="$settings{'COLOR'}">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ $Lang::tr{'Captive upload logo'}
+ </td>
+ <td>
+ <input type="file" name="logo">
+ <br>$Lang::tr{'Captive upload logo recommendations'}
+ </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>";
- #Show Logo in webinterface with 1/2 size if set
- if (-f "$logopath/logo.png"){
- print"<td>$Lang::tr{'Captive logo_set'}</td>";
- print"<td><img src='/captive/logo/logo.png' alt='$logopath/logo.png' width='25%' height='25%' /></td></tr>";
- }else{
- print"<td>$Lang::tr{'Captive logo_set'}</td>";
- print"<td><br>$Lang::tr{'no'}</td></tr>";
- }
-print<<END
+if (-e $logo) {
+ print <<END;
<tr>
- <td>$Lang::tr{'Captive brand color'}</td>
- <td>
- <input type="color" name="COLOR" value="$settings{'COLOR'}">
- </td>
+ <td>$Lang::tr{'Captive logo uploaded'}</td>
+ <td>$Lang::tr{'yes'}</td>
</tr>
+END
+}
- <tr>
- <td>
- </td>
- <td align='right'>
+print <<END;
+ <tr>
+ <td></td>
+ <td align='right'>
<input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
- </td>
- </tr>
- </table>
- <br><br>
+ </td>
+ </tr>
+ </table></form>
END
-;
- print "</form>";
- &Header::closebox();
+&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();
+#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(<FILE>) {
+ push(@ret, HTML::Entities::decode_entities($_));
}
+ close(FILE);
+
+ return join(/\n/, @ret);
}
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 "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
print "<table border='0' width='100%'>";
print "<tr><td width='30%'><br>$Lang::tr{'Captive vouchervalid'}</td><td width='70%'><br>";
print "<tr><td><br>$Lang::tr{'remark'}</td><td><br><input type='text' style='width: 98%;' name='REMARK' align='left'></td></tr>";
print "<tr><td> </td><td></td></tr></table><br><br>";
$cgiparams{'CODE'} = &gencode();
- print "<div align='right'><input type='submit' name='ACTION' value='$Lang::tr{'Captive genvoucher'}'><input type='hidden' name='CODE' value='$cgiparams{'CODE'}'></form></div>";
+ print "<div align='right'><input type='submit' name='ACTION' value='$Lang::tr{'Captive generate coupon'}'><input type='hidden' name='CODE' value='$cgiparams{'CODE'}'></form></div>";
&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(){
print<<END
<center><table class='tbl'>
<tr>
- <th align='center' width='15%'>$Lang::tr{'Captive voucher'}</th><th th align='center' width='15%'>$Lang::tr{'Captive activated'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='50%'><font size='1'>$Lang::tr{'Captive mac'}</th><th th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
+ <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th><th th align='center' width='15%'>$Lang::tr{'Captive activated'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='50%'><font size='1'>$Lang::tr{'Captive mac'}</th><th th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
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;
}
print "<td $col><center>$clientshash{$key}[4]</td><td $col><center>$starttime ";
print "</center></td><td $col><center>$endtime ";
- print "</td><td $col><center>$clientshash{$key}[0]</td><td $col><form method='post'><center><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><form method='post'><input type='hidden' name='ACTION' value='delvoucherinuse' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
+ print "</td><td $col><center>$clientshash{$key}[0]</td><td $col><form method='post'><center><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><form method='post'><input type='hidden' name='ACTION' value='delete-client' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
$count++;
}
&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<<END
<center><table class='tbl' border='0'>
<tr>
- <th align='center' width='15%'>$Lang::tr{'Captive voucher'}</th><th align='center' width='15%'>$Lang::tr{'date'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='60%'>$Lang::tr{'remark'}</th><th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
+ <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th><th align='center' width='15%'>$Lang::tr{'date'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='60%'>$Lang::tr{'remark'}</th><th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
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){
print" <tr>";
}
- print "<td $col><center><b>$voucherhash{$key}[1]</b></td>";
+ print "<td $col><center><b>$couponhash{$key}[1]</b></td>";
print "<td $col><center>$starttime</td>";
print "<td $col><center>$endtime</td>";
- print "<td $col align='center'>$voucherhash{$key}[3]</td>";
- print "<td $col><form method='post'><center><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><form method='post'><input type='hidden' name='ACTION' value='delvoucherout' /><input type='hidden' name='key' value='$voucherhash{$key}[0]' /></form></tr>";
+ print "<td $col align='center'>$couponhash{$key}[3]</td>";
+ print "<td $col><form method='post'><center><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><form method='post'><input type='hidden' name='ACTION' value='delete-coupon' /><input type='hidden' name='key' value='$couponhash{$key}[0]' /></form></tr>";
$count++;
}
&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;
print<<END
<center><table class='tbl' width='100%'>
<tr>
- <th align='center' width='15%'>$Lang::tr{'Captive voucher'}</th><th th align='center' width='15%'>$Lang::tr{'Captive activated'}</th><th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='10%'>$Lang::tr{'Captive mac'}</th><th align='center' width='43%'>$Lang::tr{'remark'}</th><th th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
+ <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th><th th align='center' width='15%'>$Lang::tr{'Captive activated'}</th><th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='10%'>$Lang::tr{'Captive mac'}</th><th align='center' width='43%'>$Lang::tr{'remark'}</th><th th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
END
;
- &General::readhasharray("$clients", \%clientshash);
+ &General::readhasharray($clients, \%clientshash) if (-e $clients);
foreach my $key (keys %clientshash)
{
#calculate time from clientshash (starttime)
print "<td $col><center><b>$clientshash{$key}[4]</b></td><td $col><center>$starttime ";
print "</center></td><td $col><center>$endtime</center></td><td $col><center>$clientshash{$key}[0]</td><td $col><center>$clientshash{$key}[5]</center>";
- print "</td><td $col><form method='post'><center><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><form method='post'><input type='hidden' name='ACTION' value='delvoucherinuse' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
+ print "</td><td $col><form method='post'><center><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><form method='post'><input type='hidden' name='ACTION' value='delete-client' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
$count++;
}
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 "<class name='base'>$errormessage\n";
- print " </class>\n";
- &Header::closebox();
- }
-}
-
&Header::closebigbox();
&Header::closepage();
projects / people / pmueller / ipfire-2.x.git / blobdiff