]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/captive.cgi
captive: Fix potential authenticated XSS in title processing
[ipfire-2.x.git] / html / cgi-bin / captive.cgi
index a89039265a12283cb9089abe703bd92a4a0f6b33..b7c42e797e4fb6964f3755679da8287716123740 100755 (executable)
 ###############################################################################
 
 #use strict;
+use Encode;
 use HTML::Entities();
 use File::Basename;
+use PDF::API2;
+use constant mm => 25.4 / 72;
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -31,6 +34,26 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+my %session_times = (
+       3600            => $Lang::tr{'one hour'},
+       14400           => $Lang::tr{'four hours'},
+       28800           => $Lang::tr{'eight hours'},
+       43200           => $Lang::tr{'twelve hours'},
+       86400           => $Lang::tr{'24 hours'},
+       604800          => $Lang::tr{'one week'},
+       1209600         => $Lang::tr{'two weeks'},
+       2592000         => $Lang::tr{'one month'},
+       31536000        => $Lang::tr{'one year'},
+       0               => "- $Lang::tr{'unlimited'} -",
+);
+
+my %selected = ();
+
+my $coupons = "${General::swroot}/captive/coupons";
+my %couponhash = ();
+
+my $logo = "${General::swroot}/captive/logo.dat";
+
 my %settings=();
 my %mainsettings;
 my %color;
@@ -38,14 +61,10 @@ my %cgiparams=();
 my %netsettings=();
 my %checked=();
 my $errormessage='';
-my $voucherout="${General::swroot}/captive/voucher_out";
 my $clients="${General::swroot}/captive/clients";
-my %voucherhash=();
 my %clientshash=();
 my $settingsfile="${General::swroot}/captive/settings";
-my $logopath = "/srv/web/ipfire/html/captive/logo";
 unless (-e $settingsfile)      { system("touch $settingsfile"); }
-unless (-e $voucherout)        { system("touch $voucherout"); }
 
 &Header::getcgihash(\%cgiparams);
 
@@ -54,61 +73,65 @@ unless (-e $voucherout)     { system("touch $voucherout"); }
 &General::readhash("$settingsfile", \%settings) if(-f $settingsfile);
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
+if ($cgiparams{'ACTION'} eq "export-coupons") {
+       my $pdf = &generate_pdf();
+
+       print "Content-Type: application/pdf\n";
+       print "Content-Disposition: attachment; filename=captive-portal-coupons.pdf\n";
+       print "\n"; # end headers
+
+       # Send PDF
+       print $pdf;
+
+       exit(0);
+}
+
+
 &Header::showhttpheaders();
 
