diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-23 11:32:24 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-23 13:03:14 -0500 |
| commit | fd214fdcb78a8e5a23462b9206f35f707bb19ba7 (patch) | |
| tree | c77a8870620b819f88191899cfc35715e367c277 /lib/class/xmldata.class.php | |
| parent | 4dca7a57b05de6efa38828eb3c90549a1d07857c (diff) | |
| download | ampache-fd214fdcb78a8e5a23462b9206f35f707bb19ba7.tar.gz ampache-fd214fdcb78a8e5a23462b9206f35f707bb19ba7.tar.bz2 ampache-fd214fdcb78a8e5a23462b9206f35f707bb19ba7.zip | |
Mess around with ratings
Drop the public variables from the rating class; everyone should use the
getters.
Add the ability for themes and applications to distinguish between
a user's actual rating and the global average rating; in the web
interface the average shows up if a user hasn't rated something but at
least one other user has.
Diffstat (limited to 'lib/class/xmldata.class.php')
| -rw-r--r-- | lib/class/xmldata.class.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/class/xmldata.class.php b/lib/class/xmldata.class.php index c736569a..9b467620 100644 --- a/lib/class/xmldata.class.php +++ b/lib/class/xmldata.class.php @@ -298,8 +298,9 @@ class xmlData { $tag_string . "\t<albums>$artist->albums</albums>\n" . "\t<songs>$artist->songs</songs>\n" . - "\t<preciserating>" . $rating->preciserating . "</preciserating>\n" . - "\t<rating>" . $rating->rating . "</rating>\n" . + "\t<preciserating>" . $rating->get_user_rating() . "</preciserating>\n" . + "\t<rating>" . $rating->get_user_rating() . "</rating>\n" . + "\t<averagerating>" . $rating->get_average_rating() . "</averagerating>\n" . "</artist>\n"; } // end foreach artists @@ -350,8 +351,9 @@ class xmlData { "\t<disk>$album->disk</disk>\n" . self::tags_string($album->tags) . "\t<art><![CDATA[$art_url]]></art>\n" . - "\t<preciserating>" . $rating->preciserating . "</preciserating>\n" . - "\t<rating>" . $rating->rating . "</rating>\n" . + "\t<preciserating>" . $rating->get_user_rating() . "</preciserating>\n" . + "\t<rating>" . $rating->get_user_rating() . "</rating>\n" . + "\t<averagerating>" . $rating->get_average_rating() . "</averagerating>\n" . "</album>\n"; } // end foreach @@ -448,8 +450,9 @@ class xmlData { "\t<album_mbid>$song->album_mbid</album_mbid>\n". "\t<artist_mbid>$song->artist_mbid</artist_mbid>\n". "\t<art><![CDATA[" . $art_url . "]]></art>\n" . - "\t<preciserating>" . $rating->preciserating . "</preciserating>\n" . - "\t<rating>" . $rating->rating . "</rating>\n" . + "\t<preciserating>" . $rating->get_user_rating() . "</preciserating>\n" . + "\t<rating>" . $rating->get_user_rating() . "</rating>\n" . + "\t<averagerating>" . $rating->get_average_rating() . "</averagerating>\n" . "</song>\n"; } // end foreach @@ -541,8 +544,9 @@ class xmlData { "\t<url><![CDATA[" . Song::play_url($song->id) . "]]></url>\n" . "\t<size>$song->size</size>\n" . "\t<art><![CDATA[" . $art_url . "]]></art>\n" . - "\t<preciserating>" . $rating->preciserating . "</preciserating>\n" . - "\t<rating>" . $rating->rating . "</rating>\n" . + "\t<preciserating>" . $rating->get_user_rating() . "</preciserating>\n" . + "\t<rating>" . $rating->get_user_rating() . "</rating>\n" . + "\t<averagerating>" . $rating->get_average_rating() . "</averagerating>\n" . "\t<vote>" . $democratic->get_vote($row_id) . "</vote>\n" . "</song>\n"; |