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

index.cgi: Re-design index page.

Browse Source
This commit is contained in:
Alexander Marx
2014-01-14 21:57:26 +01:00
committed by Michael Tremer
parent 8e7137264b
commit 9d38669861
4 changed files with 264 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
html/cgi-bin/gpl.cgi Normal file
View File

@@ -0,0 +1,82 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "/opt/pakfire/lib/functions.pl";
my %cgiparams;
my $refresh;
if ( -e "/var/ipfire/main/gpl_accepted" ) {
print "Status: 302 Moved Temporarily\n";
print "Location: index.cgi\n\n";
exit (0);
}
&Header::showhttpheaders();
$cgiparams{'ACTION'} = '';
&Header::getcgihash(\%cgiparams);
&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
&Header::openbigbox('', 'center');
# licence agreement
if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
system('touch /var/ipfire/main/gpl_accepted');
}
&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
print <<END;
$Lang::tr{'gpl please read carefully the general public license and accept it below'}.
<br /><br />
END
;
if ( -e "/usr/share/doc/licenses/GPLv3" ) {
print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
print `cat /usr/share/doc/licenses/GPLv3`;
print '</textarea>';
}
else {
print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
}
print <<END;
<p>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
<br/ >
<input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
</form>
</p>
<a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
END
&Header::closebox();
&Header::closebigbox();
&Header::closepage();

365
html/cgi-bin/index.cgi
View File

