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 f32174956eb8dc6d961c0fe09796e092b6846ae4 (commit) via 3a62dca68e411e90565ab4c9654cae88e56dcfdd (commit) from 440cd2cbfdfb2d386c200a05deb14fcd3a7cb1e6 (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 f32174956eb8dc6d961c0fe09796e092b6846ae4 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 12:43:42 2017 +0100

captive: Reindent code for better readability

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

commit 3a62dca68e411e90565ab4c9654cae88e56dcfdd Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 12:41:17 2017 +0100

captive: Localise GREEN/BLUE

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

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

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

Difference in files: diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index c595c0e..629acae 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -251,7 +251,6 @@ if ($errormessage) { print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}' enctype="multipart/form-data">\n <table width='100%' border="0"> - <tr> END ;

@@ -274,14 +273,34 @@ $selected{'AUTH'}{'TERMS'} = ""; $selected{'AUTH'}{$settings{'AUTH'}} = "selected";

if ($netsettings{'GREEN_DEV'}){ - print "<td width='30%'>$Lang::tr{'Captive active on'} <font color='$Header::colourgreen'>Green</font></td><td><input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} /></td></tr>"; + print <<END; + <tr> + <td width='30%'> + $Lang::tr{'Captive active on'} + <font color='$Header::colourgreen'>$Lang::tr{'green'}</font> + </td> + <td> + <input type='checkbox' name='ENABLE_GREEN' $checked{'ENABLE_GREEN'}{'on'} /> + </td> + </tr> +END } + if ($netsettings{'BLUE_DEV'}){ - 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> + <td width='30%'> + $Lang::tr{'Captive active on'} + <font color='$Header::colourblue'>$Lang::tr{'blue'}</font> + </td> + <td> + <input type='checkbox' name='ENABLE_BLUE' $checked{'ENABLE_BLUE'}{'on'} /> + </td> + </tr> +END }

print<<END - </tr> <tr> <td> $Lang::tr{'Captive authentication'}

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