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

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

diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index 6cec8ff338c06e8458e77796e3d24e08ff53e10c..ea83d1db17f2e3b8fdc5b0beb6ed15c2d348071d 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -47,7 +47,7 @@ my $errormessage = "";
 my @songs;
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 &Header::showhttpheaders();
 
@@ -231,7 +231,7 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ){
        $mpd->updatedb();
        refreshpage();
 }elsif ( $mpfiresettings{'ACTION'} eq "playweb" ){
-       $message=system("/usr/local/bin/mpfirectrl","playweb","\"$mpfiresettings{'FILE'}\"","2>/dev/null");
+       $message= &General::system_output("/usr/local/bin/mpfirectrl","playweb","\"$mpfiresettings{'FILE'}\"");
 }elsif ( $mpfiresettings{'ACTION'} eq "playlist" ){
        $mpd->play();
 }elsif ( $mpfiresettings{'ACTION'} eq "emptyplaylist" ){