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 c0c9df130fbb3c5080755822d227277627605196 (commit) via 828aaba2ac9d211f76ac9fef95e1dbd19c2315cb (commit) from f1f39aea071c0660f87cbd04b385bb77cb70cf00 (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 c0c9df130fbb3c5080755822d227277627605196 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Sep 13 20:44:48 2011 +0200
Remove OpenVPN changes in index.cgi.
commit 828aaba2ac9d211f76ac9fef95e1dbd19c2315cb Author: Alfred Haas alfred.haas@ipfire.org Date: Tue Sep 13 21:07:28 2011 +0200
ovpnmain.cgi: disabed debug output.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/index.cgi | 19 ------------------- html/cgi-bin/ovpnmain.cgi | 6 +++--- 2 files changed, 3 insertions(+), 22 deletions(-)
Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 0ef95ba..b325250 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -390,25 +390,6 @@ END END }
-### -# m.a.d n2n -### - -if ( -d "${General::swroot}/ovpn/n2nconf") { -my %confighash=(); -&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", %confighash); -foreach my $dkey (keys %confighash) { -if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') { -my @n2novpnet = split(///,$confighash{$dkey}[27]); - print <<END; - <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br> - <td width='30%' align='center'> $n2novpnet[0] - <td width='45%' align='center'><font color=$Header::colourblue>$confighash{$dkey}[6]</font> -END -} -} - } - # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>"; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ea52f85..165f351 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -33,8 +33,8 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl";
# enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourgreen} ); undef (@dummy);
hooks/post-receive -- IPFire 2.x development tree