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, core61 has been updated via 5122dafe9d1816b3d06135fc14a008f6115d0035 (commit) via c8a8778f897fb8a7ff11509107975c6d88a2f1d2 (commit) via 03435d851bc040aedecc8a0833baba75ff1f045e (commit) via 1f571dbd723fdf6d24bf0e1e5389e518930be94d (commit) from 5fc15be081a86a83356cd1ba97f22361468b5e5f (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 5122dafe9d1816b3d06135fc14a008f6115d0035 Merge: 5fc15be c8a8778 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jul 22 17:50:56 2012 +0200

Merge remote-tracking branch 'origin/master' into core61

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

Summary of changes: html/cgi-bin/connections.cgi | 12 +++++++++++- html/cgi-bin/credits.cgi | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-)

Difference in files: diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 21f66d7..fbd7fcd 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -32,6 +32,8 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl";

+my $colour_multicast = "#A0A0A0"; + &Header::showhttpheaders();

my @network=(); @@ -147,6 +149,11 @@ if ($netsettings{'ORANGE_DEV'}) { } }

+# Highlight multicast connections. +push(@network, "224.0.0.0"); +push(@masklen, "239.0.0.0"); +push(@colour, $colour_multicast); + # Add OpenVPN net and RED/BLUE/ORANGE entry (when appropriate) if (-e "${General::swroot}/ovpn/settings") { my %ovpnsettings = (); @@ -173,7 +180,7 @@ if (-e "${General::swroot}/ovpn/settings") { } }

-open(IPSEC, "${General::swroot}/var/ipfire/vpn/config"); +open(IPSEC, "${General::swroot}/vpn/config"); my @ipsec = <IPSEC>; close(IPSEC);

@@ -243,6 +250,9 @@ print <<END; <td align='center' bgcolor='${Header::colourovpn}'> <b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b> </td> + <td align='center' bgcolor='$colour_multicast'> + <b><font color='#FFFFFF'>Multicast</font></b> + </td> </tr> </table> <br> diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 75e59b1..3ae2f71 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -42,9 +42,9 @@ print <<END <div align="center"> <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> <input type="hidden" name="cmd" value="_s-xclick"> - <input type="hidden" name="hosted_button_id" value="10781833"> - <input type="image" src=$Lang::tr{'donation-link'} border="0" name="submit" alt="PayPal - The safer, easier way to pay online."> - <img alt="" border="0" src="https://www.paypal.com/de_DE/i/scr/pixel.gif" width="1" height="1"> + <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY"> + <input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1"> </form> </div> <br />

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