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

Merge remote-tracking branch 'alfh/feature_htmlcleanup' into next

Browse Source 
Conflicts:
	html/cgi-bin/logs.cgi/firewalllogip.dat
	html/cgi-bin/logs.cgi/firewalllogport.dat
	html/cgi-bin/media.cgi
This commit is contained in:
Michael Tremer
2014-02-17 16:33:38 +01:00
parent 6d3c8250fe 631b67b7cd
commit 5ee7500e59
19 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/cgi-bin/fireinfo.cgi
View File

@@ -79,7 +79,7 @@ END
if ($errormessage) {
&Header::openbox('100%', 'left', "$Lang::tr{'error messages'}");
print "<FONT CLASS='base'>$errormessage&nbsp;</FONT>\n";
print "<font class='base'>$errormessage&nbsp;</font>\n";
&Header::closebox();
}

2
html/cgi-bin/gui.cgi
View File

@@ -63,7 +63,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
close (FILE);
if ( $found == 0 )
{
$errormessage="$errormessage<P>$Lang::tr{'invalid input'}";
$errormessage="$errormessage<p>$Lang::tr{'invalid input'}</p>";
goto SAVE_ERROR;
}

32
html/cgi-bin/ids.cgi
View File

@@ -413,9 +413,9 @@ $selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'";
&Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
####################### Added for snort rules control #################################
print "<SCRIPT LANGUAGE='JavaScript' SRC='/include/snortupdateutility.js'></SCRIPT>";
print "<script type='text/javascript' src='/include/snortupdateutility.js'></script>";
print <<END
<STYLE TYPE="text/css">
<style type="text/css">
<!--
.section {
border: groove;
@@ -433,7 +433,7 @@ print <<END
background-color: #DCDCDC;
}
-->
</STYLE>
</style>
END
;
####################### End added for snort rules control #################################
@@ -594,7 +594,7 @@ END
if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable_green" || -e "${General::swroot}/snort/enable_blue" || -e "${General::swroot}/snort/enable_orange" ) {
&Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
# Output display table for rule files
print "<TABLE width='100%'><TR><TD VALIGN='TOP'><TABLE>";
print "<table width='100%'><tr><td valign='top'><table>";
print "<form method='post'>";
@@ -615,7 +615,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
# Check if reached half-way through rule file rules to start new column
if ($ruledisplaycnt > $rulecnt) {
print "</TABLE></TD><TD VALIGN='TOP'><TABLE>";
print "</table></td><td valign='top'><table>";
$ruledisplaycnt = 0;
}
@@ -666,21 +666,21 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
}
# Output rule file name and checkbox
print "<TR><TD CLASS='base' VALIGN='TOP'><INPUT TYPE='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <A HREF='$rulefilelink'>$rulefile</A></TD></TR>";
print "<TR><TD CLASS='base' VALIGN='TOP'>";
print "<tr><td class='base' valign='top'><input type='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <a href='$rulefilelink'>$rulefile</a></td></tr>";
print "<tr><td class='base' valign='top'>";
# Check for empty 'Description'
if ($snortrules{$rulefile}{'Description'} eq '') {
print "<TABLE WIDTH='100%'><TR><TD CLASS='base'>No description available</TD></TR>";
print "<table width='100%'><tr><td class='base'>No description available</td></tr>";
} else {
# Output rule file 'Description'
print "<TABLE WIDTH='100%'><TR><TD CLASS='base'>$snortrules{$rulefile}{'Description'}</TD></TR>";
print "<table width='100%'><tr><td class='base'>$snortrules{$rulefile}{'Description'}</td></tr>";
}
# Check for display flag
if ($displayrulefilerules) {
# Rule file definition rule display
print "<TR><TD CLASS='base' VALIGN='TOP'><TABLE border=0><TR>";
print "<tr><td class='base' valign='top'><table border='0'><tr>";
# Local vars
my $ruledefdisplaycnt = 0;
@@ -695,7 +695,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
# If have display 2 rules, start new row
if (($ruledefdisplaycnt % 2) == 0) {
print "</TR><TR>";
print "</tr><tr>";
$ruledefdisplaycnt = 0;
}
@@ -707,7 +707,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
# Create rule file rule's checkbox
$checkboxname = "SNORT_RULE_$rulefile";
$checkboxname .= "_$ruledef";
print "<TD CLASS='base'><INPUT TYPE='checkbox' NAME='$checkboxname' $ruledefchecked> $snortrules{$rulefile}{'Definition'}{$ruledef}{'Description'}</TD>";
print "<td class='base'><input type='checkbox' NAME='$checkboxname' $ruledefchecked> $snortrules{$rulefile}{'Definition'}{$ruledef}{'Description'}</td>";
# Increment count
$ruledefdisplaycnt++;
@@ -715,20 +715,20 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
# If do not have second rule for row, create empty cell
if (($ruledefdisplaycnt % 2) != 0) {
print "<TD CLASS='base'></TD>";
print "<td class='base'></td>";
}
# Close display table
print "</TR></TABLE></TD></TR>";
print "</tr></table></td></tr>";
}
# Close display table
print "</TABLE>";
print "</table>";
# Increment ruledisplaycnt
$ruledisplaycnt++;
}
print "</TD></TR></TABLE></TD></TR></TABLE>";
print "</td></tr></table></td></tr></table>";
print <<END
<table width='100%'>
<tr>

