From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Oct 2017 13:21:12 +0000 (+0100)
Subject: captive portal: Allow sessions to expire after 8 hours
X-Git-Tag: v2.19-core115~60^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0a219160ac7dfe243c94c1f04c182d29206df8ec;hp=1f06098ba7f4894c9e3dfb744c38f6ef5c576743

captive portal: Allow sessions to expire after 8 hours

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

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 290dbc0053..a7010105b6 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -759,6 +759,7 @@ WARNING: untranslated string: drop action1
 WARNING: untranslated string: drop action2
 WARNING: untranslated string: drop forward
 WARNING: untranslated string: drop outgoing
+WARNING: untranslated string: eight hours
 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 75424f85ab..1389cbbe75 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -769,6 +769,7 @@ WARNING: untranslated string: drop action1
 WARNING: untranslated string: drop action2
 WARNING: untranslated string: drop forward
 WARNING: untranslated string: drop outgoing
+WARNING: untranslated string: eight hours
 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid
diff --git a/doc/language_issues.it b/doc/language_issues.it
index dc64186227..5b921a84a9 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -745,6 +745,7 @@ WARNING: untranslated string: dhcp dns update algo
 WARNING: untranslated string: dhcp dns update secret
 WARNING: untranslated string: dl client arch insecure
 WARNING: untranslated string: dnssec disabled warning
+WARNING: untranslated string: eight hours
 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 3284639c19..16f6c0d893 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -757,6 +757,7 @@ WARNING: untranslated string: dnssec not supported
 WARNING: untranslated string: dnssec validating
 WARNING: untranslated string: download tls-auth key
 WARNING: untranslated string: drop outgoing
+WARNING: untranslated string: eight hours
 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 290dbc0053..a7010105b6 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -759,6 +759,7 @@ WARNING: untranslated string: drop action1
 WARNING: untranslated string: drop action2
 WARNING: untranslated string: drop forward
 WARNING: untranslated string: drop outgoing
+WARNING: untranslated string: eight hours
 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index f88653702a..a2a771ecee 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -763,6 +763,7 @@ WARNING: untranslated string: drop action1
 WARNING: untranslated string: drop action2
 WARNING: untranslated string: drop forward
 WARNING: untranslated string: drop outgoing
+WARNING: untranslated string: eight hours
 WARNING: untranslated string: email config
 WARNING: untranslated string: email empty field
 WARNING: untranslated string: email invalid
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 19fd6718c7..96849cd691 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -737,6 +737,7 @@ WARNING: untranslated string: application layer gateways
 WARNING: untranslated string: bytes
 WARNING: untranslated string: captive
 WARNING: untranslated string: dnssec disabled warning
+WARNING: untranslated string: eight hours
 WARNING: untranslated string: firewall graph country
 WARNING: untranslated string: firewall graph ip
 WARNING: untranslated string: firewall graph port
diff --git a/doc/language_missings b/doc/language_missings
index 7c63afca42..46f6d694d1 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -173,6 +173,7 @@
 < drop action2
 < drop forward
 < drop outgoing
+< eight hours
 < email config
 < email empty field
 < email error
@@ -862,6 +863,7 @@
 < drop action2
 < drop forward
 < drop outgoing
+< eight hours
 < email config
 < email empty field
 < email error
@@ -1533,6 +1535,7 @@
 < drop action2
 < drop forward
 < drop outgoing
+< eight hours
 < email config
 < email empty field
 < email error
@@ -2194,6 +2197,7 @@
 < drop forward
 < drop outgoing
 < Edit an existing route
+< eight hours
 < email config
 < email empty field
 < email error
diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 7a3b1cc495..2f85b17c2f 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -305,6 +305,7 @@ if ($settings{'AUTH'} eq 'TERMS') {
 				<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>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ad3aa9afcc..b23994a9a8 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -889,6 +889,7 @@
 'edit share' => 'Freigabe bearbeiten',
 'editor' => 'Editor',
 'eg' => 'z.B.:',
+'eight hours' => '8 Stunden',
 'email config' => 'Konfiguration',
 'email empty field' => 'Leeres Feld',
 'email error' => 'FEHLER: Test-E-Mail konnte nicht versendet werden',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 6c92e9d794..064fd7fc9e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -916,6 +916,7 @@
 'edit share' => 'Edit share',
 'editor' => 'Editor',
 'eg' => 'e.g.:',
+'eight hours' => '8 Hours',
 'email config' => 'Configuration',
 'email empty field' => 'Empty field',
 'email error' => 'ERROR: Test mail could not be sent',