]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/captive.cgi
captive: Add headline to T&C box
[ipfire-2.x.git] / html / cgi-bin / captive.cgi
index 2c5c8e4cc76d052c8b06976bc69d5c34fed055af..54ea54ffaf7bf1758b36c5556b1843f3169b944d 100755 (executable)
 #                                                                             #
 ###############################################################################
 
-use strict;
+#use strict;
 use HTML::Entities();
+use File::Basename;
+
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
@@ -28,7 +30,14 @@ use HTML::Entities();
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-unless (-e "${General::swroot}/captive/settings")      { system("touch ${General::swroot}/captive/settings"); }
+
+my %selected = ();
+
+my $coupons = "${General::swroot}/captive/coupons";
+my %couponhash = ();
+
+my $logo = "${General::swroot}/captive/logo.dat";
+
 my %settings=();
 my %mainsettings;
 my %color;
@@ -36,13 +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";
-
-unless (-e $voucherout)        { system("touch $voucherout"); }
+unless (-e $settingsfile)      { system("touch $settingsfile"); }
 
 &Header::getcgihash(\%cgiparams);
 
@@ -53,97 +59,154 @@ unless (-e $voucherout)    { system("touch $voucherout"); }
 
 &Header::showhttpheaders();
 
-#actions
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
-       #saves the Captiveportal settings to disk 
+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" && $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{'TIME'}                               = $cgiparams{'TIME'};
-       $settings{'EXPIRE'}                             = $cgiparams{'EXPIRE'};
        $settings{'TITLE'}                              = $cgiparams{'TITLE'};
-       &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'}="";
+       $settings{'COLOR'}                      = $cgiparams{'COLOR'};
+       $settings{'SESSION_TIME'}               = $cgiparams{'SESSION_TIME'};
+
+       if (!$errormessage){
+               #Check if we need to upload a new logo
+               if ($file) {
+                       # Save logo
+                       my ($filehandle) = CGI::upload("logo");
+
+                       # XXX check filesize
+
+                       open(FILE, ">$logo");
+                       binmode $filehandle;
+                       while (<$filehandle>) {
+                               print FILE;
+                       }
+                       close(FILE);
+               }
+
+               &General::writehash("$settingsfile", \%settings);
+
+               # Save 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{'ENABLE_BLUE'} eq 'on'){
+                               system("/usr/local/bin/wirelessctrl");
+               }
        }
