captive: Add headline to T&C box

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

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 453ae49a7be884240b2a101f179b98f7224790b0..54ea54ffaf7bf1758b36c5556b1843f3169b944d 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -97,13 +97,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
                &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");
@@ -285,26 +283,20 @@ 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";
 
-       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="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>
@@ -355,7 +347,14 @@ if (-e $logo) {
 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'>
@@ -370,11 +369,11 @@ END
 #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();
 }
 
+# Show active clients
+&show_clients();
+
 sub getterms() {
        my @ret;
 
@@ -517,50 +516,6 @@ END
        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() {