captive: Allow selecting the session expiry time for terms

[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 85b9c5d19e0c4aeeb7c0282b2d1568896f8aec66..ef5efc88ee243dd4a818f47fbadd9906888892c6 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -31,6 +31,8 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+my %selected = ();
+
 my $coupons = "${General::swroot}/captive/coupons";
 my %couponhash = ();
 
@@ -74,6 +76,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){
        $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
@@ -266,25 +269,13 @@ END
                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
-               </tr>
-               <tr>
-               <td><br>
-                       $Lang::tr{'Captive title'}
-               </td>
-               <td><br>
-                       <input type='text' name='TITLE' value="$settings{'TITLE'}" size='40'>
-               </td>
-               </tr>
-END
-;
-
 print<<END
+               </tr>
                <tr>
-                       <td><br>
+                       <td>
                                $Lang::tr{'Captive authentication'}
                        </td>
-                       <td><br>
+                       <td>
                                <select name='AUTH'>
 END
 ;
@@ -303,6 +294,14 @@ END
 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>
@@ -311,39 +310,77 @@ END
                                        <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
        }
 
-       #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
+       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
 
+       #Logo Upload
+       print <<END;
                <tr>
                        <td>
+                               $Lang::tr{'Captive logo_upload'}
+                               <br>
+                               $Lang::tr{'Captive logo_upload1'}
+                       </td>
+                       <td>
+                               <INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80>
                        </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></td>
                        <td align='right'>
-                       <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
+                               <input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
                        </td>
                </tr>
-               </table>
-               <br><br>
+       </table></form>
 END
-;
-       print "</form>";
 
        &Header::closebox();