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

Merge remote-tracking branch 'amarx/INDEX' into next

Browse Source
This commit is contained in:
Michael Tremer
2014-03-10 21:35:15 +01:00
parent e9b5ba4179 e55334753d
commit 826c22d66c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/cfgroot/graphs.pl
View File

@@ -92,8 +92,8 @@ sub makegraphbox {
print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>"; print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
print " - "; print " - ";
print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>"; print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
print "</center>"; print "</center>";
print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
} }
# Generate the CPU Graph for the current period of time for values given by # Generate the CPU Graph for the current period of time for values given by

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

@@ -358,7 +358,7 @@ if (($confighash{'ENABLED'} eq "on") ||
$ovpnip="$ovpnip/$sub"; $ovpnip="$ovpnip/$sub";
print <<END; print <<END;
<tr> <tr>
<td style='width:25%; text-align:center; background-color:$Header::colourvpn;'> <td style='width:25%; text-align:center; background-color:$Header::colourovpn;'>
<a href='/cgi-bin/ovpnmain.cgi' style='color:white'><b>OpenVPN</b></a> <a href='/cgi-bin/ovpnmain.cgi' style='color:white'><b>OpenVPN</b></a>
</td> </td>
<td style='width:30%; text-align:center;'>$ovpnip</td> <td style='width:30%; text-align:center;'>$ovpnip</td>
@@ -372,7 +372,7 @@ print"</table>";
#Check if there are any vpns configured (ipsec and openvpn) #Check if there are any vpns configured (ipsec and openvpn)
&General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig); &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig);
foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) { foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) {
if ($vpnconfig{$key}[0] eq 'on'){ if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host'){
$showipsec=1; $showipsec=1;
$showbox=1; $showbox=1;
last; last;
@@ -409,7 +409,7 @@ if ($showbox){
</tr> </tr>
END END
foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) { foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
if ($vpnconfig{$key}[0] eq 'on') { if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') {
$count++; $count++;
my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]); my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
$vpnsub=&General::iporsubtocidr($vpnsub); $vpnsub=&General::iporsubtocidr($vpnsub);
@@ -420,8 +420,8 @@ END
$col = $color{'color20'}; $col = $color{'color20'};
} }
print "<tr>"; print "<tr>";
print "<td style='text-align:left; color:white; background-color:$Header::colourovpn;'>$vpnconfig{$key}[1]</td>"; print "<td style='text-align:left; color:white; background-color:$Header::colourvpn;'>$vpnconfig{$key}[1]</td>";
print "<td style='text-align:left; background-color:$col'>$vpnip</td>"; print "<td style='text-align:center; background-color:$col'>$vpnip</td>";
my $activecolor = $Header::colourred; my $activecolor = $Header::colourred;
my $activestatus = $Lang::tr{'capsclosed'}; my $activestatus = $Lang::tr{'capsclosed'};