2
html/cgi-bin/imspector.cgi
View File

@@ -92,7 +92,7 @@ sub scriptheader
my $conversation = sprintf( "%.4d-%.2d-%.2d", $year, $mon, $mday );
my $script = qq {
<script language="Javascript">
<script type="text/javascript">
var section ='none';
var moveit = 1;
var skimhtml = 1;

14
html/cgi-bin/iptables.cgi
View File

@@ -80,7 +80,7 @@ if ( $cgiparams{'selectedchain'} ne "" ){
print <<END
<DIV align='left'>
<div align='left'>
END
;
@@ -182,7 +182,7 @@ END
}
print "</td>\n</tr>\n";
}
print "</table></DIV><br />";
print "</table></div><br />";
&Header::closebox();
## MANGLE
@@ -202,7 +202,7 @@ if ( $cgiparams{'selectedchain'} ne "" ){
print <<END
<DIV align='left'>
<div align='left'>
END
;
@@ -309,7 +309,7 @@ END
}
print "</td>\n</tr>\n";
}
print "</table></DIV><br />";
print "</table></div><br />";
&Header::closebox();
## NAT
@@ -329,7 +329,7 @@ if ( $cgiparams{'selectedchain'} ne "" ){
print <<END
<DIV align='left'>
<div align='left'>
END
;
@@ -429,11 +429,11 @@ END
}
print "</td>\n</tr>\n";
}
print "</table></DIV><br />";
print "</table></div><br />";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
system(rm -f "/srv/web/ipfire/html/iptables.txt");
system(rm -f "/srv/web/ipfire/html/iptablesmangle.txt");
system(rm -f "/srv/web/ipfire/html/iptablesnat.txt");
system(rm -f "/srv/web/ipfire/html/iptablesnat.txt");

86
html/cgi-bin/logs.cgi/firewalllogip.dat
View File

