]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/mpfire.cgi
MPFire Version 2 begonnen
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / mpfire.cgi
index 4716426aea86026825fd89eed42a168fd162f63d..9415dc6488dbd325dab008526e806546591bc645 100644 (file)
@@ -19,114 +19,188 @@ my %color = ();
 my %mainsettings = ();
 my %mpfiresettings = ();
 my %checked = ();
-my $message = "";
+my $message = '0';
 my $errormessage = "";
 
-open(DATEI, "<${General::swroot}/mpfire/db/songs.db") || die "No Database found";
-my @songdb = <DATEI>;
-close(DATEI);
-@songdb = sort(@songdb);
-
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
 &Header::showhttpheaders();
-&Header::getcgihash(\%mpfiresettings);
 
-&Header::openpage($Lang::tr{'mpfire'}, 1, '');
-&Header::openbigbox('100%', 'left', '', $errormessage);
+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();}
+
+$mpfiresettings{'PAGE'} = "1";
+
+open(DATEI, "<${General::swroot}/mpfire/db/mpd.db") || die "No Database found";
+my @songdb = <DATEI>;
+close(DATEI);
+
+my @artist; my @album;  my @genre;  my @year; my $linecount = 0; my @currentsong = ""; my %songs;
+foreach (@songdb){
+  
+  if ( $_ =~ /mtime: / ){
+   $songs{$currentsong[1]}="$currentsong[2]|$currentsong[3]|$currentsong[4]|$currentsong[5]|$currentsong[6]|$currentsong[7]|$currentsong[8]|$currentsong[9]";
+   push(@artist,$currentsong[4]);
+   push(@album,$currentsong[6]);
+   push(@year,$currentsong[8]);
+   push(@genre,$currentsong[9]);
+   @currentsong = "";
+   }
+  elsif ( $_ =~ /key: / || $_ =~ /file: / || $_ =~ /Time: / || $_ =~ /Artist: / || $_ =~ /Title: / || $_ =~ /Album: / || $_ =~ /Track: / || $_ =~ /Date: / || $_ =~ /Genre: / ){
+   my @temp = split(/: /,$_);
+   push(@currentsong,$temp[1]);
+   }
+  else {
+   next;
+   }
+ }
+  
+  my %hash = map{ $_, 1 }@artist;
+  @artist = sort keys %hash;
+  my %hash = map{ $_, 1 }@album;
+  @album = sort keys %hash;
+   my %hash = map{ $_, 1 }@year;
+  @year = sort keys %hash;
+  my %hash = map{ $_, 1 }@genre;
+  @genre = sort keys %hash;
+  
+  my $artistcount = $#artist+1;
+  my $albumcount = $#album+1;
+  my $yearcount = $#year+1;
+  my $genrecount = $#genre+1;
 
-sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );}
+&Header::getcgihash(\%mpfiresettings);
+&Header::openpage($Lang::tr{'mpfire'}, 1, "<meta http-equiv='refresh' content='120' />");
+&Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
 ######################################## Scanne Verzeichnisse nach Mp3 Dateien #############################################
 
 if ( $mpfiresettings{'ACTION'} eq "scan" )
 {
-delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'};
+delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'};delete $mpfiresettings{'PAGE'};
 &General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);
-system("/usr/local/bin/mpfirectrl scan $mpfiresettings{'SCANDIR'} $mpfiresettings{'SCANDIRDEPS'}");
+open(DATEI, "<${General::swroot}/mpfire/mpd.conf") || die "Datei nicht gefunden";
+my @Zeilen = <DATEI>;
+close(DATEI);
+open(DATEI, ">${General::swroot}/mpfire/mpd.conf") || die "Datei nicht gefunden";
+foreach (@Zeilen){
+if ( $_ =~ /music_directory/){print DATEI "music_directory \"".$mpfiresettings{'MUSICDIR'}."\"\n";}
+else {print DATEI $_;}
 }
+close(DATEI);
 
