From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch,
	master, updated. c8a8778f897fb8a7ff11509107975c6d88a2f1d2
Date: Sun, 22 Jul 2012 17:36:37 +0200
Message-ID: <20120722153643.A52B220152@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7658136325769736591=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============7658136325769736591==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, master has been updated
       via  c8a8778f897fb8a7ff11509107975c6d88a2f1d2 (commit)
       via  03435d851bc040aedecc8a0833baba75ff1f045e (commit)
       via  1f571dbd723fdf6d24bf0e1e5389e518930be94d (commit)
      from  cd025baaceeabdd1fd50af0476dfedacb8f60ce6 (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 c8a8778f897fb8a7ff11509107975c6d88a2f1d2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jul 22 17:36:13 2012 +0200

    connections.cgi: Highlight multicast (former class D) connections.

commit 03435d851bc040aedecc8a0833baba75ff1f045e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jul 22 17:35:41 2012 +0200

    connections.cgi: Fix parsing of IPsec config file.

commit 1f571dbd723fdf6d24bf0e1e5389e518930be94d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jul 22 17:34:00 2012 +0200

    credits.cgi: Update PP information.

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

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";
=20
+my $colour_multicast =3D "#A0A0A0";
+
 &Header::showhttpheaders();
=20
 my @network=3D();
@@ -147,6 +149,11 @@ if ($netsettings{'ORANGE_DEV'}) {
 	}
 }
=20
+# 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 =3D ();
@@ -173,7 +180,7 @@ if (-e "${General::swroot}/ovpn/settings") {
 	}
 }
=20
-open(IPSEC, "${General::swroot}/var/ipfire/vpn/config");
+open(IPSEC, "${General::swroot}/vpn/config");
 my @ipsec =3D <IPSEC>;
 close(IPSEC);
=20
@@ -243,6 +250,9 @@ print <<END;
 			<td align=3D'center' bgcolor=3D'${Header::colourovpn}'>
 				<b><font color=3D'#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b>
 			</td>
+			<td align=3D'center' bgcolor=3D'$colour_multicast'>
+				<b><font color=3D'#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=3D"center">
 		<form action=3D"https://www.paypal.com/cgi-bin/webscr" method=3D"post">
 			<input type=3D"hidden" name=3D"cmd" value=3D"_s-xclick">
-			<input type=3D"hidden" name=3D"hosted_button_id" value=3D"10781833">
-			<input type=3D"image" src=3D$Lang::tr{'donation-link'} border=3D"0" name=
=3D"submit" alt=3D"PayPal - The safer, easier way to pay online.">
-			<img alt=3D"" border=3D"0" src=3D"https://www.paypal.com/de_DE/i/scr/pixe=
l.gif" width=3D"1" height=3D"1">
+			<input type=3D"hidden" name=3D"hosted_button_id" value=3D"HHBTSN9QRWPAY">
+			<input type=3D"image" src=3D"$Lang::tr{'donation-link'}" border=3D"0" nam=
e=3D"submit" alt=3D"PayPal - The safer, easier way to pay online!">
+			<img alt=3D"" border=3D"0" src=3D"https://www.paypalobjects.com/de_DE/i/s=
cr/pixel.gif" width=3D"1" height=3D"1">
 		</form>
 	</div>
 <br />


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

--===============7658136325769736591==--