@@ -403,14 +403,14 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
}
print <<END
<TABLE WIDTH='100%' class='tbl'>
<TR>
<TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'></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>$Lang::tr{'percentage'}</B></TH>
</TR>
<table width='100%' class='tbl'>
<tr>
<th width='10%' align='center' class='boldbase'></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>$Lang::tr{'percentage'}</b></th>
</tr>
END
;
@@ -427,45 +427,45 @@ for($s=0;$s<$lines;$s++)
$percent = $value[$s] * 100 / $linesjc;
$percent = sprintf("%.f", $percent);
$total = $total + $value[$s];
if ( ($color % 10) == 1 ){print "<TR>"; $col="BGCOLOR='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<TR>"; $col="BGCOLOR='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<TR>"; $col="BGCOLOR='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<TR>"; $col="BGCOLOR='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<TR>"; $col="BGCOLOR='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<TR>"; $col="BGCOLOR='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<TR>"; $col="BGCOLOR='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<TR>"; $col="BGCOLOR='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<TR>"; $col="BGCOLOR='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<TR>"; $col="BGCOLOR='$color{'color10'}'";}
if ( ($color % 10) == 1 ){print "<tr>"; $col="bcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bcolor='$color{'color10'}'";}
my $gi = Geo::IP::PurePerl->new();
my $ccode = $gi->country_code_by_name($key[$s]);
my $fcode = lc($ccode);
$color++;
print "<TD ALIGN='CENTER' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='details'></form></TD>";
print "<TD ALIGN='CENTER' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></TD>";
print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='details'></form></td>";
print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>";
if ( $fcode ne "" ){
print "<TD ALIGN='CENTER' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></TD>";}
print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";}
else {
print "<TD ALIGN='CENTER' $col></TD>";}
print "<TD ALIGN='CENTER' $col>$value[$s]</TD>";
print "<TD ALIGN='CENTER' $col>$percent</TD>";
print "</TR>";
}
print "<td align='center' $col></td>";}
print "<td align='center' $col>$value[$s]</td>";
print "<td align='center' $col>$percent</td>";
print "</tr>";
}
if($cgiparams{'otherspie'} == 2 ){}
else{
if ( ($color % 10) == 1 ){print "<TR>"; $col="BGCOLOR='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<TR>"; $col="BGCOLOR='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<TR>"; $col="BGCOLOR='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<TR>"; $col="BGCOLOR='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<TR>"; $col="BGCOLOR='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<TR>"; $col="BGCOLOR='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<TR>"; $col="BGCOLOR='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<TR>"; $col="BGCOLOR='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<TR>"; $col="BGCOLOR='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<TR>"; $col="BGCOLOR='$color{'color10'}'";}
if ( ($color % 10) == 1 ){print "<tr>"; $col="bcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bcolor='$color{'color10'}'";}
if ( $linesjc ne "0")
{
@@ -474,18 +474,18 @@ $dif = $linesjc - $total;
$percent = $dif * 100 / $linesjc;
$percent = sprintf("%.f", $percent);
print <<END
<TD ALIGN='CENTER' $col></TD>
<TD ALIGN='CENTER' $col>$Lang::tr{'otherip'}</TD>
<TD ALIGN='CENTER' $col></TD>
<TD ALIGN='CENTER' $col>$dif</TD>
<TD ALIGN='CENTER' $col>$percent</TD>
</TR>
<td align='center' $col></td>
<td align='center' $col>$Lang::tr{'otherip'}</td>
<td align='center' $col></td>
<td align='center' $col>$dif</td>
<td align='center' $col>$percent</td>
</tr>
END
;
}
}
print <<END
</TABLE>
</table>
END
;

76
html/cgi-bin/logs.cgi/firewalllogport.dat
View File

@@ -406,13 +406,13 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
}
print <<END
<TABLE WIDTH='100%' CLASS='tbl'>
<TR>
<TH WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'></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>$Lang::tr{'percentage'}</B></TH>
</TR>
<table width='100%' CLASS='tbl'>
<tr>
<th width='10%' align='center' class='boldbase'></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>$Lang::tr{'percentage'}</b></th>
</tr>
END
;
@@ -429,37 +429,37 @@ for($s=0;$s<$lines;$s++)
$percent = $value[$s] * 100 / $linesjc;
$percent = sprintf("%.f", $percent);
$total = $total + $value[$s];
if ( ($color % 10) == 1 ){print "<TR>"; $col="BGCOLOR='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<TR>"; $col="BGCOLOR='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<TR>"; $col="BGCOLOR='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<TR>"; $col="BGCOLOR='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<TR>"; $col="BGCOLOR='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<TR>"; $col="BGCOLOR='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<TR>"; $col="BGCOLOR='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<TR>"; $col="BGCOLOR='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<TR>"; $col="BGCOLOR='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<TR>"; $col="BGCOLOR='$color{'color10'}'";}
if ( ($color % 10) == 1 ){print "<tr>"; $col="bgcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bgcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bgcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bgcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bgcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bgcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bgcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bgcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bgcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bgcolor='$color{'color10'}'";}
$color++;
print "<TD ALIGN='CENTER' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='details'></form></TD>";
print "<TD ALIGN='CENTER' $col>$key[$s]</TD>";
print "<TD ALIGN='CENTER' $col>$value[$s]</TD>";
print "<TD ALIGN='CENTER' $col>$percent</TD>";
print "</TR>";
print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='details'></form></td>";
print "<td align='center' $col>$key[$s]</td>";
print "<td align='center' $col>$value[$s]</td>";
print "<td align='center' $col>$percent</td>";
print "</tr>";
}
if($cgiparams{'otherspie'} == 2 ){}
else{
if ( ($color % 10) == 1 ){print "<TR>"; $col="BGCOLOR='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<TR>"; $col="BGCOLOR='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<TR>"; $col="BGCOLOR='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<TR>"; $col="BGCOLOR='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<TR>"; $col="BGCOLOR='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<TR>"; $col="BGCOLOR='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<TR>"; $col="BGCOLOR='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<TR>"; $col="BGCOLOR='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<TR>"; $col="BGCOLOR='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<TR>"; $col="BGCOLOR='$color{'color10'}'";}
if ( ($color % 10) == 1 ){print "<tr>"; $col="bgcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bgcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bgcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bgcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bgcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bgcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bgcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bgcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bgcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bgcolor='$color{'color10'}'";}
if ( $linesjc ne "0")
{
@@ -468,17 +468,17 @@ $dif = $linesjc - $total;
$percent = $dif * 100 / $linesjc;
$percent = sprintf("%.f", $percent);
print <<END
<TD ALIGN='CENTER' $col></TD>
<TD ALIGN='CENTER' $col>$Lang::tr{'otherport'}</TD>
<TD ALIGN='CENTER' $col>$dif</TD>
<TD ALIGN='CENTER' $col>$percent</TD>
</TR>
<td align='center' $col></td>
<td align='center' $col>$Lang::tr{'otherport'}</td>
<td align='center' $col>$dif</td>
<td align='center' $col>$percent</td>
</tr>
END
;
}
}
print <<END
</TABLE>
</table>
END
;

