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

CGIs angepasst damit das httpd log sauberer bleibt

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@938 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-10-03 11:10:43 +00:00
parent 226347877b
commit 8c384f979d
5 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ my %cgiparams=();
my %checked = ();
my $message = "";
my $errormessage = "";
my @backups = `cd /var/ipfire/backup/ && ls *.ipf`;
my @backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
$a = new CGI;
@@ -71,7 +71,7 @@ elsif ( $cgiparams{'ACTION'} eq "restore" )
print UPLOADFILE;
}
close UPLOADFILE;
system("/usr/local/bin/backupctrl restore >/dev/null");
system("/usr/local/bin/backupctrl restore >/dev/null 2>&1");
}
&Header::showhttpheaders();
@@ -86,13 +86,13 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
if ( $cgiparams{'ACTION'} eq "backup" )
{
if ( $cgiparams{'BACKUPLOGS'} eq "include" ){system("/usr/local/bin/backupctrl include >/dev/null");}
else {system("/usr/local/bin/backupctrl exclude >/dev/null");}
if ( $cgiparams{'BACKUPLOGS'} eq "include" ){system("/usr/local/bin/backupctrl include >/dev/null 2>&1");}
else {system("/usr/local/bin/backupctrl exclude >/dev/null 2>&1");}
refreshpage();
}
elsif ( $cgiparams{'ACTION'} eq "delete" )
{
system("/usr/local/bin/backupctrl $cgiparams{'FILE'} >/dev/null");
system("/usr/local/bin/backupctrl $cgiparams{'FILE'} >/dev/null 2>&1");
refreshpage();
}

8
html/cgi-bin/logs.cgi/firewalllog.dat
View File

@@ -365,7 +365,13 @@ foreach $_ (@log)
<td align='center'>$proto</td>
<td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a><br /><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
<td align='center'>$srcport<br/>$dstport</td>
<td align='center'><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>
END
;
if ( $fcode ne "" ){
print "<td align='center'><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";}
else {
print "<td align='center'></td>";}
print <<END
<td align='center'>$macaddr</td>
</tr>
END

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

@@ -15,8 +15,8 @@ use Geo::IP::PurePerl;
use Getopt::Std;
# enable only the following on debugging purpose
use warnings;
use CGI::Carp 'fatalsToBrowser';
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
@@ -24,10 +24,6 @@ require "${General::swroot}/header.pl";
use POSIX();
#workaround to suppress a warning when a variable is used only once
my @dummy = ( ${Header::table2colour} );
undef (@dummy);
my %cgiparams=();
my %settings=();
my $pienumber;
@@ -448,7 +444,10 @@ for($s=0;$s<$lines;$s++)
$color++;
print "<TD ALIGN='CENTER'><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'><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></TD>";
print "<TD ALIGN='CENTER'><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></TD>";
if ( $fcode ne "" ){
print "<TD ALIGN='CENTER'><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'></TD>";}
print "<TD ALIGN='CENTER'>$value[$s]</TD>";
print "<TD ALIGN='CENTER'>$percent</TD>";
print "</TR>";

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

@@ -13,8 +13,8 @@
use strict;
# enable only the following on debugging purpose
use warnings;
use CGI::Carp 'fatalsToBrowser';
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";

48
html/cgi-bin/mpfire.cgi
View File

