captive: Allow selecting the session expiry time for terms

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index bb9c9b0bbe5930892c00f1c02aa9e7234375aa46..a060fa95bdbd9f513e80da60abff8eac9dbdff64 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -677,8 +677,11 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Captive GAIN ACCESS
 WARNING: untranslated string: Captive agree tac
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: addons
@@ -730,11 +733,15 @@ WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
 WARNING: untranslated string: info messages
 WARNING: untranslated string: no data
 WARNING: untranslated string: none
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: qos add subclass
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: show tls-auth key
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: vpn force mobike
 WARNING: untranslated string: vpn statistics n2n

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 079a3fdd91f8f34c6d7ad2ca4a6c9e0eeda5b653..040fcfb4a0296b51ffbe9eae950108d3f2ed3e42 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -618,6 +618,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Captive ACTIVATE
 WARNING: untranslated string: Captive GAIN ACCESS
 WARNING: untranslated string: Captive activated
@@ -625,6 +626,8 @@ WARNING: untranslated string: Captive active on
 WARNING: untranslated string: Captive agree tac
 WARNING: untranslated string: Captive authentication
 WARNING: untranslated string: Captive brand color
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive err doublevoucher
@@ -1046,6 +1049,9 @@ WARNING: untranslated string: no hardware random number generator
 WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1170,6 +1176,7 @@ WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: upload dh key

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 882ecd53cfec35b19c86df27b21b312feb917deb..4709237967c8158d6e1651d1b4d51a49aaaeb408 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -628,6 +628,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Captive ACTIVATE
 WARNING: untranslated string: Captive GAIN ACCESS
 WARNING: untranslated string: Captive activated
@@ -635,6 +636,8 @@ WARNING: untranslated string: Captive active on
 WARNING: untranslated string: Captive agree tac
 WARNING: untranslated string: Captive authentication
 WARNING: untranslated string: Captive brand color
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive err doublevoucher
@@ -1065,6 +1068,9 @@ WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
 WARNING: untranslated string: ntp common settings
 WARNING: untranslated string: ntp sync
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1184,6 +1190,7 @@ WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: upload dh key

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 72de20b333f7f448ca124bea87e36933d008d378..93a61b21db31c391770c92c669fc47dadda18134 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -695,6 +695,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Captive ACTIVATE
 WARNING: untranslated string: Captive GAIN ACCESS
 WARNING: untranslated string: Captive activated
@@ -702,6 +703,8 @@ WARNING: untranslated string: Captive active on
 WARNING: untranslated string: Captive agree tac
 WARNING: untranslated string: Captive authentication
 WARNING: untranslated string: Captive brand color
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive err doublevoucher
@@ -835,6 +838,9 @@ WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: messages
 WARNING: untranslated string: no data
 WARNING: untranslated string: none
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
 WARNING: untranslated string: ovpn add conf
@@ -852,6 +858,7 @@ WARNING: untranslated string: search
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: vpn broken
 WARNING: untranslated string: vpn connecting

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 10ae7a7adf418c0cfc8012bca51905c0ad297029..0acc6a7426b79cb47d6db26a7ef56ce145b6e1be 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -691,6 +691,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Captive ACTIVATE
 WARNING: untranslated string: Captive GAIN ACCESS
 WARNING: untranslated string: Captive activated
@@ -698,6 +699,8 @@ WARNING: untranslated string: Captive active on
 WARNING: untranslated string: Captive agree tac
 WARNING: untranslated string: Captive authentication
 WARNING: untranslated string: Captive brand color
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive err doublevoucher
@@ -867,6 +870,9 @@ WARNING: untranslated string: nameserver
 WARNING: untranslated string: no data
 WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
 WARNING: untranslated string: ovpn add conf
@@ -898,6 +904,7 @@ WARNING: untranslated string: ta key
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: upload dh key
 WARNING: untranslated string: vendor

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 079a3fdd91f8f34c6d7ad2ca4a6c9e0eeda5b653..040fcfb4a0296b51ffbe9eae950108d3f2ed3e42 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -618,6 +618,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Captive ACTIVATE
 WARNING: untranslated string: Captive GAIN ACCESS
 WARNING: untranslated string: Captive activated
