MPFire CGI Update

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / mpfire.cgi

diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index 464ee075b223f9f99ff4e388791f871dc10c091a..8c2cee361415ff61bc6b77c8bc6d9cc0ba40dce6 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -38,6 +38,19 @@ my $errormessage = "";
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
+if ( $ENV{'QUERY_STRING'} =~ /title/){
+my $song = `/usr/local/bin/mpfirectrl song 2>/dev/null`;
+if ( $song eq "" ){$song = "None";}
+&Header::showhttpheaders();
+print"<meta http-equiv='refresh' content='5'>";
+print <<END
+<table width='95%' cellspacing='0'>
+<tr bgcolor='$color{'color20'}'><td align='center' valign='center'><font color='red' face='Verdana' size='2'>-= $song =-</font></td></tr>
+</table></div>
+END
+;
+} 
+else{
 &Header::showhttpheaders();
 
 sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;' />" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
@@ -84,7 +97,7 @@ foreach (@songdb){
   my $genrecount = $#genre+1;
 
 &Header::getcgihash(\%mpfiresettings);
-&Header::openpage($Lang::tr{'mpfire'}, 1, "<meta http-equiv='refresh' content='120' />");
+&Header::openpage($Lang::tr{'mpfire'}, 1,);
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
@@ -104,22 +117,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 +143,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 +161,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 +179,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 +197,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 +215,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,23 +247,19 @@ END
 ;
 &Header::closebox();
 
-my $song = qx(/usr/local/bin/mpfirectrl song);
-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'});
 print <<END
 
     <table width='95%' cellspacing='0'>
-    <tr bgcolor='$color{'color20'}'>    <td colspan='5' align='center'><marquee behavior='alternate' scrollamount='1' scrolldelay='5'><font color=red>-= $song =-</font></marquee></td></tr>
+    <iframe height='35' width='100%' src='/cgi-bin/mpfire.cgi?title' scrolling='no' frameborder='no' align='top' marginheight='0'></iframe> 
 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 +410,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'>
@@ -438,20 +447,33 @@ close(DATEI);
 print <<END
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='9' align='left'><b>$Lang::tr{'webradio playlist'}</b></td></tr>
-<tr><td>Stream</td><td colspan='2'></td></tr>
+<tr><td align='left'>Stream</td><td colspan='2'></td></tr>
 END
 ;
+my $lines=0;
 foreach (@webradio){
  my @stream = split(/\|/,$_);
- print <<END
- <tr><td><a href="$stream[2]" target="_blank">$stream[1]</a></td>
+ $lines++;
+ if ($lines % 2) {print "<tr bgcolor='$color{'color22'}'>";} else {print "<tr>";}
+print <<END
+ <td align='left'><a href="$stream[2]" target="_blank">$stream[1]</a></td>
      <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='FILE' value='$stream[0]' /><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
 </tr>
 END
 ;
  }
+ $lines++;
+ if ($lines % 2) {print "<tr bgcolor='$color{'color22'}'>";} else {print "<tr>";}
+print <<END
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <td align='left'>http://<input type=text name='FILE' value='www.meineradiourl:1234' size='75' /></td>
+     <td align='center'><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
+</tr>
+END
+;
 print "</table>";
 &Header::closebox();
 
 &Header::closebigbox();
 &Header::closepage();
+}