-if ( $mpfiresettings{'ACTION'} eq ">" ){system("/usr/local/bin/mpfirectrl","play","\"$mpfiresettings{'FILE'}\""); print $mpfiresettings{'FILE'};}
-if ( $mpfiresettings{'ACTION'} eq "x" ){system("/usr/local/bin/mpfirectrl stop");}
-if ( $mpfiresettings{'ACTION'} eq "||" ){system("/usr/local/bin/mpfirectrl pause");}
-if ( $mpfiresettings{'ACTION'} eq "|>" ){system("/usr/local/bin/mpfirectrl resume");}
-if ( $mpfiresettings{'ACTION'} eq ">>" ){system("/usr/local/bin/mpfirectrl next");}
-if ( $mpfiresettings{'ACTION'} eq "+" ){system("/usr/local/bin/mpfirectrl volup 5");}
-if ( $mpfiresettings{'ACTION'} eq "-" ){system("/usr/local/bin/mpfirectrl voldown 5");}
-if ( $mpfiresettings{'ACTION'} eq "++" ){system("/usr/local/bin/mpfirectrl volup 10");}
-if ( $mpfiresettings{'ACTION'} eq "--" ){system("/usr/local/bin/mpfirectrl voldown 10");}
-if ( $mpfiresettings{'ACTION'} eq "playlist" ){system("/usr/local/bin/mpfirectrl playall");}
-if ( $mpfiresettings{'ACTION'} eq "playalbum" )
+$message=system("/usr/local/bin/mpfirectrl scan");
+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 "playall" ){$message=system("/usr/local/bin/mpfirectrl playall");}
+elsif ( $mpfiresettings{'ACTION'} eq "playalbum" )
 {
-my @temp = "";
-my @album = split(/\|/,$mpfiresettings{'album'});
-my %hash = map{ $_, 1 }@album;
+my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'album'});
 
-foreach (@songdb){
-  my @song = split(/\|/,$_);
-  chomp($song[0]);
-  push(@temp,$song[0]."\n") if exists $hash{$song[4]};
+foreach (keys(%songs)){
+  @song = split(/\|/,$songs{$_});$song[4] =~ s/\W/ /g;
+    
+  foreach (@select){
+    $_ =~ s/\W/ /g;
+    if ( $song[4] =~ /$_/ ){push(@temp,$song[0]);}
   }
-open(DATEI, ">${General::swroot}/mpfire/playlist") || die "Could not add playlist";
+}
+open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
 print DATEI @temp;
 close(DATEI);
-system("/usr/local/bin/mpfirectrl playall");
+$message=system("/usr/local/bin/mpfirectrl playlist");
 }
-if ( $mpfiresettings{'ACTION'} eq "playartist" )
+elsif ( $mpfiresettings{'ACTION'} eq "playartist" )
 {
-my @temp = "";
-my @artist = split(/\|/,$mpfiresettings{'artist'});
-my %hash = map{ $_, 1 }@artist;
+my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'artist'});
 
-foreach (@songdb){
-  my @song = split(/\|/,$_);
-  chomp($song[0]);
-    push(@temp,$song[0]."\n") if exists $hash{$song[1]};
+foreach (keys(%songs)){
+  @song = split(/\|/,$songs{$_});$song[2] =~ s/\W/ /g;
+    
+  foreach (@select){
+    $_ =~ s/\W/ /g;
+    if ( $song[2] =~ /$_/ ){push(@temp,$song[0]);}
   }
-open(DATEI, ">${General::swroot}/mpfire/playlist") || die "Could not add playlist";
+}
+
+open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
 print DATEI @temp;
 close(DATEI);
-system("/usr/local/bin/mpfirectrl playall");
+$message=system("/usr/local/bin/mpfirectrl playlist");
 }
-if ( $mpfiresettings{'ACTION'} eq "playall" )
+elsif ( $mpfiresettings{'ACTION'} eq "playyear" )
 {
-my @temp = "";
-foreach (@songdb){
-  my @song = split(/\|/,$_);
-  chomp($song[0]);
-  push(@temp,$song[0]."\n");
+my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'year'});
+
+foreach (keys(%songs)){
+  @song = split(/\|/,$songs{$_});$song[6] =~ s/\W/ /g;
+    
+  foreach (@select){
+    $_ =~ s/\W/ /g;
+    if ( $song[6] =~ /$_/ ){push(@temp,$song[0]);}
+  }
+}
+
+open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
+print DATEI @temp;
+close(DATEI);
+$message=system("/usr/local/bin/mpfirectrl playlist");
+}
+elsif ( $mpfiresettings{'ACTION'} eq "playgenre" )
+{
+my @temp = ""; my @song = ""; my @select = split(/\|/,$mpfiresettings{'genre'});
+
+foreach (keys(%songs)){
+  @song = split(/\|/,$songs{$_});$song[7] =~ s/\W/ /g;
+    
+  foreach (@select){
+    $_ =~ s/\W/ /g;
+    if ( $song[7] =~ /$_/ ){push(@temp,$song[0]);}
   }
-open(DATEI, ">${General::swroot}/mpfire/playlist") || die "Could not add playlist";
+}
+
+open(DATEI, ">${General::swroot}/mpfire/playlist.m3u") || die "Could not add playlist";
 print DATEI @temp;
 close(DATEI);
-system("/usr/local/bin/mpfirectrl playall");
+$message=system("/usr/local/bin/mpfirectrl playlist");
 }
