diff options
| author | momo-i <momo-i@ampache> | 2009-03-10 22:52:52 +0000 |
|---|---|---|
| committer | momo-i <momo-i@ampache> | 2009-03-10 22:52:52 +0000 |
| commit | 53d288873d9943adfd9de46e5727362829e1d565 (patch) | |
| tree | a96c9d38cd70e83b05155a6dcff504b1643a63d5 /lib/class/artist.class.php | |
| parent | eda8070b7f3dfb1a34c10afe72b6d3f387d6f235 (diff) | |
| download | ampache-53d288873d9943adfd9de46e5727362829e1d565.tar.gz ampache-53d288873d9943adfd9de46e5727362829e1d565.tar.bz2 ampache-53d288873d9943adfd9de46e5727362829e1d565.zip | |
Fixed: id3v2 tag lyrics display
Diffstat (limited to 'lib/class/artist.class.php')
| -rw-r--r-- | lib/class/artist.class.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php index 638c5998..bab664e6 100644 --- a/lib/class/artist.class.php +++ b/lib/class/artist.class.php @@ -290,24 +290,22 @@ class Artist extends database_object { public function get_song_lyrics($song_id, $artist_name, $song_title) { $sql = "SELECT `lyrics`.`song_data` FROM `song_data` WHERE `song_id`='" . Dba::escape($song_id) . "'"; - $db_results = Dba::query($sql); - + $db_results = Dba::read($sql); $results = Dba::fetch_assoc($db_results); // Get Lyrics From id3tag (Lyrics3) - $rs = Dba::read("SELECT `file`.`song` FROM `song` WHERE `id`='" . Dba::escape($song_id) . "'"); + $rs = Dba::read("SELECT `song`.`file` FROM `song` WHERE `id`='" . Dba::escape($song_id) . "'"); $filename = Dba::fetch_row($rs); $vainfo = new vainfo($filename[0], '','','',$catalog->sort_pattern,$catalog->rename_pattern); $vainfo->get_info(); $key = vainfo::get_tag_type($vainfo->tags); $tag_lyrics = vainfo::clean_tag_info($vainfo->tags,$key,$filename); - $lyrics = $tag_lyrics['lyrics']; - if (empty($lyrics)) { - // Get Lyrics From id3tag (id3v2 USLT/SYLT) - } + $lyrics = $tag_lyrics['lyrics']; if (strlen($results['lyrics']) > 1) { + $sql = "UPDATE `song_data` SET `lyrics` = '" . htmlspecialchars(strip_tags($results['lyrics']), ENT_QUOTES) . "' WHERE `song_id`='" . Dba::escape($song_id) . "'"; + $db_results = Dba::write($sql); return html_entity_decode(strip_tags(($results['lyrics'])), ENT_QUOTES); } elseif (strlen($lyrics) > 1) { // encode lyrics utf8 @@ -317,6 +315,8 @@ class Artist extends database_object { $lyrics = mb_convert_encoding($lyrics, 'UTF-8', $enc); } } + $sql = "UPDATE `song_data` SET `lyrics` = '" . htmlspecialchars(strip_tags($lyrics), ENT_QUOTES) . "' WHERE `song_id`='" . Dba::escape($song_id) . "'"; + $db_results = Dba::write($sql); return $lyrics; } else { @@ -348,7 +348,7 @@ class Artist extends database_object { else { // since we got lyrics, might as well add them to the database now (for future use) $sql = "UPDATE `song_data` SET `lyrics` = '" . htmlspecialchars(strip_tags(($result['lyrics'])), ENT_QUOTES) . "' WHERE `song_id`='" . Dba::escape($song_id) . "'"; - $db_results = Dba::query($sql); + $db_results = Dba::write($sql); // display result (lyrics) //print_r($result); return $results = strip_tags($result['lyrics']); |