-       #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'}") {
+       # 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 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;
-               }
+       #check valid remark
+       if ($cgiparams{'REMARK'} ne '' && !&validremark($cgiparams{'REMARK'})){
+               $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 .. 4) { $voucherhash{$key}[$i] = "";}
-               #define fields
-               $voucherhash{$key}[0] = $date;
-               $voucherhash{$key}[1] = $cgiparams{'CODE'};
-               $voucherhash{$key}[2] = $settings{'TIME'};
-               $voucherhash{$key}[3] = $settings{'EXPIRE'};
-               $voucherhash{$key}[4] = &Header::escape($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;
@@ -159,167 +222,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 <<END
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>\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'";
-
-       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>
-                               <select name='AUTH' style='width:8em;'>
+
+#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'";
+
+$checked{'UNLIMITED'}{'off'} = '';
+$checked{'UNLIMITED'}{'on'} = '';
+$checked{'UNLIMITED'}{$settings{'UNLIMITED'}} = "checked='checked'";
+
+$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>
+                       <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>
 END
 ;
-       print "<option value='LICENSE' ";
-       print " selected='selected'" if ($settings{'AUTH'} eq 'LICENSE');
-       print ">$Lang::tr{'Captive auth_lic'}</option>";
-       
-       print "<option value='VOUCHER' ";
-       print " selected='selected'" if ($settings{'AUTH'} eq 'VOUCHER');
-       print ">$Lang::tr{'Captive auth_vou'}</option>";
-       
-       print<<END
-                               </select>       
-                       </td>
-               </tr>
+
+if ($settings{'AUTH'} eq 'TERMS') {
+       $selected{'SESSION_TIME'} = ();
+       $selected{'SESSION_TIME'}{'0'} = "";
+       $selected{'SESSION_TIME'}{'3600'} = "";
+       $selected{'SESSION_TIME'}{'28800'} = "";
+       $selected{'SESSION_TIME'}{'86400'} = "";
+       $selected{'SESSION_TIME'}{'604800'} = "";
+       $selected{'SESSION_TIME'}{'18144000'} = "";
+       $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected";
+
+       print <<END;
                <tr>
+                       <td>$Lang::tr{'Captive client session expiry time'}</td>
                        <td>
-                               $Lang::tr{'Captive time'}
-                       </td>
-                       <td>
-                               <select name='TIME' style='width:8em;'>
-END
-;
-       print "<option value='nolimit' ";
-       print " selected='selected'" if ($settings{'TIME'} eq 'nolimit');
-       print ">$Lang::tr{'Captive nolimit'}</option>";
-
-       print "<option value='1' ";
-       print " selected='selected'" if ($settings{'TIME'} eq '1');
-       print ">1</option>";
-       
-       print "<option value='3' ";
-       print " selected='selected'" if ($settings{'TIME'} eq '3');
-       print ">3</option>";
-       
-       print "<option value='8' ";
-       print " selected='selected'" if ($settings{'TIME'} eq '8');
-       print ">8</option>";
-       
-       
-print<<END
+                               <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="28800"    $selected{'SESSION_TIME'}{'28800'}>$Lang::tr{'eight hours'}</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>
-               <tr>
-                       <td>
-                               $Lang::tr{'Captive vouchervalid'}
-                       </td>
-                       <td>
-                               <select name='EXPIRE' style='width:8em;'>
 END
-;
-       print "<option value='86400' ";
-       print " selected='selected'" if ($settings{'EXPIRE'} eq '86400');
-       print ">$Lang::tr{'Captive 1day'}</option>";
-
-       print "<option value='604800' ";
-       print " selected='selected'" if ($settings{'EXPIRE'} eq '604800');
-       print ">$Lang::tr{'Captive 1week'}</option>";
-       
-       print "<option value='2592000' ";
-       print " selected='selected'" if ($settings{'EXPIRE'} eq '2592000');
-       print ">$Lang::tr{'Captive 1month'}</option></td></tr>";
+}
 
-print<<END
-               <tr>
-               <td><br>
+print<<END;
+       <tr>
+               <td colspan="2">
+                       <br>
+                       <strong>$Lang::tr{'Captive branding'}</strong>
+               </td>
+       </tr>
+       <tr>
+               <td>
                        $Lang::tr{'Captive title'}
                </td>
-               <td><br>
+               <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
-;
 
-       if($settings{'AUTH'} eq 'LICENSE'){ &agbbox();}
-print<<END
+if (-e $logo) {
+       print <<END;
                <tr>
-                       <td>
-                       </td>
-                       <td align='right'>
-                       <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
-                       </td>
+                       <td>$Lang::tr{'Captive logo uploaded'}</td>
+                       <td>$Lang::tr{'yes'}</td>
                </tr>
-               </table>
-               <br><br>
 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();
-       }else{
-               #otherwise we show the licensepart
-               &show_license_connections();
-       }
 }
 
