webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-17 06:23:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into kernel-update

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-08-03 16:40:50 +02:00
parent 098f2c4b40 3c4eaa3d2d
commit c40aa43762
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/armv5tel/glibc
View File

@@ -466,7 +466,7 @@ usr/bin/ldd
#usr/lib/crt1.o
#usr/lib/crti.o
#usr/lib/crtn.o
#usr/lib/gconv
usr/lib/gconv
#usr/lib/gconv/ANSI_X3.110.so
#usr/lib/gconv/ARMSCII-8.so
#usr/lib/gconv/ASMO_449.so

2
config/rootfiles/common/i586/glibc
View File

@@ -489,7 +489,7 @@ usr/bin/ldd
#usr/lib/crt1.o
#usr/lib/crti.o
#usr/lib/crtn.o
#usr/lib/gconv
usr/lib/gconv
#usr/lib/gconv/ANSI_X3.110.so
#usr/lib/gconv/ARMSCII-8.so
#usr/lib/gconv/ASMO_449.so

12
html/cgi-bin/connections.cgi
View File

@@ -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>

6
html/cgi-bin/credits.cgi
View File

@@ -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 />