@@ -625,6 +626,8 @@ WARNING: untranslated string: Captive active on
 WARNING: untranslated string: Captive agree tac
 WARNING: untranslated string: Captive authentication
 WARNING: untranslated string: Captive brand color
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive err doublevoucher
@@ -1046,6 +1049,9 @@ WARNING: untranslated string: no hardware random number generator
 WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1170,6 +1176,7 @@ WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: upload dh key

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 34f578508d312f77d3d656d18de68bff5c06f053..49d0c6569750a5dfcc9cbb78c1b488e4e553c867 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -619,6 +619,7 @@ WARNING: translation string unused: wlanap wlan services
 WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Add a route
 WARNING: untranslated string: Captive ACTIVATE
 WARNING: untranslated string: Captive GAIN ACCESS
@@ -627,6 +628,8 @@ WARNING: untranslated string: Captive active on
 WARNING: untranslated string: Captive agree tac
 WARNING: untranslated string: Captive authentication
 WARNING: untranslated string: Captive brand color
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive err doublevoucher
@@ -1048,6 +1051,9 @@ WARNING: untranslated string: no hardware random number generator
 WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1165,6 +1171,7 @@ WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: upload dh key

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 4d1839a5f2df1d339c3c7b9772ea937c82be6770..514181e81dedce17f5fe2b3f10431e7726cb8702 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -703,6 +703,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: 24 hours
 WARNING: untranslated string: Captive ACTIVATE
 WARNING: untranslated string: Captive GAIN ACCESS
 WARNING: untranslated string: Captive activated
@@ -710,6 +711,8 @@ WARNING: untranslated string: Captive active on
 WARNING: untranslated string: Captive agree tac
 WARNING: untranslated string: Captive authentication
 WARNING: untranslated string: Captive brand color
+WARNING: untranslated string: Captive branding
+WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive err doublevoucher
@@ -782,10 +785,14 @@ WARNING: untranslated string: guardian watch snort alertfile
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
 WARNING: untranslated string: info messages
 WARNING: untranslated string: no data
+WARNING: untranslated string: one hour
+WARNING: untranslated string: one month
+WARNING: untranslated string: one week
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: vpn broken
 WARNING: untranslated string: vpn connecting

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index e7081e96ba87cf282678a11d844f8c4baa80ff91..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
@@ -291,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>
@@ -299,6 +310,19 @@ 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
        }
 

diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
index 42fca67cb258142700ffce4c31bfd49c29b23e82..698384b6a5cac2b1938fd3d3c357c6f63284910b 100755 (executable)
--- a/html/cgi-bin/captive/index.cgi
+++ b/html/cgi-bin/captive/index.cgi
@@ -112,8 +112,8 @@ if ($cgiparams{'ACTION'} eq "SUBMIT") {
 
        # License
        } else {
-               # Copy expiry time
-               $clientshash{$key}[3] = $settings{'EXPIRE'};
+               # Copy session expiry time
+               $clientshash{$key}[3] = $settings{'SESSION_TIME'} || "0";
 
                # No coupon code
                $clientshash{$key}[4] = "LICENSE";

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index cde2a2f8cffda9e47fc1f85e4388a758ffd02c37..6550d61ebdeaf75bf120b8df45bab00d5faed9d4 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,6 +1,7 @@
 %tr = ( 
 %tr,
 
+'24 hours' => '24 Hours',
 'Act as' => 'Act as:',
 'Add Level7 rule' => 'Add Level7 rule',
 'Add Port Rule' => 'Add port rule',
@@ -20,10 +21,11 @@
 'Captive auth_vou' => 'Voucher',
 'Captive authentication' => 'Type of Access',
 'Captive brand color' => 'Brand Color',
+'Captive branding' => 'Branding',
+'Captive client session expiry time' => 'Session Expiry Time',
 'Captive config' => 'Settings',
 'Captive coupon' => 'Coupon',
 'Captive err doublevoucher' => 'A voucher with this code already exists',
-'Captive branding' => 'Branding',
 'Captive expire' => 'Expire',
 'Captive generate coupon' => 'Generate Coupon',
 'Captive heading terms' => 'Terms & Conditions',
@@ -1741,6 +1743,9 @@
 'ok' => 'OK',
 'older' => 'Older',
 'on' => 'on',
+'one hour' => 'One Hour',
+'one month' => 'One Month',
+'one week' => 'One Week',
 'online help en' => 'Online help (in english)',
 'only digits allowed in holdoff field' => 'Only digits allowed in holdoff field',
 'only digits allowed in max retries field' => 'Only digits allowed in max retries field.',
@@ -2354,6 +2359,7 @@
 'unix password sync' => 'Unix Password Sync',
 'unix shell' => 'UNIX Shell',
 'unknown' => 'UNKNOWN',
+'unlimited' => 'Unlimited',
 'unnamed' => 'Unnamed',
 'update' => 'Update',
 'update accelerator' => 'Update Accelerator',