mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 03:07:43 +02:00
Merge remote-tracking branch 'alfh/feature_langfixes' into next
This commit is contained in:
@@ -43,11 +43,11 @@ require "${General::swroot}/header.pl";
|
||||
print "<TABLE WIDTH='100%' border='0' class='tbl'>";
|
||||
print "<tr><th width='5%'><b>Flag</b></th>";
|
||||
print "<th width='5%'><b>Code</b></th>";
|
||||
print "<th width='40%'><b>Country</b></th>";
|
||||
print "<th width='40%'><b>$Lang::tr{'country'}</b></th>";
|
||||
print "<th><b> </b></th>";
|
||||
print "<th width='5%'><b>Flag</b></th>";
|
||||
print "<th width='5%'><b>Code</b></th>";
|
||||
print "<th width='40%'><b>Country</b></th></tr>";
|
||||
print "<th width='40%'><b>$Lang::tr{'country'}</b></th></tr>";
|
||||
|
||||
@flaglist = <$flagdir/*>;
|
||||
|
||||
|
||||
@@ -177,7 +177,7 @@ END
|
||||
my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
|
||||
if ( "$HOSTNAME" ne "" ) {
|
||||
print <<END;
|
||||
<tr><td><b>Hostname:</b><td align='center'>$HOSTNAME</td><td></td>
|
||||
<tr><td><b>$Lang::tr{'hostname'}:</b><td align='center'>$HOSTNAME</td><td></td>
|
||||
END
|
||||
}
|
||||
|
||||
@@ -187,7 +187,7 @@ END
|
||||
chomp($GATEWAY);
|
||||
close TMP;
|
||||
print <<END;
|
||||
<tr><td><b>Gateway:</b><td align='center'>$GATEWAY</td><td></td></tr>
|
||||
<tr><td><b>$Lang::tr{'gateway'}:</b><td align='center'>$GATEWAY</td><td></td></tr>
|
||||
END
|
||||
}
|
||||
#Read DNS server 1
|
||||
|
||||
@@ -317,7 +317,7 @@ print <<END
|
||||
<th align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></th>
|
||||
<th align='center' class='boldbase'><b>$Lang::tr{'source'}<br/>$Lang::tr{'destination'}</b></th>
|
||||
<th align='center' class='boldbase'><b>$Lang::tr{'src port'}<br />$Lang::tr{'dst port'}</b></th>
|
||||
<th align='center' class='boldbase'><b>Flag</b></th>
|
||||
<th align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
|
||||
<th align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></th>
|
||||
</tr>
|
||||
END
|
||||
|
||||
@@ -406,10 +406,10 @@ print <<END
|
||||
<TABLE WIDTH='100%' class='tbl'>
|
||||
<TR>
|
||||
<TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'></TH>
|
||||
<TH WIDTH='30%' ALIGN='CENTER' CLASS='boldbase'><B>IP</B></TH>
|
||||
<TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>Flag</B></TH>
|
||||
<TH WIDTH='30%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'ip address'}</B></TH>
|
||||
<TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'country'}</B></TH>
|
||||
<TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>Count</B></TH>
|
||||
<TH WIDTH='30%' ALIGN='CENTER' CLASS='boldbase'><B>Percent</B></TH>
|
||||
<TH WIDTH='30%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'percentage'}</B></TH>
|
||||
</TR>
|
||||
END
|
||||
;
|
||||
|
||||
@@ -409,9 +409,9 @@ print <<END
|
||||
<TABLE WIDTH='100%' CLASS='tbl'>
|
||||
<TR>
|
||||
<TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'></TH>
|
||||
<TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>Port</B></TH>
|
||||
<TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'port'}</B></TH>
|
||||
<TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>Count</B></TH>
|
||||
<TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>Percent</B></TH>
|
||||
<TH WIDTH='33%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'percentage'}</B></TH>
|
||||
</TR>
|
||||
END
|
||||
;
|
||||
|
||||
@@ -152,7 +152,7 @@ END
|
||||
|
||||
for(my $i = 1; $i <= $#iostat1; $i++){
|
||||
if ( $i eq '1' ){
|
||||
print "<tr><td align='center' class='boldbase'><b>Device</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";
|
||||
print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";
|
||||
}else{
|
||||
print "<tr><td align='center'>$iostat1[$i]</td><td align='center'>$iostat2[$i]</td><td align='center'>$iostat3[$i]</td></tr>";
|
||||
}
|
||||
@@ -206,7 +206,7 @@ sub diskbox {
|
||||
|
||||
if ( $status[1]=~/standby/){
|
||||
my $ftime = localtime((stat("/var/run/hddshutdown-$disk"))[9]);
|
||||
print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
|
||||
print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> ($Lang::tr{'since'} $ftime)";
|
||||
}else{
|
||||
print"<B>Disk $disk status:<font color=#00FF00>".$status[1]."</font></B>";
|
||||
}
|
||||
|
||||
@@ -2350,12 +2350,12 @@ print <<END;
|
||||
<tr>
|
||||
<td class='base'>fragment <br></td>
|
||||
<td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td>
|
||||
<td>Default: <span class="base">1300</span></td>
|
||||
<td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='base'>mssfix</td>
|
||||
<td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
|
||||
<td>Default: on</td>
|
||||
<td>$Lang::tr{'openvpn default'}: on</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
@@ -2787,7 +2787,7 @@ if ( -s "${General::swroot}/ovpn/settings") {
|
||||
<td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr>
|
||||
<tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr>
|
||||
<tr><td> </td><td>Import Connection Name <img src='/blob.gif' /></td></tr>
|
||||
<tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>Default : Client Packagename</td></tr>
|
||||
<tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>$Lang::tr{'openvpn default'}: Client Packagename</td></tr>
|
||||
<tr><td colspan='3'><hr /></td></tr>
|
||||
<tr><td align='right' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
|
||||
<tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr>
|
||||
|
||||
@@ -796,7 +796,7 @@ sub changedefclasses {
|
||||
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
|
||||
<table width='66%'>
|
||||
<tr><td width='100%' colspan='3'>$Lang::tr{'no filter pass'}
|
||||
<tr><td width='33%' align='right'>Download:<td width='33%' align='left'><select name='DEFCLASS_INC'>
|
||||
<tr><td width='33%' align='right'>$Lang::tr{'download'}:<td width='33%' align='left'><select name='DEFCLASS_INC'>
|
||||
END
|
||||
;
|
||||
for ( $c = 200 ; $c <= 220 ; $c++ )
|
||||
@@ -807,7 +807,7 @@ END
|
||||
}
|
||||
print <<END
|
||||
</select><td width='33%' align='center'>
|
||||
<tr><td width='33%' align='right'>Upload:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
|
||||
<tr><td width='33%' align='right'>$Lang::tr{'upload'}:<td width='33%' align='left'><select name='DEFCLASS_OUT'>
|
||||
END
|
||||
;
|
||||
for ( $c = 100 ; $c <= 120 ; $c++ )
|
||||
|
||||
Reference in New Issue
Block a user