captive: Redesign generated coupons table

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / captive.cgi

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index b15d1d37e325a28f47e8ce5bb9d526a436e5181c..4d2564afe79760616211b67a5b9fa8f89b5dfa53 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -115,18 +115,9 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
 }
 
 if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate 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 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
@@ -144,6 +135,16 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupon'}") {
                &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
@@ -563,44 +564,59 @@ END
 }
 
 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();
 }