[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e2bd5a6eb9385b82970c0e0afff5825950772fe1

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e2bd5a6eb9385b82970c0e0afff5825950772fe1

[git]

[-- Attachment #1: Type: text/plain, Size: 2829 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  e2bd5a6eb9385b82970c0e0afff5825950772fe1 (commit)
      from  2f27148cbbf9482a11bc05c1afb410e3bb1bebb0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e2bd5a6eb9385b82970c0e0afff5825950772fe1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 11 14:52:03 2017 +0100

    captive: Allow editing terms in coupon mode
    
    Since the terms are always shown when set, we need a way
    to edit them in coupon mode as well.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/captive.cgi | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index ae3ebbf..501bd87 100755
--- 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 ($settings{'AUTH'} eq '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");
@@ -291,16 +289,8 @@ if ($settings{'AUTH'} eq 'TERMS') {
 	$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">
@@ -357,9 +347,16 @@ if (-e $logo) {
 END
 }
 
+my $terms = &getterms();
 print <<END;
 	<tr>
 		<td></td>
+		<td>
+			<textarea cols="50" rows="10" name="TERMS">$terms</textarea>
+		</td>
+	</tr>
+	<tr>
+		<td></td>
 		<td align='right'>
 			<input type='submit' name='ACTION' value="$Lang::tr{'save'}"/>
 		</td>


hooks/post-receive
--
IPFire 2.x development tree