]> 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 ef5efc88ee243dd4a818f47fbadd9906888892c6..54ea54ffaf7bf1758b36c5556b1843f3169b944d 100755 (executable)
@@ -36,6 +36,8 @@ my %selected = ();
 my $coupons = "${General::swroot}/captive/coupons";
 my %couponhash = ();
 
+my $logo = "${General::swroot}/captive/logo.dat";
+
 my %settings=();
 my %mainsettings;
 my %color;
@@ -46,7 +48,6 @@ my $errormessage='';
 my $clients="${General::swroot}/captive/clients";
 my %clientshash=();
 my $settingsfile="${General::swroot}/captive/settings";
-my $logopath = "/srv/web/ipfire/html/captive/logo";
 unless (-e $settingsfile)      { system("touch $settingsfile"); }
 
 &Header::getcgihash(\%cgiparams);
@@ -58,15 +59,15 @@ unless (-e $settingsfile)   { system("touch $settingsfile"); }
 
 &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'};
                }
        }
 
@@ -74,44 +75,33 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
        $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);
                }
 
                &General::writehash("$settingsfile", \%settings);
 
                # 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'} = "";
-               }
+               $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");
@@ -122,29 +112,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
        }
 }
 
-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 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;
-               }
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") {
+       # Check expiry time
+       if ($cgiparams{'EXP_HOUR'} + $cgiparams{'EXP_DAY'} + $cgiparams{'EXP_WEEK'} + $cgiparams{'EXP_MONTH'} == 0 && $cgiparams{'UNLIMITED'} == '') {
+               $errormessage = $Lang::tr{'Captive noexpiretime'};
        }
 
        #check valid remark
@@ -152,28 +123,57 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}"){
                $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 (\%couponhash);
-               #initialize all fields with ''
-               foreach my $i (0 .. 3) { $couponhash{$key}[$i] = "";}
-               #define fields
-               $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($coupons, \%couponhash);
+       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();
 
-               #now prepare log entry, get expiring date for voucher and decode remark for logfile
-               my $expdate=localtime(time()+$couponhash{$key}[3]);
-               my $rem=HTML::Entities::decode_entities($couponhash{$key}[4]);
+               # Calculate expiry time in seconds
+               my $expires = 0;
 
-               #write logfile entry
-               &General::log("Captive", "Generated new coupon $couponhash{$key}[1] $couponhash{$key}[2] hours valid expires on $expdate remark $rem");
+               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);
        }
 }
 
@@ -222,175 +222,168 @@ if ($cgiparams{'ACTION'} eq 'delete-client') {
 &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>
-                               $Lang::tr{'Captive authentication'}
-                       </td>
-                       <td>
-                               <select name='AUTH'>
-END
-;
-       print "<option value='TERMS' ";
-       print " selected='selected'" if ($settings{'AUTH'} eq 'TERMS');
-       print ">$Lang::tr{'Captive terms'}</option>";
+$selected{'AUTH'} = ();
+$selected{'AUTH'}{'COUPON'} = "";
+$selected{'AUTH'}{'TERMS'} = "";
+$selected{'AUTH'}{$settings{'AUTH'}} = "selected";
 
-       print "<option value='COUPON' ";
-       print " selected='selected'" if ($settings{'AUTH'} eq 'COUPON');
-       print ">$Lang::tr{'Captive coupon'}</option>";
+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
-                               </select>       
-                       </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
 ;
-       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<<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
+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";
 
-       #Logo Upload
        print <<END;
                <tr>
+                       <td>$Lang::tr{'Captive client session expiry time'}</td>
                        <td>
-                               $Lang::tr{'Captive logo_upload'}
-                               <br>
-                               $Lang::tr{'Captive logo_upload1'}
-                       </td>
-                       <td>
-                               <INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80>
+                               <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>
 END
+}
 
-       #Show Logo in webinterface with 1/2 size if set
-       if (-f "$logopath/logo.png"){
-               print"<tr><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"<tr><td>$Lang::tr{'Captive logo_set'}</td>";
-               print"<td><br>$Lang::tr{'no'}</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
 
+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>
+END
+}
+
+my $terms = &getterms();
+print <<END;
+       <tr>
+               <td>$Lang::tr{'Captive terms'}</td>
+               <td>
+                       <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
+               </td>
+       </tr>
+       <tr>
+               <td></td>
+               <td align='right'>
+                       <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
+               </td>
+       </tr>
        </table></form>
 END
 
-       &Header::closebox();
+&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();
 