-if ( $mpfiresettings{'SHOWLIST'} ){delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'};&General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);}
+elsif ( $mpfiresettings{'SHOWLIST'} ){delete $mpfiresettings{'__CGI__'};delete $mpfiresettings{'x'};delete $mpfiresettings{'y'};delete $mpfiresettings{'PAGE'};&General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);refreshpage();}
 
 ############################################################################################################################
 ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ####################################
 
-$mpfiresettings{'SCANDIR'} = "/";
-$mpfiresettings{'SHOWLIST'} = "off";
+$mpfiresettings{'MUSICDIR'} = "/";
 
 &General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings);
 
 ############################################################################################################################
 ########################################### rekursiv nach neuen Mp3s Scannen ##############################################รค
 
-if ( $message ne "" )  {       print "<font color='red'>$message</font>"; }
+if ( $message ne '0' ) {       print "<font color='red'>An Error occured while launching the command</font>"; }
+elsif ( $message ne "" && $message ne '0' )    {       print "<font color='red'>$message</font>"; }
 
 &Header::openbox('100%', 'center', $Lang::tr{'mpfire scanning'});
-       
+
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'Scan for Files'}</b></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'Scan from Directory'}</td><td align='left'><input type='text' name='SCANDIR' value='$mpfiresettings{'SCANDIR'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'deep scan directories'}</td><td align='left'>on <input type='radio' name='SCANDIRDEPS' value='on' checked='checked'/>/
-                                                                                                                                                                                                                                                 <input type='radio' name='SCANDIRDEPS' value='off'/> off</td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'Scan from Directory'}</td><td align='left'><input type='text' name='MUSICDIR' value='$mpfiresettings{'MUSICDIR'}' size="30" /></td></tr>
 <tr><td align='center' colspan='2'><input type='hidden' name='ACTION' value='scan' />
                               <input type='image' alt='$Lang::tr{'Scan for Files'}' title='$Lang::tr{'Scan for Files'}' src='/images/edit-find.png' /></td></tr>                                                                                                                                                               
 </table>
@@ -135,12 +209,28 @@ END
 ;
 &Header::closebox();
 
+my $song = qx(/usr/local/bin/mpfirectrl song);
+if ( $song eq "" ){$song = "None";}
+
+my $Volume = `/usr/local/bin/mpfirectrl volume`;
+$Volume=~s/<break>/<br \/>/g;
+my $stats = `mpc stats | tail -4`;
+$stats=~s/\\/<br \/>/g
+
 &Header::openbox('100%', 'center', $Lang::tr{'mpfire controls'});
-print "<table width='95%' cellspacing='0'><tr>";
 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>
+END
+;
+my $countsongs=`/usr/local/bin/mpfirectrl stats`;
+print "<tr><td colspan='5' align='center'><br/><b>".$countsongs."</b><br/><br/></td></tr>";
+print <<END
+    <tr>
     <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='x' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/media-playback-stop.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='||' /><input type='image' alt='$Lang::tr{'pause'}' title='$Lang::tr{'pause'}' src='/images/media-playback-pause.png' /></form></td>
-    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='|>' /><input type='image' alt='$Lang::tr{'resume'}' title='$Lang::tr{'resume'}' src='/images/media-resume.png' /></form></td>
+    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='<<' /><input type='image' alt='$Lang::tr{'prev'}' title='$Lang::tr{'prev'}' src='/images/media-skip-backward.png' /></form></td>
+    <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='|>' /><input type='image' alt='$Lang::tr{'toggle'}' title='$Lang::tr{'toggle'}' src='/images/media-resume.png' /></form></td>
     <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='playall' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
     <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='>>' /><input type='image' alt='$Lang::tr{'next'}' title='$Lang::tr{'next'}' src='/images/media-skip-forward.png' /></form></td>
     </tr>
@@ -154,6 +244,8 @@ print <<END
     <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='+' /><input type='image' alt='$Lang::tr{'volup5'}' title='$Lang::tr{'volup5'}' src='/images/audio-volume-high.png' /></form></td>
     <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='++' /><input type='image' alt='$Lang::tr{'volup10'}' title='$Lang::tr{'volup10'}' src='/images/audio-volume-high-red.png' /></form></td>
     </tr>
