Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[people/teissler/ipfire-2.x.git] / html / cgi-bin / mpfire.cgi
diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi

index 2f883a910ed1743501abb372f9ec219b7a7be9c5..c010fd494117d79d15db6982c317358097eb6dbe 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -80,7 +80,7 @@ if ( $ENV{'QUERY_STRING'} =~ /title/){
         my $song = "";
         if ( $mpd->current() )
         {
-               $song = substr("-= ".$mpd->current()->Artist()." | ".$mpd->current()->Title(),0,90)." =-<br /> ";
+               $song = substr("-= ".$mpd->current()->Artist()." | ".$mpd->current()->Title(),0,85)." =-<br /> ";
                 if ( $song eq "-=  |  =-<br /> " ){
                         $song = "None<br />"
                 };
@@ -101,7 +101,7 @@ if ( $ENV{'QUERY_STRING'} =~ /title/){
  <meta http-equiv='refresh' content='5'>
  <title></title>
  <body>
-<table width='100%' cellspacing='0' align='center' style="background-image:url(/images/mpfire/box.png)">
+<table width='100%' cellspacing='0' align='center' style="background-image:url(/images/mpfire/box.png);background-repeat:no-repeat">
  END
  ;
         print"<tr ><td align='center'><font color='red' face='Verdana' size='2'><br />".encode('utf-8', $song)."<br /><br /></font></td></tr></table></body>";
@@ -440,7 +440,7 @@ END
  &Header::openbox('100%', 'center', $Lang::tr{'mpfire search'});
  # box to quickly search artist, album or title
  print <<END
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'mpfire songs'}'>
  <table width='95%' cellspacing='0'>
  <tr>
  <td align='right' width='33%'>$Lang::tr{'artist'}</td>
@@ -601,7 +601,7 @@ foreach (@webradio){
         }else{
                 print "<tr>";
         }
-       chomp $stream[1];chop $stream[2];
+       chomp $stream[1];chomp $stream[2];
         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' align='middle' /></form></td>