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 7a3b1cc495ee8eb5aed7bdcf2b3bac1f45643c64..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'>