-sub agbbox(){
-       &getagb();
-print<<END
+my $terms = &getterms();
+print <<END;
        <tr>
+               <td>$Lang::tr{'Captive terms'}</td>
                <td>
-                       License agreement
+                       <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
                </td>
-               <td>
-                       <br>
-                       <textarea cols="50" rows="10" name="AGB">$cgiparams{'AGB'}</textarea>
+       </tr>
+       <tr>
+               <td></td>
+               <td align='right'>
+                       <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
                </td>
        </tr>
+       </table></form>
 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(<FILE>) {
+               push(@ret, HTML::Entities::decode_entities($_));
+       }
+       close(FILE);
+
+       return join(/\n/, @ret);
 }
 
 sub gencode(){
@@ -330,186 +394,270 @@ sub gencode(){
        return $randomstring;
 }
 
-sub voucher(){
-       #show voucher part
-       my $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='30%'>$Lang::tr{'Captive voucher'}</th><th align='center' width='15%'>$Lang::tr{'hours'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th></tr>
+sub coupons() {
+       &Header::openbox('100%', 'left', $Lang::tr{'Captive generate coupon'});
+       print <<END;
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                       <table border='0' width='100%'>
+                               <tr>
+                                       <td width='30%'>
+                                               $Lang::tr{'Captive vouchervalid'}
+                                       </td>
+                                       <td width='70%'>
+                                               <table class='tbl' border='0' width='100%'>
+                                                       <tr>
+                                                               <th>$Lang::tr{'hours'}</th>
+                                                               <th>$Lang::tr{'days'}</th>
+                                                               <th>$Lang::tr{'weeks'}</th>
+                                                               <th>$Lang::tr{'months'}</th>
+                                                               <th></th>
+                                                       </tr>
 END
-;
-       if ($settings{'EXPIRE'} eq '86400') { $expire = $Lang::tr{'Captive 1day'};}
-       if ($settings{'EXPIRE'} eq '604800') { $expire = $Lang::tr{'Captive 1week'};}
-       if ($settings{'EXPIRE'} eq '2592000') { $expire = $Lang::tr{'Captive 1month'};}
-       if ($settings{'TIME'} eq 'nolimit') { $settings{'TIME'} = $Lang::tr{'Captive nolimit'};}
-       $cgiparams{'CODE'} = &gencode();
-       print "<tr><td><center><b><font size='20'>$cgiparams{'CODE'}</font></b></center></td><td><center><b><font size='5'>$settings{'TIME'}</font></b></center></td><td><center><b><font size='5'>$expire</font></b></center></td></tr>";
-       print "<tr><td colspan='3'><br>$Lang::tr{'remark'}<input type='text' name='REMARK' align='left' size='60' style='font-size: 22px;'></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 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 <<END;
+                                                               </td>
+                                                               <td>
+                                                                       <label>
+                                                                               <input type='checkbox' name='UNLIMITED' $checked{'UNLIMITED'}{'on'} />
+                                                                               $Lang::tr{'Captive nolimit'}
+                                                                       </label>
+                                                               </td>
+                                                       </tr>
+                                               </table>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>$Lang::tr{'remark'}</td>
+                                       <td>
+                                               <input type='text' style='width: 98%;' name='REMARK' align='left'>
+                                       </td>
+                               </tr>
+                       </table>
+
+                       <div align="right">
+                               <select name="COUNT">
+                                       <option value="1">1</option>
+                                       <option value="2">2</option>
+                                       <option value="3">3</option>
+                                       <option value="4">4</option>
+                                       <option value="5">5</option>
+                                       <option value="6">6</option>
+                                       <option value="7">7</option>
+                                       <option value="8">8</option>
+                                       <option value="9">9</option>
+                                       <option value="10">10</option>
+                                       <option value="20">20</option>
+                                       <option value="50">50</option>
+                                       <option value="100">100</option>
+                               </select>
+
+                               <input type="submit" name="ACTION" value="$Lang::tr{'Captive generate coupon'}">
+                       </div>
+               </form>
+END
+
        &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();
+       }
 }
 
-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
-               <center><table class='tbl'>
-               <tr>
-                       <th align='center' width='15%'><font size='1'>$Lang::tr{'Captive mac'}</th><th align='center' width='15%'>$Lang::tr{'Captive ip'}</th><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 th align='center' width='15%'>$Lang::tr{'delete'}</th></tr>
+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;
+               <table class='tbl' border='0'>
+                       <tr>
+                               <th align='center' width='15%'>
+                                       $Lang::tr{'Captive coupon'}
+                               </th>
+                               <th align='center' width='15%'>$Lang::tr{'Captive expiry time'}</th>
+                               <th align='center' width='65%'>$Lang::tr{'remark'}</th>
+                               <th align='center' width='5%'>$Lang::tr{'delete'}</th>
+                       </tr>
 END
-;
-       #read all clients from hash and show table
-       &General::readhasharray("$clients", \%clientshash);
-       foreach my $key (keys %clientshash){
-               my ($sec, $min, $hour, $mday, $mon, $year) = localtime($clientshash{$key}[6]);
-               my ($secx,$minx,$hourx) = localtime($clientshash{$key}[6]+($clientshash{$key}[5]*3600));
-               $mon = '0'.++$mon if $mon<10;
-               $min = '0'.$min if $min<10;
-               $hour = '0'.$hour if $hour<10;
-               $year=$year+1900;
-               if ($count % 2){
-                       print" <tr>";
+
+       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) {
                        $col="bgcolor='$color{'color20'}'";
-               }else{
+               } else {
                        $col="bgcolor='$color{'color22'}'";
-                       print" <tr>";
                }
-               print "<td $col><center>$clientshash{$key}[0]</td><td $col><center>$clientshash{$key}[1]</td><td $col><center>$clientshash{$key}[4]</td><td $col><center>$mday.$mon.$year ";
-               printf("%02d",$hour);
-               print ":";
-               printf("%02d",$min);
-               print "</center></td><td $col><center>$mday.$mon.$year ";
-               printf("%02d",$hourx);
-               print ":";
-               printf("%02d",$minx);
-               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>";
-               $count++;
+
+               print <<END;
+                       <tr>
+                               <td $col align="center">
+                                       <b>$couponhash{$key}[1]</b>
+                               </td>
+                               <td $col align="center">
+                                       $expirytime
+                               </td>
+                               <td $col align="center">
+                                       $couponhash{$key}[3]
+                               </td>
+                               <td $col align="center">
+                                       <form method='post'>
+                                               <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />
+                                               <input type='hidden' name='ACTION' value='delete-coupon' />
+                                               <input type='hidden' name='key' value='$couponhash{$key}[0]' />
+                                       </form>
+                               </td>
+                       </tr>
+END
        }
-       
+
        print "</table>";
+
        &Header::closebox();
 }
 
-sub show_voucher_out(){
-       #if there are already generated but unsused vouchers, print a table
-       return if ( -z $voucherout);
+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 vout'});
-       print<<END
-               <center><table class='tbl'>
-               <tr>
-                       <th align='center' width='15%'><font size='1'>$Lang::tr{'date'}</th><th align='center' width='15%'>$Lang::tr{'Captive voucher'}</th><th align='center' width='5%'>$Lang::tr{'hours'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center'>$Lang::tr{'remark'}</th><th align='center' width='15%'>$Lang::tr{'delete'}</th></tr>
+
+       &Header::openbox('100%', 'left', $Lang::tr{'Captive clients'});
+
+       print <<END;
+               <table class='tbl' width='100%'>
+                       <tr>
+                               <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th>
+                               <th align='center' width='15%'>$Lang::tr{'Captive activated'}</th>
+                               <th align='center' width='15%'>$Lang::tr{'Captive expiry time'}</th>
+                               <th align='center' width='10%'>$Lang::tr{'Captive mac'}</th>
+                               <th align='center' width='43%'>$Lang::tr{'remark'}</th>
+                               <th align='center' width='5%'>$Lang::tr{'delete'}</th>
+                       </tr>
 END
-;
-       &General::readhasharray("$voucherout", \%voucherhash);
-       foreach my $key (keys %voucherhash)
-       {
-               my ($sec, $min, $hour, $mday, $mon, $year) = localtime($voucherhash{$key}[0]);
-               my ($secx, $minx, $hourx, $mdayx, $monx, $yearx) = localtime($voucherhash{$key}[0]+$voucherhash{$key}[3]);
-               $mon++;
-               $year=$year+1900;
-               $monx++;
-               $yearx=$yearx+1900;
-               if ($count % 2){
-                       print" <tr>";
+
+       &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 {
+                       $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) {
                        $col="bgcolor='$color{'color20'}'";
-               }else{
+               } else {
                        $col="bgcolor='$color{'color22'}'";
-                       print" <tr>";
                }
-               print "<td $col><center>";
-               printf("%02d",$mday);
-               print ".";
-               printf("%02d",$mon);
-               print ".";
-               print"$year ";
-               
-               printf("%02d",$hour);
-               print ":";
-               printf("%02d",$min);
-               print "</td><td $col><center><b>$voucherhash{$key}[1]</b></td><td $col><center>$voucherhash{$key}[2]</td><td $col><center>";
-               printf("%02d",$mdayx);
-               print ".";
-               printf("%02d",$monx);
-               print ".";
-               print"$yearx ";
-               
-               printf("%02d",$hourx);
-               print ":";
-               printf("%02d",$minx);
-               print "</td>";
-               $voucherhash{$key}[4] = HTML::Entities::decode_entities($voucherhash{$key}[4]);
-               print "<td $col align='center'>$voucherhash{$key}[4]</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>";
-               $count++;
-       }
-       
-       print "</table>";
-       &Header::closebox();
-}
 
-sub show_voucher_in_use(){
-       #if there are active clients which use vouchers show table
-       return if ( -z $clients || ! -f $clients );
-       my $count=0;
-       my $col;
-       &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'});
-print<<END
-       <center><table class='tbl'>
-               <tr>
-                       <th align='center' width='15%'><font size='1'>$Lang::tr{'Captive mac'}</th><th align='center' width='15%'>$Lang::tr{'Captive ip'}</th><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 th align='center' width='15%'>$Lang::tr{'delete'}</th></tr>
+               my $coupon = ($clientshash{$key}[4] eq "LICENSE") ? $Lang::tr{'Captive terms short'} : $clientshash{$key}[4];
+
+               print <<END;
+                       <tr>
+                               <td $col align="center"><b>$coupon</b></td>
+                               <td $col align="center">$starttime</td>
+                               <td $col align="center">$endtime</td>
+                               <td $col align="center">$clientshash{$key}[0]</td>
+                               <td $col align="center">$clientshash{$key}[5]</td>
+                               <td $col align="center">
+                                       <form method='post'>
+                                               <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />
+                                               <input type='hidden' name='ACTION' value='delete-client' />
+                                               <input type='hidden' name='key' value='$clientshash{$key}[0]' />
+                                       </form>
+                               </td>
+                       </tr>
 END
-;
-       &General::readhasharray("$clients", \%clientshash);
-       foreach my $key (keys %clientshash)
-       {
-                       my ($sec, $min, $hour, $mday, $mon, $year) = localtime($clientshash{$key}[6]);
-                       my ($secx,$minx,$hourx) = localtime($clientshash{$key}[6]+($clientshash{$key}[5]*3600));
-                       $mon = '0'.++$mon if $mon<10;
-                       $min = '0'.$min if $min<10;
-                       $hour = '0'.$hour if $hour<10;
-                       $year=$year+1900;
-                       if ($count % 2){
-                               print" <tr>";
-                               $col="bgcolor='$color{'color20'}'";
-                       }else{
-                               $col="bgcolor='$color{'color22'}'";
-                               print" <tr>";
-                       }
-                       print "<td $col><center>$clientshash{$key}[0]</td><td $col><center>$clientshash{$key}[1]</td><td $col><center>$clientshash{$key}[4]</td><td $col><center>$mday.$mon.$year ";
-                       printf("%02d",$hour);
-                       print ":";
-                       printf("%02d",$min);
-                       print "</center></td><td $col><center>$mday.$mon.$year ";
-                       printf("%02d",$hourx);
-                       print ":";
-                       printf("%02d",$minx);
-                       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>";
-                       $count++;
        }
-       
+
        print "</table>";
+
        &Header::closebox();
 }
 
-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 "&nbsp;</class>\n";
-               &Header::closebox();
-       }
+sub validremark
+{
+       # Checks a hostname against RFC1035
+        my $remark = $_[0];
+       # Each part should be at least two characters in length
+       # but no more than 63 characters
+       if (length ($remark) < 1 || length ($remark) > 255) {
+               return 0;}
+       # Only valid characters are a-z, A-Z, 0-9 and -
+       if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\|_()\/\s]*$/) {
+               return 0;}
+       # First character can only be a letter or a digit
+       if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9]*$/) {
+               return 0;}
+       # Last character can only be a letter or a digit
+       if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) {
+               return 0;}
+       return 1;
 }
 
 &Header::closebigbox();