@@ -21,6 +21,7 @@
use strict; use strict;
use Net::Telnet; use Net::Telnet;
use Sort::Naturally;
# enable only the following on debugging purpose # enable only the following on debugging purpose
#use warnings; #use warnings;
@@ -36,12 +37,22 @@ my %pppsettings=();
my %modemsettings=(); my %modemsettings=();
my %netsettings=(); my %netsettings=();
my %ddnssettings=(); my %ddnssettings=();
my %proxysettings=();
my %vpnsettings=();
my %vpnconfig=();
my %ovpnconfig=();
my $warnmessage = ''; my $warnmessage = '';
my $refresh = ""; my $refresh = "";
my $ipaddr=''; my $ipaddr='';
my $showbox=0;
my $showipsec=0;
my $showovpn=0;
my $haveipsec=0; if ( ! -e "/var/ipfire/main/gpl_accepted" ) {
my $haveovpn=0; print "Status: 302 Moved Temporarily\n";
print "Location: gpl.cgi\n\n";
exit (0);
}
&Header::showhttpheaders(); &Header::showhttpheaders();
@@ -53,6 +64,8 @@ $pppsettings{'PROFILENAME'} = 'None';
&General::readhash("${General::swroot}/modem/settings", \%modemsettings); &General::readhash("${General::swroot}/modem/settings", \%modemsettings);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/ddns/settings", \%ddnssettings); &General::readhash("${General::swroot}/ddns/settings", \%ddnssettings);
&General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
&General::readhash("${General::swroot}/vpn/settings", \%vpnsettings);
my %color = (); my %color = ();
my %mainsettings = (); my %mainsettings = ();
@@ -61,12 +74,12 @@ my %mainsettings = ();
my $connstate = &Header::connectionstatus(); my $connstate = &Header::connectionstatus();
if ( -e "/var/ipfire/main/gpl-accepted" ) { if ( -e "/var/ipfire/main/gpl-accepted" ) {
if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
$refresh = "<meta http-equiv='refresh' content='5;'>"; $refresh = "<meta http-equiv='refresh' content='5;'>";
} elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { }elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
$refresh = "<meta http-equiv='refresh' content='30;'>"; $refresh = "<meta http-equiv='refresh' content='30;'>";
} }
} }
if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
@@ -81,8 +94,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
unlink("${General::swroot}/ppp/settings"); unlink("${General::swroot}/ppp/settings");
link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}", link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}",
"${General::swroot}/ppp/settings"); "${General::swroot}/ppp/settings");
system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings"); open (TMP, ">${General::swroot}/ppp/updatesettings");
close TMP;
# read in the new params "early" so we can write secrets. # read in the new params "early" so we can write secrets.
%cgiparams = (); %cgiparams = ();
&General::readhash("${General::swroot}/ppp/settings", \%cgiparams); &General::readhash("${General::swroot}/ppp/settings", \%cgiparams);
@@ -106,10 +119,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
if ($cgiparams{'ACTION'} eq $Lang::tr{'dial'}) { if ($cgiparams{'ACTION'} eq $Lang::tr{'dial'}) {
system('/usr/local/bin/redctrl start > /dev/null') == 0 system('/usr/local/bin/redctrl start > /dev/null') == 0
or &General::log("Dial failed: $?"); sleep 1;} or &General::log("Dial failed: $?"); sleep 1;
elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) { }elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) {
system('/usr/local/bin/redctrl stop > /dev/null') == 0 system('/usr/local/bin/redctrl stop > /dev/null') == 0
or &General::log("Hangup failed: $?"); sleep 1;} or &General::log("Hangup failed: $?"); sleep 1;
}
my $c; my $c;
my $maxprofiles = 5; my $maxprofiles = 5;
@@ -129,29 +143,21 @@ for ($c = 1; $c <= $maxprofiles; $c++) {
$selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'"; $selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'";
my $dialButtonDisabled = "disabled='disabled'"; my $dialButtonDisabled = "disabled='disabled'";
&Header::openpage($Lang::tr{'main page'}, 1, $refresh); &Header::openpage($Lang::tr{'main page'}, 1, $refresh);
&Header::openbigbox('', 'center'); &Header::openbigbox('', 'center');
if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
$ipaddr = <IPADDR>;
close IPADDR;
chomp ($ipaddr);
}
# licence agreement
if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
system('touch /var/ipfire/main/gpl_accepted')
}
if ( -e "/var/ipfire/main/gpl_accepted" ) {
&Header::openbox('100%', 'center', ''); &Header::openbox('100%', 'center', '');
if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
if (open(IPADDR,"${General::swroot}/ddns/ipcache")) { if (open(IPADDR,"${General::swroot}/ddns/ipcache")) {
$ipaddr = <IPADDR>; $ipaddr = <IPADDR>;
close IPADDR; close IPADDR;
chomp ($ipaddr); chomp ($ipaddr);
} }
if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
$ipaddr = <IPADDR>;
close IPADDR;
chomp ($ipaddr);
}
} elsif ($modemsettings{'VALID'} eq 'no') { } elsif ($modemsettings{'VALID'} eq 'no') {
print "$Lang::tr{'modem settings have errors'}\n </b></font>\n"; print "$Lang::tr{'modem settings have errors'}\n </b></font>\n";
} else { } else {
@@ -160,45 +166,54 @@ if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || (
print <<END; print <<END;
<!-- Table of networks --> <!-- Table of networks -->
<table width=80% class='tbl'> <table width=80% class='tbl' >
<tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th> <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
<th bgcolor='$color{'color20'}'>$Lang::tr{'ip address'}</th> <th bgcolor='$color{'color20'}'>$Lang::tr{'ip address'}</th>
<th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr>
<tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td> <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td>
<td width='30%' align='center'>$ipaddr </td> <td width='30%' align='center'>$ipaddr </td>
<td width='45%' align='center'>$connstate <td width='45%' align='center'>$connstate </td></tr>
END END
my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
if ( "$HOSTNAME" ne "" ) { if ( "$HOSTNAME" ne "" ) {
print <<END; print <<END;
<tr><td><b>Hostname:</b><td align='center'>$HOSTNAME<td>&nbsp; <tr><td><b>Hostname:</b><td align='center'>$HOSTNAME</td><td></td>
END END
} }
if ( -e "/var/ipfire/red/remote-ipaddress" ) { if ( -e "${General::swroot}/red/remote-ipaddress" ) {
my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`; open (TMP, "<${General::swroot}/red/remote-ipaddress");
my $GATEWAY = <TMP>;
chomp($GATEWAY); chomp($GATEWAY);
close TMP;
print <<END; print <<END;
<tr><td><b>Gateway:</b><td align='center'>$GATEWAY<td>&nbsp; <tr><td><b>Gateway:</b><td align='center'>$GATEWAY</td><td></td></tr>
END END
} }
#Read DNS server 1
my $DNS1 = `cat /var/ipfire/red/dns1`; open (DNS1, "<${General::swroot}/red/dns1");
my $DNS2 = `cat /var/ipfire/red/dns2`; my $DNS1 = <DNS1>;
chomp($DNS1);
chomp($DNS1); chomp($DNS1);
close DNS1;
#Read DNS server 2
open (DNS2, "<${General::swroot}/red/dns2");
my $DNS2 = <DNS2>;
chomp($DNS2);
close DNS2;
if ( $DNS1 ) { print <<END; if ( $DNS1 ) { print <<END;
<tr><td><b>DNS-Server:</b><td align='center'>$DNS1 <tr><td><b>$Lang::tr{'dns server'}1:</b></td><td align='center'>$DNS1</td><td></td></tr>
END END
} }
if ( $DNS2 ) { print <<END; if ( $DNS2 ) { print <<END;
<td align='center'>$DNS2 <tr><td><b>$Lang::tr{'dns server'}2:</b></td><td align='center'>$DNS2</td><td></td></tr>
</table>
END END
} else { print <<END; } else { print <<END;
<td>&nbsp;</td> <td></td>
</tr> </tr>
</table> </table>
END END
} }
@@ -255,9 +270,9 @@ END
<td width='30%' align='center'>$netsettings{'GREEN_ADDRESS'}/$sub <td width='30%' align='center'>$netsettings{'GREEN_ADDRESS'}/$sub
<td width='45%' align='center'> <td width='45%' align='center'>
END END
if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) { if ( $proxysettings{'ENABLE'} eq 'on' ) {
print $Lang::tr{'advproxy on'}; print $Lang::tr{'advproxy on'};
if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; } if ( $proxysettings{'TRANSPARENT'} eq 'on' ) { print " (transparent)"; }
} else { print $Lang::tr{'advproxy off'}; } } else { print $Lang::tr{'advproxy off'}; }
} }
if ( $netsettings{'BLUE_DEV'} ) { if ( $netsettings{'BLUE_DEV'} ) {
@@ -267,9 +282,9 @@ END
<td width='30%' align='center'>$netsettings{'BLUE_ADDRESS'}/$sub <td width='30%' align='center'>$netsettings{'BLUE_ADDRESS'}/$sub
<td width='45%' align='center'> <td width='45%' align='center'>
END END
if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) { if ( $proxysettings{'ENABLE_BLUE'} eq 'on' ) {
print $Lang::tr{'advproxy on'}; print $Lang::tr{'advproxy on'};
if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; } if ( $proxysettings{'TRANSPARENT_BLUE'} eq 'on' ) { print " (transparent)"; }
} else { print $Lang::tr{'advproxy off'}; } } else { print $Lang::tr{'advproxy off'}; }
} }
if ( $netsettings{'ORANGE_DEV'} ) { if ( $netsettings{'ORANGE_DEV'} ) {
@@ -281,10 +296,8 @@ END
END END
} }
#check if IPSEC is running #check if IPSEC is running
if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` || if ( $vpnsettings{'ENABLED'} eq 'on' || $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
`cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) { my $ipsecip = $vpnsettings{'VPN_IP'};
$haveipsec=1;
my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
print<<END; print<<END;
<tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'ipsec'}</b></font></a><br> <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'ipsec'}</b></font></a><br>
<td width='30%' align='center'>$ipsecip <td width='30%' align='center'>$ipsecip
@@ -302,7 +315,6 @@ if (($confighash{'ENABLED'} eq "on") ||
my ($ovpnip,$sub) = split("/",$confighash{'DOVPN_SUBNET'}); my ($ovpnip,$sub) = split("/",$confighash{'DOVPN_SUBNET'});
$sub=&General::iporsubtocidr($sub); $sub=&General::iporsubtocidr($sub);
$ovpnip="$ovpnip/$sub"; $ovpnip="$ovpnip/$sub";
$haveovpn=1;
print <<END; print <<END;
<tr> <tr>
<td align='center' bgcolor='$Header::colourovpn' width='25%'> <td align='center' bgcolor='$Header::colourovpn' width='25%'>
@@ -315,53 +327,73 @@ END
print"</td></tr></table>"; print"</td></tr></table>";
&Header::closebox(); &Header::closebox();
# Start of Box wich contains all vpn connections #Check if there are any vpns configured (ipsec and openvpn)
&Header::openbox('100%', 'center', $Lang::tr{'vpn'}) if ($haveipsec || $haveovpn); &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig);
foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) {
if ($vpnconfig{$key}[0] eq 'on'){
$showipsec=1;
$showbox=1;
last;
}
}
&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig);
foreach my $dkey (sort { ncmp($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
$showbox=1;
$showovpn=1;
last;
}
}
if ($showbox){
# Start of Box wich contains all vpn connections
&Header::openbox('100%', 'center', $Lang::tr{'vpn'});
#show ipsec connectiontable #show ipsec connectiontable
if ( $haveipsec ) { if ( $showipsec ) {
my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`; my $ipsecip = $vpnsettings{'VPN_IP'};
my @status = `/usr/local/bin/ipsecctrl I`; my @status = `/usr/local/bin/ipsecctrl I`;
my %confighash = (); my %confighash = ();
&General::readhasharray("${General::swroot}/vpn/config", \%confighash); my $id = 0;
my $gif;
my $col="";
my $count=0;
print <<END; print <<END;
<br> <br>
<table width='80%' class='tbl'> <table width='80%' class='tbl'>
<tr> <tr>
<th>$Lang::tr{'ipsec network'}</th> <th width='40%'>$Lang::tr{'ipsec network'}</th>
<th>$Lang::tr{'ip address'}</th> <th width='30%'>$Lang::tr{'ip address'}</th>
<th>$Lang::tr{'status'}</th> <th width='30%'>$Lang::tr{'status'}</th>
</tr> </tr>
END END
my $id = 0; foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
my $gif; if ($vpnconfig{$key}[0] eq 'on') {
my $col=""; $count++;
foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) { my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; } $vpnsub=&General::iporsubtocidr($vpnsub);
my ($vpnip,$vpnsub) = split("/",$confighash{$key}[11]); $vpnip="$vpnip/$vpnsub";
$vpnsub=&General::iporsubtocidr($vpnsub); if ($count % 2){
$vpnip="$vpnip/$vpnsub"; $col="bgcolor='$color{'color22'}'";
if ($id % 2) { }else{
$col="bgcolor='$color{'color20'}'"; $col="bgcolor='$color{'color20'}'";
print "<tr><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn' width='50%'><font color=white>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center' $col>$vpnip</td>";
} else {
$col="bgcolor='$color{'color22'}'";
print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn' width='50%'><font color=white>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center' $col>$vpnip</td>";
}
my $active = "<td bgcolor='${Header::colourred}' width='15%' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
if ($confighash{$key}[0] eq 'off') {
$active = "<td bgcolor='${Header::colourblue}' width='15%' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
} else {
foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
{
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
} }
} if ($id % 2) {
print "<tr><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>";
} else {
print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>";
}
my $active = "<td bgcolor='${Header::colourred}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
if ($vpnconfig{$key}[0] eq 'off') {
$active = "<td bgcolor='${Header::colourblue}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
} else {
foreach my $line (@status) {
if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
$active = "<td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td>";
}
}
}
print "$active</td>";
} }
print "$active</td>";
} }
print "</tr></table>"; print "</tr></table>";
} }
@@ -370,77 +402,67 @@ END
# Check if there is any OpenVPN connection configured. # Check if there is any OpenVPN connection configured.
### ###
if ( $haveovpn ) if ( $showovpn ){
{ print <<END;
print <<END; <br>
<br> <table width='80%' class='tbl'>
<table width='80%' class='tbl'> <tr>
<tr> <th width='40%'>$Lang::tr{'openvpn network'}</th>
<th>$Lang::tr{'openvpn network'}</th> <th width='30%'>$Lang::tr{'ip address'}</th>
<th>$Lang::tr{'ip address'}</th> <th width='30%'>$Lang::tr{'status'}</th>
<th>$Lang::tr{'status'}</th>
END END
# Check if the OpenVPN server for Road Warrior Connections is running and display status information.
my %confighash=();
&General::readhash("${General::swroot}/ovpn/settings", \%confighash); # Check if the OpenVPN server for Road Warrior Connections is running and display status information.
# Print the OpenVPN N2N connection status. my $active;
if ( -d "${General::swroot}/ovpn/n2nconf") { my $count=0;
my %confighash=(); # Print the OpenVPN N2N connection status.
if ( -d "${General::swroot}/ovpn/n2nconf") {
&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); my $col="";
my $lines; foreach my $dkey (sort { ncmp ($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
my $col=""; if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
foreach my $dkey (keys %confighash) { $count++;
$lines++; my $tport = $ovpnconfig{$dkey}[22];
if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) { next if ($tport eq '');
my $tport = $confighash{$dkey}[22]; my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport);
next if ($tport eq ''); $tnet->open('127.0.0.1');
my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); my @tustate = split(/\,/, $output[1]);
$tnet->open('127.0.0.1'); my $display;
my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); my $display_colour = $Header::colourred;
my @tustate = split(/\,/, $output[1]); if ( $tustate[1] eq 'CONNECTED' || ($tustate[1] eq 'WAIT')) {
$display_colour = $Header::colourgreen;
my $display; $display = $Lang::tr{'capsopen'};
my $display_colour = $Header::colourred; } else {
if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) { $display = $tustate[1];
$display_colour = $Header::colourgreen; }
$display = $Lang::tr{'capsopen'}; if ($count %2){
} else { $col="bgcolor='$color{'color22'}'";
$display = $tustate[1]; }else{
} $col="bgcolor='$color{'color20'}'";
if ($lines %2){ }
$col="bgcolor='$color{'color20'}'"; $active='off';
}else{ #make cidr from ip
$col="bgcolor='$color{'color22'}'"; my ($vpnip,$vpnsub) = split("/",$ovpnconfig{$dkey}[11]);
} my $vpnsub=&General::iporsubtocidr($vpnsub);
#make cidr from ip my $vpnip="$vpnip/$vpnsub";
my ($vpnip,$vpnsub) = split("/",$confighash{$dkey}[11]); print <<END;
my $vpnsub=&General::iporsubtocidr($vpnsub); <tr>
my $vpnip="$vpnip/$vpnsub"; <td align='left' nowrap='nowrap' bgcolor='$Header::colourovpn'><font color='white'>$ovpnconfig{$dkey}[1]</font></td>
print <<END; <td align='center' $col>$vpnip</td>
<tr> <td align='center' bgcolor='$display_colour' ><b><font color='#FFFFFF'>$display</font></b></td>
<td align='left' nowrap='nowrap' bgcolor='$Header::colourovpn' width='50%'><font color=white> </tr>
$confighash{$dkey}[1]
</td>
<td align='center' $col>
$vpnip
</td>
<td align='center' bgcolor='$display_colour' width='15%'>
<b>
<font color='#FFFFFF'>
$display
</font>
</b>
</td>
</tr>
END END
}
} }
} }
if ($active ne 'off'){
print "<tr><td colspan='3' align='center'>$Lang::tr{'ovpn no connections'}</td></tr>";
}
print"</table>";
} }
}
&Header::closebox(); &Header::closebox();
}
# Fireinfo # Fireinfo
if ( ! -e "/var/ipfire/main/send_profile") { if ( ! -e "/var/ipfire/main/send_profile") {
$warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>"; $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";
@@ -501,52 +523,21 @@ foreach my $disk (@files) {
$warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n"; $warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
} }
if ($warnmessage) { if ($warnmessage) {
&Header::openbox('100%','center', );
print "<table width='80%' class='tbl'>";
print "<tr><th>$Lang::tr{'fwhost hint'}</th></tr>";
print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>"; print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
&Header::closebox();
} }
print <<END;
</table> print "<div align='center'>";
END
;
&Pakfire::dblist("upgrade", "notice"); &Pakfire::dblist("upgrade", "notice");
print <<END;
END
if ( -e "/var/run/need_reboot" ) { if ( -e "/var/run/need_reboot" ) {
print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>"; print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
} }
&Header::closebox();
}
else { print "</div>";
&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
print <<END;
$Lang::tr{'gpl please read carefully the general public license and accept it below'}.
<br /><br />
END
;
if ( -e "/usr/share/doc/licenses/GPLv3" ) {
print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
print `cat /usr/share/doc/licenses/GPLv3`;
print '</textarea>';
}
else {
print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
}
print <<END;
<p>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
<br/ >
<input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
</form>
</p>
<a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
END
&Header::closebox();
}
&Header::closebigbox(); &Header::closebigbox();
&Header::closepage(); &Header::closepage();