2
html/cgi-bin/logs.cgi/proxylog.dat
View File

@@ -182,7 +182,7 @@ my $thiscode = '$temp =~ /$filter/;';
eval($thiscode);
if ($@ ne '')
{
$errormessage = "$Lang::tr{'bad ignore filter'}.$@<P>";
$errormessage = "$Lang::tr{'bad ignore filter'}.$@<p>";
$filter = '';
} else {
my $loop = 1;

38
html/cgi-bin/logs.cgi/showrequestfromip.dat
View File

@@ -271,17 +271,17 @@ if ($start == 0) { $prev = -1; }
if ($lines != 0) { &oldernewer(); }
print <<END
<TABLE WIDTH='100%'>
<TR>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'time'}</B></TD>
<TD WIDTH='13%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'chain'}</B></TD>
<TD WIDTH='5%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'iface'}</B></TD>
<TD WIDTH='5%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'proto'}</B></TD>
<TD WIDTH='16%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'source'}</B></TD>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'src port'}</B></TD>
<TD WIDTH='16%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'destination'}</B></TD>
<TD WIDTH='16%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'dst port'}</B></TD>
</TR>
<table width='100%'>
<tr>
<td width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
<td width='13%' align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></td>
<td width='5%' align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></td>
<td width='5%' align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></td>
<td width='16%' align='center' class='boldbase'><b>$Lang::tr{'source'}</b></td>
<td width='10%' align='center' class='boldbase'><b>$Lang::tr{'src port'}</b></td>
<td width='16%' align='center' class='boldbase'><b>$Lang::tr{'destination'}</b></td>
<td width='16%' align='center' class='boldbase'><b>$Lang::tr{'dst port'}</b></td>
</tr>
END
;
@@ -320,23 +320,23 @@ foreach $_ (@slice)
else {
print "<tr bgcolor='${Header::table2colour}'>\n"; }
print <<END
<TD ALIGN='CENTER'>$time</TD>
<TD ALIGN='CENTER'>$chain</TD>
<TD ALIGN='CENTER'>$iface</TD>
<TD ALIGN='CENTER'>$protostr</TD>
<td align='center'>$time</td>
<td align='center'>$chain</td>
<td align='center'>$iface</td>
<td align='center'>$protostr</td>
<td align='center'>
<table width='100%' cellpadding='0' cellspacing='0'><tr>
<td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
</tr></table>
</td>
<TD ALIGN='CENTER'>$srcport</TD>
<td align='center'>$srcport</td>
<td align='center'>
<table width='100%' cellpadding='0' cellspacing='0'><tr>
<td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
</tr></table>
</td>
<TD ALIGN='CENTER'>$dstport</TD>
</TR>
<td align='center'>$dstport</td>
</tr>
END
;
$lines++;
@@ -345,7 +345,7 @@ END
}
print <<END
</TABLE>
</table>
END
;

38
html/cgi-bin/logs.cgi/showrequestfromport.dat
View File