+<tr><td colspan='5' align='center'>$Volume</td></tr>
+<tr><td colspan='5' align='center'><br />$stats</td></tr>
 </table>
 END
 ;
@@ -161,23 +253,16 @@ END
 
 &Header::openbox('100%', 'center', $Lang::tr{'quick playlist'});
 
-my @artist;
-my @album;
-foreach (@songdb){
-  my @song = split(/\|/,$_);
-  push(@artist,$song[1]);push(@album,$song[4]);}
-  my %hash = map{ $_, 1 }@artist;
-  @artist = sort keys %hash;
-  my %hash = map{ $_, 1 }@album;
-  @album = sort keys %hash;
+print "<table width='95%' cellspacing='0'>";
+if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'}</b></td></tr>";}
+else {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'} - ".$artistcount."</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'} - ".$albumcount."</b></td></tr>";}
 print <<END
-  <table width='95%' cellspacing='0'>
   <tr><td align='center'>
       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-      <select name='artist' size='8' multiple='multiple'>
+      <select name='artist' size='8' multiple='multiple' style='width:300px;'>
 END
 ;
-  foreach (@artist){print "<option>$_</option>";}
+foreach (@artist){if ( $_ ne '' ){print "<option>$_</option>";}}
 print <<END
       </select><br/>
       <input type='hidden' name='ACTION' value='playartist' />
@@ -185,15 +270,43 @@ print <<END
       </form></td>
       <td align='center'>
       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-      <select name='album' size='8' multiple='multiple'>
+      <select name='album' size='8' multiple='multiple' style='width:300px;'>
 END
 ;
-  foreach (@album){print "<option>$_</option>";}
+  foreach (@album){if ( $_ ne '' ){print "<option>$_</option>";}}
 print <<END
       </select><br/>
       <input type='hidden' name='ACTION' value='playalbum' />
       <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
       </form></td>
+      </tr>
+END
+;
+if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'year'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'genre'}</b></td></tr>";}
+else {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'year'} - ".$yearcount."</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'genre'} - ".$genrecount."</b></td></tr>";}
+print <<END
+  <tr><td align='center'>
+      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+      <select name='year' size='8' multiple='multiple' style='width:300px;'>
+END
+;
+  foreach (@year){if ( $_ ne '' ){print "<option>$_</option>";}}
+print <<END
+      </select><br/>
+      <input type='hidden' name='ACTION' value='playyear' />
+      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+      </form></td>
+      <td align='center'>
+      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+      <select name='genre' size='8' multiple='multiple' style='width:300px;'>
+END
+;
+  foreach (@genre){if ( $_ ne '' ){print "<option>$_</option>";}}
+print <<END
+      </select><br/>
+      <input type='hidden' name='ACTION' value='playgenre' />
+      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+      </form></td>
       </tr></table>
 END
 ;
@@ -206,62 +319,112 @@ print <<END
 
 <table width='95%' cellspacing='5'>
 <tr bgcolor='$color{'color20'}'><td colspan='9' align='left'><b>$Lang::tr{'Existing Files'}</b></td></tr>
+<tr><td align='center' colspan='9'><br/>$Lang::tr{'Pages'}<br/><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='submit' name='PAGE' value='all' /><br/>
+END
+;
+my $pages =(int(keys(%songs)/100)+1);
+for(my $i = 1; $i <= $pages; $i++) {
+print "<input type='submit' name='PAGE' value='$i' />";
+if (!($i % 205)){print"<br/>";}
+}
+print <<END
+</form></td></tr>
 <tr><td align='center'></td>
     <td align='center'><b>$Lang::tr{'artist'}<br/>$Lang::tr{'title'}</b></td>
     <td align='center'><b>$Lang::tr{'number'}</b></td>
     <td align='center'><b>$Lang::tr{'album'}</b></td>
     <td align='center'><b>$Lang::tr{'year'}</b></td>
     <td align='center'><b>$Lang::tr{'genre'}</b></td>
-    <td align='center'><b>$Lang::tr{'length'}<br/>$Lang::tr{'bitrate'} - $Lang::tr{'frequency'}</b></td>
-    <td align='center'><b>$Lang::tr{'mode'}</b></td></tr>
+    <td align='center'><b>$Lang::tr{'length'}</b></td></tr>
 END
 ;
