Add missing patches for compat-wireless.

[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 c010fd494117d79d15db6982c317358097eb6dbe..6b06d3b640bd35cd6ac676fa71b1b6db20ce7068 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -231,8 +231,7 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ){
 }elsif ( $mpfiresettings{'ACTION'} eq "playweb" ){
        $message=system("/usr/local/bin/mpfirectrl","playweb","\"$mpfiresettings{'FILE'}\"","2>/dev/null");
 }elsif ( $mpfiresettings{'ACTION'} eq "playlist" ){
-# on keypress play the playlist
-       $message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
+       $mpd->play();
 }elsif ( $mpfiresettings{'ACTION'} eq "emptyplaylist" ){
 # on keypress clear the playlist
        $mpd->playlist->clear();
@@ -318,7 +317,7 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ){
 ############################################################################################################################
 ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ####################################
 
-$mpfiresettings{'MUSICDIR'} = "/";
+$mpfiresettings{'MUSICDIR'} = "/var/mp3";
 &General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings);
 
 ############################################################################################################################
@@ -367,7 +366,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_artists()){
+foreach (sort($mpd->collection->all_artists())){
        if ( $_ ne '' ){
                print "<option>".encode('utf-8', $_)."</option>\n";
        }
@@ -384,7 +383,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_albums()){
+foreach (sort($mpd->collection->all_albums())){
        if ( $_ ne '' ){
                print "<option>".encode('utf-8', $_)."</option>\n";
        }
@@ -403,7 +402,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_years()){
+foreach (sort($mpd->collection->all_years())){
        if ( $_ ne '' ){
                print "<option>$_</option>\n";
        }
@@ -420,7 +419,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_genre()){
+foreach (sort($mpd->collection->all_genre())){
        if ( $_ ne '' ){
                print "<option>$_</option>\n";
        }