@@ -278,17 +278,17 @@ if ($start == 0) { $prev = -1; }
if ($lines != 0) { &oldernewer(); }
print <<END
<TABLE WIDTH='100%'>
<TR>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'time'}</B></TD>
<TD WIDTH='5%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'chain'}</B></TD>
<TD WIDTH='5%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'iface'}</B></TD>
<TD WIDTH='5%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'proto'}</B></TD>
<TD WIDTH='20%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'source'}</B></TD>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'src port'}</B></TD>
<TD WIDTH='20%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'destination'}</B></TD>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>$Lang::tr{'dst port'}</B></TD>
</TR>
<table width='100%'>
<tr>
<td width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
<td width='5%' align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></td>
<td width='5%' align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></td>
<td width='5%' align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></td>
<td width='20%' align='center' class='boldbase'><b>$Lang::tr{'source'}</b></td>
<td width='10%' align='center' class='boldbase'><b>$Lang::tr{'src port'}</b></td>
<td width='20%' align='center' class='boldbase'><b>$Lang::tr{'destination'}</b></td>
<td width='10%' align='center' class='boldbase'><b>$Lang::tr{'dst port'}</b></td>
</rt>
END
;
my @slice = splice(@log, $start, ${Header::viewsize});
@@ -326,23 +326,23 @@ foreach $_ (@slice)
else {
print "<tr bgcolor='${Header::table2colour}'>\n"; }
print <<END
<TD ALIGN='CENTER'>$time</TD>
<TD ALIGN='CENTER'>$chain</TD>
<TD ALIGN='CENTER'>$iface</TD>
<TD ALIGN='CENTER'>$protostr</TD>
<td align='center'>$time</td>
<td align='center'>$chain</td>
<td align='center'>$iface</td>
<td align='center'>$protostr</td>
<td align='center'>
<table width='100%' cellpadding='0' cellspacing='0'><tr>
<td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
</tr></table>
</td>
<TD ALIGN='CENTER'>$srcport</TD>
<td align='center'>$srcport</td>
<td align='center'>
<table width='100%' cellpadding='0' cellspacing='0'><tr>
<td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
</tr></table>
</td>
<TD ALIGN='CENTER'>$dstport</TD>
</TR>
<td align='center'>$dstport</td>
</tr>
END
;
$lines++;
@@ -351,7 +351,7 @@ END
}
print <<END
</TABLE>
</table>
END
;

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

@@ -206,9 +206,9 @@ 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> ($Lang::tr{'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>";
print"<b>Disk $disk status:<font color='#00FF00'>".$status[1]."</font></b>";
}
}
@@ -217,7 +217,7 @@ sub diskbox {
print <<END
<br /><input type="button" onClick="swapVisibility('smart_$disk')" value="$Lang::tr{'smart information'}" />
<div id='smart_$disk' style='display: none'>
<hr /><table border=0><tr><td align=left><pre>$smart</pre></table>
<hr /><table border='0'><tr><td align='left'><pre>$smart</pre></table>
</div>
END
;

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

@@ -2282,7 +2282,7 @@ ADV_ERROR:
&Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'});
print <<END
<form method='post' enctype='multipart/form-data'>
<table width='100%' border=0>
<table width='100%' border='0'>
<tr>
<td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td>
</tr>
@@ -2485,7 +2485,7 @@ if ($cgiparams{'ACTION'} eq "edit"){
&Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'});
print <<END
<table width='100%' border=0>
<table width='100%' border='0'>
<tr><form method='post'>
<td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td>
<td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr>
@@ -4322,7 +4322,7 @@ if ($cgiparams{'TYPE'} eq 'host') {
<tr><td>&nbsp;</td>
<td class='base'>$Lang::tr{'pkcs12 file password'}:</td>
<td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr>
<tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td>
<tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<br>($Lang::tr{'confirmation'})</td>
<td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr>
<tr><td colspan='3'>&nbsp;</td></tr>
<tr><td colspan='3'><hr /></td></tr>
@@ -4581,7 +4581,7 @@ END
}
&Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'});
print <<END
<table width='100%' border=0>
<table width='100%' border='0'>
<form method='post'>
<td width='25%'>&nbsp;</td>
<td width='25%'>&nbsp;</td>
@@ -4613,7 +4613,7 @@ END
<td class='boldbase'>$Lang::tr{'destination port'}:</td>
<td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' size='5' /></td></tr>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;</td>
<td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}'size='5' /></TD>
<td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}'size='5' /></td>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td>
<td><input type='checkbox' name='DCOMPLZO' $checked{'DCOMPLZO'}{'on'} /></td>
<td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td>

4
html/cgi-bin/p2p-block.cgi
View File

@@ -88,10 +88,10 @@ close FILE;
print <<END;
<table width='35%' class='tbl'>
<tr>
<th align=center colspan='2'bgcolor='$color{'color22'}' >
<th align='center' colspan='2' bgcolor='$color{'color22'}' >
<b>$Lang::tr{'protocol'}</b>
</th>
<th align='center'bgcolor='$color{'color22'}' >
<th align='center' bgcolor='$color{'color22'}' >
<b>$Lang::tr{'status'}</b>
</th>
</tr>

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