2
langs/de/cgi-bin/de.pl
View File

@@ -1273,6 +1273,7 @@
'iptmangles' => 'IPTable Mangles', 'iptmangles' => 'IPTable Mangles',
'ipsec' => 'IPsec', 'ipsec' => 'IPsec',
'ipsec network' => 'IPsec-Netzwerke', 'ipsec network' => 'IPsec-Netzwerke',
'ipsec no connections' => 'Keine aktiven IPsec Verbindungen',
'iptnats' => 'IPTable Network Address Translation', 'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables', 'ipts' => 'iptables',
'isdn' => 'ISDN', 'isdn' => 'ISDN',
@@ -1603,6 +1604,7 @@
'ovpn mtu-disc off' => 'Deaktiviert', 'ovpn mtu-disc off' => 'Deaktiviert',
'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.', 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.',
'ovpn mtu-disc yes' => 'Forciert', 'ovpn mtu-disc yes' => 'Forciert',
'ovpn no connections' => 'Keine aktiven OpenVPN Verbindungen',
'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on blue' => 'OpenVPN auf BLAU',
'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on orange' => 'OpenVPN auf ORANGE',
'ovpn on red' => 'OpenVPN auf ROT', 'ovpn on red' => 'OpenVPN auf ROT',

2
langs/en/cgi-bin/en.pl
View File

@@ -1300,6 +1300,7 @@
'ipinfo' => 'IP info', 'ipinfo' => 'IP info',
'ipsec' => 'IPsec', 'ipsec' => 'IPsec',
'ipsec network' => 'IPsec network', 'ipsec network' => 'IPsec network',
'ipsec no connections' => 'No active IPsec connections',
'iptable rules' => 'IPTable rules', 'iptable rules' => 'IPTable rules',
'iptmangles' => 'IPTable Mangles', 'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation', 'iptnats' => 'IPTable Network Address Translation',
@@ -1633,6 +1634,7 @@
'ovpn mtu-disc off' => 'Disabled', 'ovpn mtu-disc off' => 'Disabled',
'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.', 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.',
'ovpn mtu-disc yes' => 'Forced', 'ovpn mtu-disc yes' => 'Forced',
'ovpn no connections' => 'No active OpenVPN connections',
'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on blue' => 'OpenVPN on BLUE',
'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on orange' => 'OpenVPN on ORANGE',
'ovpn on red' => 'OpenVPN on RED', 'ovpn on red' => 'OpenVPN on RED',