-my $lines = 0;
-foreach (@songdb){
-  my @song = split(/\|/,$_);
+my $lines=0;my $i=0;my $begin;my $end;
+if ( $mpfiresettings{'PAGE'} eq 'all' ){
+  $begin=0;
+  $end=keys(%songs);
+}
+else{
+  $begin=(($mpfiresettings{'PAGE'}-1) * 100);
+  $end=(($mpfiresettings{'PAGE'} * 100)-1);
+}
+foreach (keys(%songs)){
+  if (!($i >= $begin && $i <= $end)){
+# print $begin."->".$i."<-".$end."\n";
+  $i++;next;}
+  my @song = split(/\|/,$songs{$_});
+  my $minutes = sprintf ("%.0f", $song[1] / 60 );
+  my $seconds = $song[1] % 60;
   
   if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
-  $song[0]=~s/\/\//\//g;   
   print <<END
-  <td align='center' style="white-space:nowrap;"><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='>' /><input type='hidden' name='FILE' value="$song[0]" /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
-  <td align='center'>$song[1]<br/>$song[2]</td>
-  <td align='center'>$song[3]</td>
-  <td align='center'>$song[4]</td>
+  <td align='center' style="white-space:nowrap;"><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='addtoplaylist' /><input type='hidden' name='FILE' value="$song[0]" /><input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/list-add.png' /></form><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='>' /><input type='hidden' name='FILE' value="$song[0]" /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' /></form></td>
+  <td align='center'>$song[2]<br/>$song[3]</td>
   <td align='center'>$song[5]</td>
+  <td align='center'>$song[4]</td>
   <td align='center'>$song[6]</td>
-  <td align='center'>$song[7]:$song[8]<br/>$song[9] - $song[10]</td>
+  <td align='center'>$song[7]</td>
+  <td align='center'>$minutes:$seconds</td></tr>
 END
 ;
-    if ( $song[11] eq "0\n" ) {print "<td align='center'>Stereo</td></tr>"; }
-    elsif ( $song[11] eq "1\n" ) {print "<td align='center'>Joint<br/>Stereo</td></tr>"; }
-    elsif ( $song[11] eq "2\n" ) {print "<td align='center'>Dual<br/>Channel</td></tr>"; }
-    elsif ( $song[11] eq "3\n" ) {print "<td align='center'>Single<br/>Channel</td></tr>"; }
-    else {print "<td align='center'></td></tr>"; }
-  $lines++
+  $lines++;
+  $i++;
   }
-print "</table></form>";
+print "</table>";
 &Header::closebox();
 }
 
 &Header::openbox('100%', 'center', $Lang::tr{'mpfire playlist'});
 
+my @playlist = `mpc playlist`;
+
+print <<END
+<table width='95%' cellspacing='0'>
+<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'current playlist'}</b></td></tr>
+<tr><td align='center' colspan='2' ><textarea cols='100' rows='10' name='playlist' style='font-size:11px;width:650px;' readonly='readonly'>
+END
 ;
+foreach (@playlist){print $_;}
+print <<END
+</textarea></td></tr><tr>
+<td align='right'>
+      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+      <input type='hidden' name='ACTION' value='emptyplaylist' />
+      <input type='image' alt='$Lang::tr{'clear playlist'}' title='$Lang::tr{'clear playlist'}' src='/images/user-trash.png' />
+      </form>
+</td>
+<td align='left'>
+      <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+      <input type='hidden' name='ACTION' value='playlist' />
+      <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
+      </form>
+      </td></tr>
+</table>
+END
+;
+&Header::closebox();
+
+&Header::openbox('100%', 'center', $Lang::tr{'mpfire webradio'});
 
-open(DATEI, "<${General::swroot}/mpfire/playlist") || die "Could not open playlist";
-my @playlist = <DATEI>;
+open(DATEI, "<${General::swroot}/mpfire/webradio") || die "Could not open playlist";
+my @webradio = <DATEI>;
 close(DATEI);
 
 print <<END
 <table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='9' align='left'><b>$Lang::tr{'current playlist'}</b></td></tr>
-<tr><td align='center'><textarea cols='120' rows='10' name='playlist' style='font-size:10px' readonly='readonly' >@playlist</textarea><br/>
-                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='playlist' />
-                       <input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' />
-      </form></td></tr>
-</table>
+<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>
+END
+;
+foreach (@webradio){
+ my @stream = split(/\|/,$_);
+ print <<END
+ <tr><td><a href="$stream[2]">$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
 ;
+ }
+print "</table>";
 &Header::closebox();
 
 &Header::closebigbox();