-       #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(){
@@ -403,12 +396,23 @@ sub gencode(){
 
 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 <<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
 
                #print hour-dropdownbox
                my $hrs=3600;
@@ -464,14 +468,47 @@ sub coupons() {
                        print " selected='selected'" if ($settings{'EXP_MONTH'} eq $exp_sec);
                        print ">$i</option>";
                }
-               print "</td>";
-               print "<td>&nbsp;&nbsp;&nbsp;<input type='checkbox' name='UNLIMITED' $checked{'UNLIMITED'}{'on'} /></td><td>&nbsp;<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>&nbsp</td><td></td></tr></table><br><br>";
-       $cgiparams{'CODE'} = &gencode();
-       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>";
+               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();
 
@@ -479,134 +516,127 @@ sub coupons() {
        if (! -z $coupons) {
                &show_coupons();
        }
-
-       if (! -z $clients) {
-               &show_clients();
-       }
-}
-
-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%'>$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) 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;
-               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){
-                       print" <tr>";
-                       $col="bgcolor='$color{'color20'}'";
-               }else{
-                       $col="bgcolor='$color{'color22'}'";
-                       print" <tr>";
-               }
-               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='delete-client' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
-               $count++;
-       }
-       
-       print "</table>";
-       &Header::closebox();
 }
 
 sub show_coupons() {
+       &General::readhasharray($coupons, \%couponhash) if (-e $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 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>
+       &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
-;
-       &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($couponhash{$key}[0]));
-               my $endtime;
-               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()+$couponhash{$key}[2]));
+
+       foreach my $key (keys %couponhash) {
+               my $expirytime = $Lang::tr{'Captive nolimit'};
+               if ($couponhash{$key}[2] > 0) {
+                       $expirytime = &General::format_time($couponhash{$key}[2]);
                }
 
-               if ($count % 2){
-                       print" <tr>";
+               if ($count++ % 2) {
                        $col="bgcolor='$color{'color20'}'";
-               }else{
+               } else {
                        $col="bgcolor='$color{'color22'}'";
-                       print" <tr>";
                }
 
-               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'>$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++;
+               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_clients() {
-       #if there are active clients which use coupons show table
+       # if there are active clients which use coupons show table
        return if ( -z $clients || ! -f $clients );
+
        my $count=0;
        my $col;
-       &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'});
-print<<END
-       <center><table class='tbl' width='100%'>
-               <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>
+
+       &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($clients, \%clientshash) if (-e $clients);
-       foreach my $key (keys %clientshash)
-       {
+       foreach my $key (keys %clientshash) {
                #calculate time from clientshash (starttime)
                my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($clientshash{$key}[2]));
+
                #calculate endtime from clientshash
                my $endtime;
                if ($clientshash{$key}[3] eq '0'){
                        $endtime=$Lang::tr{'Captive nolimit'};
-               }else{
+               } else {
                        $endtime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($clientshash{$key}[2]+$clientshash{$key}[3]));
                }
 
-                       if ($count % 2){
-                               print" <tr>";
-                               $col="bgcolor='$color{'color20'}'";
-                       }else{
-                               $col="bgcolor='$color{'color22'}'";
-                               print" <tr>";
-                       }
+               if ($count++ % 2) {
+                       $col="bgcolor='$color{'color20'}'";
+               } else {
+                       $col="bgcolor='$color{'color22'}'";
+               }
+
+               my $coupon = ($clientshash{$key}[4] eq "LICENSE") ? $Lang::tr{'Captive terms short'} : $clientshash{$key}[4];
 
-                       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='delete-client' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
-                       $count++;
+               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
        }
 
        print "</table>";
+
        &Header::closebox();
 }
 
@@ -630,29 +660,5 @@ sub validremark
        return 1;
 }
 
-sub pngsize {
-       my $Buffer = shift;
-       my ($width,$height) = ( undef, undef );
-
-       if ($Buffer =~ /IHDR(.{8})/) {
-               my $PNG = $1;
-               ($width,$height) = unpack( "NN", $PNG );
-       } else {
-               $width="invalid";
-               $height= "invalid";
-       };
-       return ($width,$height);
-}
-
-sub error{
-       #if an errormessage exits, show a box with errormessage
-       if ($errormessage) {
-               &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-               print "<class name='base'>$errormessage\n";
-               print "&nbsp;</class>\n";
-               &Header::closebox();
-       }
-}
-
 &Header::closebigbox();
 &Header::closepage();