@@ -432,8 +432,8 @@ if ($pppsettings{'IPTV_VLAN'} eq '') { $pppsettings{'IPTV_VLAN'}='8'; }
if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
$errormessage = $Lang::tr{'dialup red not ppp'};
&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
print "<CLASS name='base'>$errormessage\n";
print "&nbsp;</CLASS>\n";
print "<class name='base'>$errormessage\n";
print "&nbsp;</class>\n";
&Header::closebox();
&Header::closebigbox();
@@ -443,8 +443,8 @@ if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
if ($errormessage) {
&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
print "<CLASS name='base'>$errormessage\n";
print "&nbsp;</CLASS>\n";
print "<class name='base'>$errormessage\n";
print "&nbsp;</class>\n";
&Header::closebox();
}
@@ -530,7 +530,7 @@ END
;
if ($pppsettings{'TYPE'} =~ /^(modem)$/) {
print <<END
<td colspan='1' width='25%'><A HREF=modem.cgi>$Lang::tr{'modem configuration'}</A></td>
<td colspan='1' width='25%'><a href='modem.cgi'>$Lang::tr{'modem configuration'}</a></td>
END
;
}

2
html/cgi-bin/proxy.cgi
View File

@@ -1206,7 +1206,7 @@ print <<END
<td colspan='4'><b>$Lang::tr{'advproxy destination ports'}</b></td>
</tr>
<tr>
<td width='25%' align=center></td> <td width='20%' align=center></td><td width='25%' align=center></td><td width='30%' align=center></td>
<td width='25%' align='center'></td> <td width='20%' align='center'></td><td width='25%' align='center'></td><td width='30%' align='center'></td>
</tr>
<tr>
<td colspan='2' class='base'>$Lang::tr{'advproxy standard ports'}:</td>

2
html/cgi-bin/remote.cgi
View File

@@ -120,7 +120,7 @@ $checked{'SSH_PORT'}{$remotesettings{'SSH_PORT'}} = "checked='checked'";
if ($errormessage) {
&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
print "<FONT CLASS='base'>$errormessage&nbsp;</FONT>\n";
print "<font class='base'>$errormessage&nbsp;</font>\n";
&Header::closebox();
}

8
html/cgi-bin/services.cgi
View File

@@ -200,8 +200,8 @@ END
print "<td align='left' $col width='31%'>$_</td> ";
my $status = isautorun($_,$col);
print "$status ";
print "<td align='center' $col width='8%'><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
print "<td align='center' $col width='8%'><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
print "<td align='center' $col width='8%'><a href='services.cgi?$_!start'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
print "<td align='center' $col width='8%'><a href='services.cgi?$_!stop'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
my $status = &isrunningaddon($_,$col);
$status =~ s/\\[[0-1]\;[0-9]+m//g;
@@ -234,12 +234,12 @@ sub isautorun{
my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
chomp ($init);
if ($init ne ''){
$status = "<td align='center' $col><A HREF=services.cgi?$_!disable><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></A></td>";
$status = "<td align='center' $col><a href='services.cgi?$_!disable'><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></a></td>";
}
$init = `find /etc/rc.d/rc3.d/off/S??${cmd} 2>/dev/null`;
chomp ($init);
if ($init ne ''){
$status = "<td align='center' $col><A HREF=services.cgi?$_!enable><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></A></td>";
$status = "<td align='center' $col><a href='services.cgi?$_!enable'><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></a></td>";
}
return $status;

2
html/cgi-bin/tripwire.cgi
View File

@@ -487,7 +487,7 @@ print <<END
<tr><td><br /></td></tr>
<tr><td><pre>$Log</pre></td></tr>
<tr><td><br /></td></tr>
<tr><td align=center>$tripwiresettings{'LOG'}</td></tr>
<tr><td align='center'>$tripwiresettings{'LOG'}</td></tr>
</table>
END
;

4
html/html/themes/maniac/include/functions.pl
View File

@@ -151,7 +151,7 @@ sub openpage {
$extrahead
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/themes/maniac/include/style.css" />
<script language="javascript" type="text/javascript">
<script type="text/javascript">
function swapVisibility(id) {
el = document.getElementById(id);
@@ -284,7 +284,7 @@ END
print <<END
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/include/style.css" />
<script language="javascript" type="text/javascript">
<script type="text/javascript">
function swapVisibility(id) {
el = document.getElementById(id);