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);
#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'};
+ my $file = $cgiparams{'logo'};
if ($file){
#Check if extension is png
chomp $file;
$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{'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);
}
- #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");
}
}
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive voucherout'}"){
- #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 ($settings{'UNLIMITED'} eq 'on'){
+ $expire = $Lang::tr{'Captive nolimit'};
+ }else{
+ $settings{'EXPIRE'} = $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'};
+ $expire = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime(time()+$settings{'EXPIRE'}));
+ }
- #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 Expiretime
+ 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 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;
#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 );
+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 config(){
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><br>
- $Lang::tr{'Captive title'}
- </td>
- <td><br>
- <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
- </td>
- </tr>
-END
-;
-
print<<END
+ </tr>
<tr>
<td>
$Lang::tr{'Captive authentication'}
</td>
<td>
- <select name='AUTH' style='width:8em;'>
+ <select name='AUTH'>
END
;
- print "<option value='LICENSE' ";
- print " selected='selected'" if ($settings{'AUTH'} eq 'LICENSE');
- print ">$Lang::tr{'Captive auth_lic'}</option>";
+ 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>";
+ print "<option value='COUPON' ";
+ print " selected='selected'" if ($settings{'AUTH'} eq 'COUPON');
+ print ">$Lang::tr{'Captive coupon'}</option>";
print<<END
</select>
</tr>
END
;
-
- &agbbox();
-
- #Logo Upload
- print "<tr><td>$Lang::tr{'Captive logo_upload'}</td><td><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"<tr><td>$Lang::tr{'Captive vouchervalid'}</td><td>";
- print "<br><table border='0' with=100%>";
- print "<th>$Lang::tr{'hours'}</th><th>$Lang::tr{'days'}</th><th>$Lang::tr{'weeks'}</th><th>$Lang::tr{'months'}</th>";
-
- #print hour-dropdownbox
- my $hrs=3600;
- print "<tr><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>";
+ 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></td>
+ <td>
+ <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
+ </td>
+ </tr>
+
+ <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
}
- print "</td>";
-
- print "<td> <input type='checkbox' name='UNLIMITED' $checked{'UNLIMITED'}{'on'} /></td><td> <b>$Lang::tr{'Captive nolimit'}</b></td>";
- print "</tr></table>";
+ 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>
+END
-print<<END
+ # Logo Upload
+ print <<END;
<tr>
<td>
+ $Lang::tr{'Captive logo_upload'}
+ <br>
+ $Lang::tr{'Captive logo_upload1'}
+ </td>
+ <td>
+ <input type="file" name="logo">
</td>
+ </tr>
+END
+
+ if (-e $logo) {
+ print <<END;
+ <tr>
+ <td>$Lang::tr{'Captive logo uploaded'}</td>
+ <td>$Lang::tr{'yes'}</td>
+ </tr>
+END
+ }
+
+ print <<END;
+ <tr>
+ <td></td>
<td align='right'>
- <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
+ <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
</td>
</tr>
- </table>
- <br><br>
+ </table></form>
END
-;
- print "</form>";
&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();
}
}
-sub agbbox(){
- &getagb();
-print<<END
- <tr>
- <td>
- License agreement
- </td>
- <td>
- <br>
- <textarea cols="50" rows="10" name="AGB">$cgiparams{'AGB'}</textarea>
- </td>
- </tr>
-END
-;
-}
-
sub gencode(){
#generate a random code only letters from A-Z except 'O' and 0-9
my @chars = ("A".."N", "P".."Z", "0".."9");
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<<END
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <table class='tbl'>
- <tr>
- <th align='center' width='20%'>$Lang::tr{'Captive voucher'}</th><th th align='center' width='30%'>$Lang::tr{'Captive expire'}</th><th align='center' width='55%'>$Lang::tr{'remark'}</th></tr>
-END
-;
-
+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 "<table class='tbl' border='0' width='100%'>";
+ print "<th>$Lang::tr{'hours'}</th><th>$Lang::tr{'days'}</th><th>$Lang::tr{'weeks'}</th><th>$Lang::tr{'months'}</th><th></th><th></th>";
+
+ #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>";
+ }
+ print "</td>";
+ print "<td> <input type='checkbox' name='UNLIMITED' $checked{'UNLIMITED'}{'on'} /></td><td> <b>$Lang::tr{'Captive nolimit'}</b></td>";
+ print "</tr></table>";
+ print "</td></tr>";
+ 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 "<tr><td><center><b><font size='5'>$cgiparams{'CODE'}</font></b></center></td><td><center><font size='2'>$expire</font></center></td><td><input type='text' name='REMARK' align='left' size='80'></td></tr>";
- print "</table><br>";
- print "<center><input type='submit' name='ACTION' value='$Lang::tr{'Captive voucherout'}'><input type='hidden' name='CODE' value='$cgiparams{'CODE'}'</center></form>";
+ 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++;
}