CGIs angepasst damit das httpd log sauberer bleibt

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@938 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 110bbeb91b4d67d1b2d5baa0c8b39b3e58af080e..46930ed75ca3049d79f84887d4b31b24363ea496 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -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();
 }
 

diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index d1d49e42d7fe298a6a6b861746e379dab261847e..2812d435e6f309710051c722ac49e704d3d7116b 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -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

diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index b3f5535191d480cf325281f74b246975fd1bc01a..3ec3f6df2cf9b197fff133335328c4e77d01470e 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -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>";

diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat
index 92c620beb889122a7c6cb4e9c5bb0a39d5e4faf9..af9b852884161dd080e68e2250427a89f6053314 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@ -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";

diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index 464ee075b223f9f99ff4e388791f871dc10c091a..b7ac0ccba879144d950c07fa38fe57b1b97fdf14 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -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'>