-#actions
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
-       my $file = $cgiparams{'uploaded_file'};
-       if ($file){
-               #Check if extension is png
+if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
+       my $file = $cgiparams{'logo'};
+       if ($file) {
+               # Check if the file extension is PNG/JPEG
                chomp $file;
+
                my ($name, $path, $ext) = fileparse($file, qr/\.[^.]*$/);
-               if ($ext ne ".png"){
-                       $errormessage=$Lang::tr{'Captive wrong ext'};
+               if ($ext ne ".png" && $ext ne ".jpg" && $ext ne ".jpeg") {
+                       $errormessage = $Lang::tr{'Captive wrong ext'};
                }
        }
 
        $settings{'ENABLE_GREEN'}               = $cgiparams{'ENABLE_GREEN'};
        $settings{'ENABLE_BLUE'}                = $cgiparams{'ENABLE_BLUE'};
        $settings{'AUTH'}                               = $cgiparams{'AUTH'};
-       $settings{'TITLE'}                              = $cgiparams{'TITLE'};
-       $settings{'UNLIMITED'}                  = $cgiparams{'UNLIMITED'};
+       $settings{'TITLE'}                      = &Header::escape($cgiparams{'TITLE'});
        $settings{'COLOR'}                      = $cgiparams{'COLOR'};
+       $settings{'SESSION_TIME'}               = $cgiparams{'SESSION_TIME'};
 
        if (!$errormessage){
                #Check if we need to upload a new logo
-               if($file){
-                       #Save File
-                       my ($filehandle) = CGI::upload('uploaded_file');
-                       open (UPLOADFILE, ">$logopath/logo.png");
+               if ($file) {
+                       # Save logo
+                       my ($filehandle) = CGI::upload("logo");
+
+                       # XXX check filesize
+
+                       open(FILE, ">$logo");
                        binmode $filehandle;
-                       while ( <$filehandle> ) {
-                               print UPLOADFILE;
-                       }
-                       close (UPLOADFILE);
-
-                       #Open file to check if dimensions are within rang
-                       open (PNG , "<$logopath/logo.png");
-                       local $/;
-                       my $PNG1=<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");
@@ -119,91 +142,89 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
        }
 }
 
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive genvoucher'}"){
-       #generates a voucher and writes it to /var/ipfire/voucher_out   
-
-       #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 voucher with same code
-       &General::readhasharray("$voucherout", \%voucherhash);
-       foreach my $key (keys %voucherhash) {
-               if($voucherhash{$key}[1] eq $cgiparams{'CODE'}){
-                       $errormessage=$Lang::tr{'Captive err doublevoucher'};
-                       last;
-               }
-       }
-
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupons'}") {
        #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 .. 3) { $voucherhash{$key}[$i] = "";}
-               #define fields
-               $voucherhash{$key}[0] = $date;
-               $voucherhash{$key}[1] = $cgiparams{'CODE'};
-               $voucherhash{$key}[2] = $settings{'EXPIRE'};
-               $voucherhash{$key}[3] = $cgiparams{'REMARK'};
-               #write values to disk
-               &General::writehasharray("$voucherout", \%voucherhash);
-
-               #now prepare log entry, get expiring date for voucher and decode remark for logfile
-               my $expdate=localtime(time()+$voucherhash{$key}[3]);
-               my $rem=HTML::Entities::decode_entities($voucherhash{$key}[4]);
-
-               #write logfile entry
-               &General::log("Captive", "Generated new voucher $voucherhash{$key}[1] $voucherhash{$key}[2] hours valid expires on $expdate remark $rem");
+       if (!$errormessage) {
+               # Remember selected values
+               foreach my $val (("SESSION_TIME", "COUNT", "REMARK")) {
+                       $settings{$val} = $cgiparams{$val};
+               }
+               &General::writehash($settingsfile, \%settings);
+
+               &General::readhasharray($coupons, \%couponhash) if (-e $coupons);
+               my $now = time();
+
+               # Expiry time in seconds
+               my $expires = $settings{'SESSION_TIME'};
+
+               my $count = $settings{'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] = $settings{'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;
@@ -216,144 +237,192 @@ if ($cgiparams{'ACTION'} eq 'delvoucherinuse'){
 }
 
 #open webpage, print header and open box
-&Header::openpage($Lang::tr{'Captive menu'}, 1, '');
+&Header::openpage($Lang::tr{'Captive'}, 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>
+$selected{'AUTH'} = ();
+$selected{'AUTH'}{'COUPON'} = "";
+$selected{'AUTH'}{'TERMS'} = "";
+$selected{'AUTH'}{$settings{'AUTH'}} = "selected";
+
+if ($netsettings{'GREEN_DEV'}){
+       print <<END;
                <tr>
-               <td><br>
-                       $Lang::tr{'Captive title'}
-               </td>
-               <td><br>
-                       <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
-               </td>
+                       <td width='30%'>
+                               $Lang::tr{'Captive active on'}
+                               <font color='$Header::colourgreen'>$Lang::tr{'green'}</font>
+                       </td>
+                       <td>
+                               <input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} />
+                       </td>
                </tr>
 END
-;
+}
 
-print<<END
+if ($netsettings{'BLUE_DEV'}){
+       print <<END;
                <tr>
-                       <td><br>
-                               $Lang::tr{'Captive authentication'}
+                       <td width='30%'>
+                               $Lang::tr{'Captive active on'}
+                               <font color='$Header::colourblue'>$Lang::tr{'blue'}</font>
                        </td>
-                       <td><br>
-                               <select name='AUTH'>
+                       <td>
+                               <input type='checkbox' name='ENABLE_BLUE' $checked{'ENABLE_BLUE'}{'on'} />
+                       </td>
+               </tr>
+END
+}
+
+print<<END
+       <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='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>";
+if ($settings{'AUTH'} eq 'TERMS') {
+       $selected{'SESSION_TIME'} = ();
+       foreach my $session_time (keys %session_times) {
+               $selected{'SESSION_TIME'}{$session_time} = "";
+       }
+       $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected";
 
-       print<<END
-                               </select>       
-                       </td>
-               </tr>
+       print <<END;
+               <tr>
+                       <td>$Lang::tr{'Captive client session expiry time'}</td>
+                       <td>
+                               <select name="SESSION_TIME">
 END
-;
-       if ($settings{'AUTH'} eq 'TERMS') {
-               my $terms = &getterms();
+
+       foreach my $session_time (sort { $a <=> $b } keys %session_times) {
                print <<END;
-                       <tr>
-                               <td></td>
-                               <td>
-                                       <textarea cols="50" rows="10" name="TERMS">$terms</textarea>
-                               </td>
-                       </tr>
+                                       <option value="$session_time" $selected{'SESSION_TIME'}{$session_time}>
+                                               $session_times{$session_time}
+                                       </option>
 END
        }
 
-       #Logo Upload
-       print "<tr><td><br>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><br><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>";
-       #Show Logo in webinterface with 1/2 size if set
-       if (-f "$logopath/logo.png"){
-               print"<td>$Lang::tr{'Captive logo_set'}</td>";
-               print"<td><img src='/captive/logo/logo.png' alt='$logopath/logo.png' width='25%' height='25%' /></td></tr>";
-       }else{
-               print"<td>$Lang::tr{'Captive logo_set'}</td>";
-               print"<td><br>$Lang::tr{'no'}</td></tr>";
-       }
-print<<END
-               <tr>
-                       <td>$Lang::tr{'Captive brand color'}</td>
-                       <td>
-                               <input type="color" name="COLOR" value="$settings{'COLOR'}">
+       print <<END;
+                               </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>
+       <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>
-               </table>
-               <br><br>
 END
-;
-       print "</form>";
+}
 
-       &Header::closebox();
+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();
 
-       #if settings is set to use vouchers, the voucher part has to be displayed
-       if ($settings{'AUTH'} eq 'VOUCHER'){
-               &voucher();
-       }else{
-               #otherwise we show the licensepart
-               &show_license_connections();
+#if settings is set to use coupons, the coupon part has to be displayed
+if ($settings{'AUTH'} eq 'COUPON') {
+       &coupons();
+}
+
+# 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(){
@@ -364,207 +433,209 @@ sub gencode(){
        return $randomstring;
 }
 
-sub voucher(){
-       #show voucher part
-       &Header::openbox('100%', 'left', $Lang::tr{'Captive genvoucher'});
-       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>&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 genvoucher'}'><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();}
-}
+sub coupons() {
+       &Header::openbox('100%', 'left', $Lang::tr{'Captive generate 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%'>$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>
+       $selected{'SESSION_TIME'} = ();
+       foreach my $session_time (keys %session_times) {
+               $selected{'SESSION_TIME'}{$session_time} = "";
+       }
+       $selected{'SESSION_TIME'}{$settings{'SESSION_TIME'}} = "selected";
+
+       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%'>
+                                               <select name="SESSION_TIME">
 END
-;
-       #read all clients from hash and show table
-       &General::readhasharray("$clients", \%clientshash);
-       foreach my $key (keys %clientshash){
-               my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($clientshash{$key}[2]));
-               my $endtime;
-               if ($clientshash{$key}[3] eq '0'){
-                       $endtime=$Lang::tr{'Captive nolimit'};
-               }else{
-                       $endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($clientshash{$key}[2]+$clientshash{$key}[3]));
-               }
 
-               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='delvoucherinuse' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
-               $count++;
+       foreach my $session_time (sort { $a <=> $b } keys %session_times) {
+               print <<END;
+                                                       <option value="$session_time" $selected{'SESSION_TIME'}{$session_time}>
+                                                               $session_times{$session_time}
+                                                       </option>
+END
        }
-       
-       print "</table>";
+
+       print <<END;
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>$Lang::tr{'remark'}</td>
+                                       <td>
+                                               <input type='text' name='REMARK' size=40>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>$Lang::tr{'Captive generated coupon no'}</td>
+                                       <td>
+                                               <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>
+                                       </td>
+                               </tr>
+                       </table>
+
+                       <div align="right">
+                               <input type="submit" name="ACTION" value="$Lang::tr{'Captive generate coupons'}">
+                       </div>
+               </form>
+END
+
        &Header::closebox();
+
+       # Show all coupons if exist
+       if (! -z $coupons) {
+               &show_coupons();
+       }
 }
 
-sub show_voucher_out(){
-       #if there are already generated but unsused vouchers, print a table
-       return if ( -z $voucherout);
-       my $count=0;
-       my $col;
-       &Header::openbox('100%', 'left', $Lang::tr{'Captive vout'});
-       print<<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>
+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
-;
-       &General::readhasharray("$voucherout", \%voucherhash);
-       foreach my $key (keys %voucherhash)
-       {
-               my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($voucherhash{$key}[0]));
-               my $endtime;
-               if ($voucherhash{$key}[2] eq '0'){
-                       $endtime=$Lang::tr{'Captive nolimit'};
-               }else{
-                       $endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime(time()+$voucherhash{$key}[2]));
+
+       foreach my $key (keys %couponhash) {
+               my $expirytime = $Lang::tr{'Captive nolimit'};
+               if ($couponhash{$key}[2] > 0) {
+                       $expirytime = &General::format_time($couponhash{$key}[2]);
                }
 
-               if ($count % 2){
-                       print" <tr>";
+               if ($count++ % 2) {
                        $col="bgcolor='$color{'color20'}'";
-               }else{
+               } else {
                        $col="bgcolor='$color{'color22'}'";
-                       print" <tr>";
                }
 
-               print "<td $col><center><b>$voucherhash{$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>";
-               $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>";
+
+       # Download PDF
+       print <<END;
+               <div align="right">
+                       <form method="POST">
+                               <input type="hidden" name="ACTION" value="export-coupons">
+                               <input type="submit" value="$Lang::tr{'Captive export coupons'}">
+                       </form>
+               </div>
+END
+
        &Header::closebox();
 }
 
-sub show_voucher_in_use(){
-       #if there are active clients which use vouchers show table
+sub show_clients() {
+       # if there are active clients which use coupons show table
        return if ( -z $clients || ! -f $clients );
+
        my $count=0;
        my $col;
-       &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'});
-print<<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>
+
+       &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);
-       foreach my $key (keys %clientshash)
-       {
+
+       &General::readhasharray($clients, \%clientshash) if (-e $clients);
+       foreach my $key (keys %clientshash) {
                #calculate time from clientshash (starttime)
                my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($clientshash{$key}[2]));
+
                #calculate endtime from clientshash
                my $endtime;
                if ($clientshash{$key}[3] eq '0'){
                        $endtime=$Lang::tr{'Captive nolimit'};
-               }else{
+               } else {
                        $endtime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($clientshash{$key}[2]+$clientshash{$key}[3]));
                }
 
-                       if ($count % 2){
-                               print" <tr>";
-                               $col="bgcolor='$color{'color20'}'";
-                       }else{
-                               $col="bgcolor='$color{'color22'}'";
-                               print" <tr>";
-                       }
+               if ($count++ % 2) {
+                       $col="bgcolor='$color{'color20'}'";
+               } else {
+                       $col="bgcolor='$color{'color22'}'";
+               }
 
-                       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>";
-                       $count++;
+               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
        }
 
        print "</table>";
+
        &Header::closebox();
 }
 
@@ -588,28 +659,135 @@ 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 generate_pdf() {
+       my $pdf = PDF::API2->new();
+
+       my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = gmtime(time);
+       my $timestamp = sprintf("D:%04d%02d%02d%02d%02d%02d+00;00", $year+1900, $mon+1, $mday, $hour, $min, $sec);
+
+       $pdf->info(
+               "Creator"      => $Lang::tr{'Captive portal'},
+               "Title"        => $Lang::tr{'Captive portal coupons'},
+               "CreationDate" => $timestamp,
+               "ModDate"      => $timestamp,
+       );
+
+       # Set page size
+       $pdf->mediabox("A4");
+       $pdf->trimbox(28/mm, 27/mm, 182/mm, 270/mm);
+
+       # Set font
+       my $font = $pdf->ttfont("/usr/share/fonts/Ubuntu-R.ttf");
+
+       my $page_h_margin = 27/mm;
+       my $page_v_margin = 28/mm;
 
-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();
+       my $height = 68/mm;
+       my $width  = 91/mm;
+       my $margin =  2/mm;
+
+       # Tux Image
+       my $tux_image = $pdf->image_png("/srv/web/ipfire/html/captive/assets/ipfire.png");
+       my $logo_height = 12/mm;
+       my $logo_width  = 12/mm;
+
+       my @coupons = ();
+       my %coupon_expiry_times = ();
+
+       # Read coupons
+       &General::readhasharray($coupons, \%couponhash) if (-e $coupons);
+       foreach my $key (keys %couponhash) {
+               $coupon_expiry_times{$couponhash{$key}[1]} = $couponhash{$key}[2];
+               push @coupons, $couponhash{$key}[1];
+       }
+
+       while (@coupons) {
+               # Make a new page
+               my $page = $pdf->page();
+
+               # Graphics
+               $gfx = $page->gfx();
+
+               # Headline font
+               my $f_headline = $page->text();
+               $f_headline->font($font, 20);
+
+               # Subheadline font
+               my $f_subheadline = $page->text();
+               $f_subheadline->font($font, 14);
+
+               # Coupon font
+               my $f_coupon = $page->text();
+               $f_coupon->font($font, 36);
+
+               # Lifetime
+               my $f_lifetime = $page->text();
+               $f_lifetime->font($font, 14);
+
+               # Watermark font
+               my $f_watermark = $page->text();
+               $f_watermark->fillcolor("#666666");
+               $f_watermark->font($font, 10);
+
+               my $i = 0;
+               while (@coupons && $i < 8) {
+                       my $coupon = shift @coupons;
+
+                       # Box corners
+                       my $x = ($page_v_margin / 2) + (($i % 2) ? $width : 0);
+                       my $y = ($page_h_margin / 2) + (int($i / 2) * $height);
+
+                       # Weidth and height of the box
+                       my $w = $width - $margin;
+                       my $h = $height - $margin;
+
+                       # Center
+                       my $cx = $x + ($w / 2);
+                       my $cy = $y + ($h / 2);
+
+                       # Draw border box
+                       $gfx->strokecolor("#333333");
+                       $gfx->linedash(1/mm, 1/mm);
+                       $gfx->rect($x, $y, $w, $h);
+                       $gfx->stroke();
+                       $gfx->endpath();
+
+                       # Headline
+                       $f_headline->translate($cx, ($y + $h - $cy) / 1.7 + $cy);
+                       $f_subheadline->translate($cx, ($y + $h - $cy) / 2.4 + $cy);
+
+                       if ($settings{'TITLE'}) {
+                               $f_headline->text_center(decode("utf8", $settings{'TITLE'}));
+                               $f_subheadline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));
+                       } else {
+                               $f_headline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));
+                       }
+
+                       # Coupon
+                       $f_coupon->translate($cx, $cy);
+                       $f_coupon->text_center(decode("utf8", $coupon));
+
+                       # Show lifetime
+                       my $expiry_time = $coupon_expiry_times{$coupon};
+                       $f_lifetime->translate($cx, $cy - ($y + $h - $cy) / 4);
+                       if ($expiry_time > 0) {
+                               my $lifetime = &General::format_time($expiry_time);
+                               $f_lifetime->text_center(decode("utf8", $Lang::tr{'Captive valid for'} . " " . $lifetime));
+                       } else {
+                               $f_lifetime->text_center(decode("utf8", $Lang::tr{'Captive nolimit'}));
+                       }
+
+                       # Add watermark
+                       $gfx->image($tux_image, $x + $w - $logo_width - $margin, $y + $margin, $logo_width, $logo_height);
+                       $f_watermark->translate($x + $w - ($margin * 2) - $logo_width, $y + ($logo_height / 2));
+                       $f_watermark->text_right("Powered by IPFire");
+
+                       $i++;
+               }
        }
+
+       # Write out the PDF document
+       return $pdf->stringify();
 }
 
 &Header::closebigbox();