junior/HomeAudio
junior/HomeAudio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up output and force json content type

Browse Source
This commit is contained in:
Junior 2025-04-18 10:02:30 -04:00
parent e92eff5107
commit 3dac8013d8
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ajax/ajax_listsongs.php
View File

@ -30,18 +30,25 @@ $data['volume'] = getSystemVolume();
system("HOME=" . WEBUSERHOMEDIR . " && ../scripts/homeaudio_togglemute.pl -show", $retval); system("HOME=" . WEBUSERHOMEDIR . " && ../scripts/homeaudio_togglemute.pl -show", $retval);
$data['muted'] = ($retval == 0) ? false : true; $data['muted'] = ($retval == 0) ? false : true;
$data['currentsong'] = array("art"=>"", "title"=>"", "artist"=>"", "album"=>"", "year"=>""); $data['currentsong'] = array("art"=>"", "title"=>"", "artist"=>"", "album"=>"", "year"=>"");
$data['songhistory'] = array();
$data['songlist'] = ""; $data['songlist'] = "";
$firstsong = true; if ( $row = $sth->fetch(PDO::FETCH_ASSOC) ) {
while ( $row = $sth->fetch() ) {
$song = new Song($row['songid']); $song = new Song($row['songid']);
if ( $firstsong ) {
$data['currentsong']["arturl"] = $song->getArtFile(ARTURL); $data['currentsong']["arturl"] = $song->getArtFile(ARTURL);
$data['currentsong']["title"] = $song->getTitle(HTMLSAFE); $data['currentsong']["title"] = $song->getTitle(HTMLSAFE);
$data['currentsong']["artist"] = $song->getArtist(HTMLSAFE); $data['currentsong']["artist"] = $song->getArtist(HTMLSAFE);
$data['currentsong']["album"] = $song->getAlbum(HTMLSAFE); $data['currentsong']["album"] = $song->getAlbum(HTMLSAFE);
$data['currentsong']["year"] = $song->getYear(HTMLSAFE); $data['currentsong']["year"] = $song->getYear(HTMLSAFE);
$firstsong = false; }
} else { while ( $row = $sth->fetch() ) {
$song = new Song($row['songid']);
$curdata = array();
$curdata["arturl"] = $song->getArtFile(ARTURL);
$curdata["title"] = $song->getTitle(HTMLSAFE);
$curdata["artist"] = $song->getArtist(HTMLSAFE);
$curdata["album"] = $song->getAlbum(HTMLSAFE);
$curdata["year"] = $song->getYear(HTMLSAFE);
$data['songhistory'][] = $curdata;
$data['songlist'] .= "<div class='songlist_song_container'>\n"; $data['songlist'] .= "<div class='songlist_song_container'>\n";
$data['songlist'] .= " <div class='songlist_img_container'><img class='songlist_img' src='{$song->getArtFile(ARTURL)}'></div>\n"; $data['songlist'] .= " <div class='songlist_img_container'><img class='songlist_img' src='{$song->getArtFile(ARTURL)}'></div>\n";
$data['songlist'] .= " <div class='songlist_details_container'>\n"; $data['songlist'] .= " <div class='songlist_details_container'>\n";
@ -52,14 +59,9 @@ while ( $row = $sth->fetch() ) {
$data['songlist'] .= "</div>\n"; $data['songlist'] .= "</div>\n";
$data['songlist'] .= "<hr class='songlist'>\n"; $data['songlist'] .= "<hr class='songlist'>\n";
} }
}
if ( $debug ) { header('Content-Type: application/json');
var_dump($data);
echo "</pre>";
} else {
echo json_encode($data); echo json_encode($data);
}
exit(); exit();
// vim: set ts=3 sw=3 ai:
?>