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 924f5d6f1aa07d92f3a946e29f4208593a0fe4d2 (commit) via 953ff6edb3e4f14b08a5accad9f80a319476fabe (commit) via ea3eac2c509aa4f8acee62095f54949d53f55276 (commit) via 609b862fe7c58c3d61244888c1f7a98cb7da66cb (commit) from 4bb2df502d0f542396891973c68f0ea259f0bd66 (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 924f5d6f1aa07d92f3a946e29f4208593a0fe4d2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 18 18:54:25 2015 +0100

core95: Ship changed firewalllogcountry.dat

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

commit 953ff6edb3e4f14b08a5accad9f80a319476fabe Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 18 13:23:32 2015 +0200

firewalllogcountry.dat: Do not show 'Details' button for unkonw location.

The CGI offers the posibility to get more details for a certain locations by clicking on a button.

This feature cannot be used for the category "unknown". To prevent users from beeing confused about non show-able details, I added some code to hide this button for this category.

Fixes #10726.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit ea3eac2c509aa4f8acee62095f54949d53f55276 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 18 18:52:07 2015 +0100

core95: Ship changed pppsetup.cgi

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

commit 609b862fe7c58c3d61244888c1f7a98cb7da66cb Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 18 14:25:50 2015 +0200

pppsetup.cgi: Fix site layout when no TYPE is specified

There was an issue with false generated HTML code, in case of an empty or unset $pppsettings{'TYPE'} variable which results in a missplaced website footer.

This patch moves the code for closeing the table and the call of the closebox() function to the correct place to prevent this display issue.

Fixes #10565.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/rootfiles/core/95/filelists/files | 2 ++ html/cgi-bin/logs.cgi/firewalllogcountry.dat | 12 +++++++++++- html/cgi-bin/pppsetup.cgi | 6 ++++-- 3 files changed, 17 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index 91ce289..8bdc0eb 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -4,6 +4,8 @@ etc/rc.d/init.d/firewall lib/udev/network-hotplug-vlan lib/udev/rules.d/60-net.rules srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl usr/lib/firewall/ipsec-block diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index 29c0842..f998a62 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -456,7 +456,17 @@ for($s=0;$s<$lines;$s++) $color++; print "<tr>";

- print "<td align='center' $col><form method='post' action='showrequestfromcountry.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='country' value='$key[$s]'> <input type='submit' value='details'></form></td>"; + print "<td align='center' $col>"; + + # Dont show details button for "unknown" location. + if ($key[$s] ne 'unknown') { + print"<form method='post' action='showrequestfromcountry.dat'>"; + print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>"; + print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>"; + print"<input type='hidden' name='country' value='$key[$s]'>"; + print"<input type='submit' value='details'></form>"; + } + if($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq 'orange0') { print "<td align='center' $col>$key[$s]</td>"; } diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index b3e8e6c..36d0ced 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -980,12 +980,14 @@ print <<END <td colspan='2' width='50%'>$Lang::tr{'legend'}:</td> <td colspan='2' width='50%'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'required field'}</td> </tr> -</table> END ; -&Header::closebox(); }

+print "</table>"; + +&Header::closebox(); + print "</form>\n";

&Header::closebigbox();

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