@@ -104,22 +104,22 @@ else {print DATEI $_;}
}
close(DATEI);
$message=system("/usr/local/bin/mpfirectrl scan");
$message=system("/usr/local/bin/mpfirectrl scan 2>/dev/null");
refreshpage();
}
elsif ( $mpfiresettings{'ACTION'} eq ">" ){$message=system("/usr/local/bin/mpfirectrl","play","\"$mpfiresettings{'FILE'}\"");}
elsif ( $mpfiresettings{'ACTION'} eq "x" ){$message=system("/usr/local/bin/mpfirectrl stop");}
elsif ( $mpfiresettings{'ACTION'} eq "|>" ){$message=system("/usr/local/bin/mpfirectrl toggle");}
elsif ( $mpfiresettings{'ACTION'} eq "<<" ){$message=system("/usr/local/bin/mpfirectrl prev");}
elsif ( $mpfiresettings{'ACTION'} eq ">>" ){$message=system("/usr/local/bin/mpfirectrl next");}
elsif ( $mpfiresettings{'ACTION'} eq "+" ){$message=system("/usr/local/bin/mpfirectrl volup 5");}
elsif ( $mpfiresettings{'ACTION'} eq "-" ){$message=system("/usr/local/bin/mpfirectrl voldown 5");}
elsif ( $mpfiresettings{'ACTION'} eq "++" ){$message=system("/usr/local/bin/mpfirectrl volup 10");}
elsif ( $mpfiresettings{'ACTION'} eq "--" ){$message=system("/usr/local/bin/mpfirectrl voldown 10");}
elsif ( $mpfiresettings{'ACTION'} eq "playweb" ){$message=system("/usr/local/bin/mpfirectrl","playweb","\"$mpfiresettings{'FILE'}\"");}
elsif ( $mpfiresettings{'ACTION'} eq "playlist" ){$message=system("/usr/local/bin/mpfirectrl playlist");}
elsif ( $mpfiresettings{'ACTION'} eq "emptyplaylist" ){$message=system("/usr/local/bin/mpfirectrl clearplaylist");}
elsif ( $mpfiresettings{'ACTION'} eq "addtoplaylist" ){$message=system("/usr/local/bin/mpfirectrl","playadd","\"$mpfiresettings{'FILE'}\"");}
elsif ( $mpfiresettings{'ACTION'} eq ">" ){$message=system("/usr/local/bin/mpfirectrl","play","\"$mpfiresettings{'FILE'}\"","2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "x" ){$message=system("/usr/local/bin/mpfirectrl stop 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "|>" ){$message=system("/usr/local/bin/mpfirectrl toggle 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "<<" ){$message=system("/usr/local/bin/mpfirectrl prev 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq ">>" ){$message=system("/usr/local/bin/mpfirectrl next 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "+" ){$message=system("/usr/local/bin/mpfirectrl volup 5 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "-" ){$message=system("/usr/local/bin/mpfirectrl voldown 5 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "++" ){$message=system("/usr/local/bin/mpfirectrl volup 10 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "--" ){$message=system("/usr/local/bin/mpfirectrl voldown 10 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "playweb" ){$message=system("/usr/local/bin/mpfirectrl","playweb","\"$mpfiresettings{'FILE'}\"","2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "playlist" ){$message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "emptyplaylist" ){$message=system("/usr/local/bin/mpfirectrl clearplaylist 2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "addtoplaylist" ){$message=system("/usr/local/bin/mpfirectrl","playadd","\"$mpfiresettings{'FILE'}\"","2>/dev/null");}
elsif ( $mpfiresettings{'ACTION'} eq "playall" ){
my @temp = ""; my @song = "";
@@ -130,7 +130,7 @@ open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add pla
print DATEI @temp;
close(DATEI);
$message=system("/usr/local/bin/mpfirectrl playlist");
$message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
}
elsif ( $mpfiresettings{'ACTION'} eq "playalbum" )
{
@@ -148,7 +148,7 @@ foreach (keys(%songs)){
open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
print DATEI @temp;
close(DATEI);
$message=system("/usr/local/bin/mpfirectrl playlist");
$message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
}
elsif ( $mpfiresettings{'ACTION'} eq "playartist" )
{
@@ -166,7 +166,7 @@ foreach (keys(%songs)){
open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
print DATEI @temp;
close(DATEI);
$message=system("/usr/local/bin/mpfirectrl playlist");
$message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
}
elsif ( $mpfiresettings{'ACTION'} eq "playyear" )
{
@@ -184,7 +184,7 @@ foreach (keys(%songs)){
open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
print DATEI @temp;
close(DATEI);
$message=system("/usr/local/bin/mpfirectrl playlist");
$message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
}
elsif ( $mpfiresettings{'ACTION'} eq "playgenre" )
{
@@ -202,7 +202,7 @@ foreach (keys(%songs)){
open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
print DATEI @temp;
close(DATEI);
$message=system("/usr/local/bin/mpfirectrl playlist");
$message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
}
elsif ( $mpfiresettings{'SHOWLIST'} ){delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'};delete $mpfiresettings{'PAGE'};&General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);refreshpage();}
@@ -234,13 +234,13 @@ END
;
&Header::closebox();
my $song = qx(/usr/local/bin/mpfirectrl song);
my $song = `/usr/local/bin/mpfirectrl song 2>/dev/null`;
if ( $song eq "" ){$song = "None";}
if ( length($song) > 125 ) {$song = substr($song,0,125)."...";}
my $Volume = `/usr/local/bin/mpfirectrl volume`;
my $Volume = `/usr/local/bin/mpfirectrl volume 2>/dev/null`;
$Volume=~s/<break>/<br \/>/g;
my $stats = `mpc stats | tail -4`;
my $stats = `mpc stats | tail -4 2>/dev/null`;
$stats=~s/\\/<br \/>/g
&Header::openbox('100%', 'center', $Lang::tr{'mpfire controls'});
@@ -250,7 +250,7 @@ print <<END
<tr bgcolor='$color{'color20'}'> <td colspan='5' align='center'><marquee behavior='alternate' scrollamount='1' scrolldelay='5'><font color=red>-= $song =-</font></marquee></td></tr>
END
;
my $countsongs=`/usr/local/bin/mpfirectrl stats`;
my $countsongs=`/usr/local/bin/mpfirectrl stats 2>/dev/null`;
print "<tr><td colspan='5' align='center'><br/><b>".$countsongs."</b><br/><br/></td></tr>";
print <<END
<tr>
@@ -401,7 +401,7 @@ print "</table>";
&Header::openbox('100%', 'center', $Lang::tr{'mpfire playlist'});
my @playlist = `mpc playlist`;
my @playlist = `mpc playlist 2>/dev/null`;
print <<END
<table width='95%' cellspacing='0'>