summaryrefslogtreecommitdiffstats
path: root/contrib/plugins/RioPlayer
diff options
context:
space:
mode:
authorpb1dft <pb1dft@ampache>2007-02-27 22:31:53 +0000
committerpb1dft <pb1dft@ampache>2007-02-27 22:31:53 +0000
commitfb8802fd94cfe5732ea02388094aa0bfc72eb834 (patch)
tree3a3b171e1b25c36b42b9a8a099b5b1dcc30a9cc6 /contrib/plugins/RioPlayer
parent055195b302f0a2521a8b3a7f57e385a2aa03fdc2 (diff)
downloadampache-fb8802fd94cfe5732ea02388094aa0bfc72eb834.tar.gz
ampache-fb8802fd94cfe5732ea02388094aa0bfc72eb834.tar.bz2
ampache-fb8802fd94cfe5732ea02388094aa0bfc72eb834.zip
User Fav albums/artist fixed
Diffstat (limited to 'contrib/plugins/RioPlayer')
-rw-r--r--contrib/plugins/RioPlayer/modules/rio/rio.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/contrib/plugins/RioPlayer/modules/rio/rio.php b/contrib/plugins/RioPlayer/modules/rio/rio.php
index e68e2a5f..593723bd 100644
--- a/contrib/plugins/RioPlayer/modules/rio/rio.php
+++ b/contrib/plugins/RioPlayer/modules/rio/rio.php
@@ -643,7 +643,12 @@ require_once("../../lib/init.php");
$index++;
}
- $sql="SELECT album.name FROM object_count LEFT JOIN album ON object_count.object_id=album.id WHERE object_count.object_type='album' AND object_count.userid='$ampacheUserID' ORDER BY object_count.count DESC LIMIT $favorites_user_most_popular_albums";
+// $sql="SELECT album.name FROM object_count LEFT JOIN album ON object_count.object_id=album.id WHERE object_count.object_type='album' AND object_count.userid='$ampacheUserID' ORDER BY object_count.count DESC LIMIT $favorites_user_most_popular_albums";
+ $sql="SELECT a.name,COUNT(object_count.id) AS `count` FROM object_count, album as a ".
+ "WHERE object_type='album' AND a.id=object_count.object_id AND object_count.user='$ampacheUserID'".
+ "GROUP BY object_id ORDER BY `count` DESC LIMIT $favorites_user_most_popular_albums";
+ debug_event('RioPlayer',"FAV Albums (U):\n".$sql,1);
+
$db_results = mysql_query($sql);
while (($row=mysql_fetch_row($db_results)) && $index < 100) {
@@ -683,7 +688,11 @@ require_once("../../lib/init.php");
$index++;
}
- $sql="SELECT artist.name FROM object_count LEFT JOIN artist ON object_count.object_id=artist.id WHERE object_count.object_type='artist' AND object_count.userid='$ampacheUserID' ORDER BY object_count.count DESC LIMIT $favorites_user_most_popular_artists";
+// $sql="SELECT artist.name FROM object_count LEFT JOIN artist ON object_count.object_id=artist.id WHERE object_count.object_type='artist' AND object_count.userid='$ampacheUserID' ORDER BY object_count.count DESC LIMIT $favorites_user_most_popular_artists";
+ $sql="SELECT a.name,COUNT(object_count.id) AS `count` FROM object_count, artist as a ".
+ "WHERE object_type='artist' AND a.id=object_count.object_id AND object_count.user='$ampacheUserID' ".
+ "GROUP BY object_id ORDER BY `count` DESC LIMIT $favorites_user_most_popular_artists";
+ debug_event('RioPlayer',"FAV Artist (U):\n".$sql,1);
$db_results = mysql_query($sql);
while (($row=mysql_fetch_row($db_results)) && $index < 100) {
@@ -1548,7 +1557,7 @@ require_once("../../lib/init.php");
//update_user_stats($ampacheUserID, $queryFilter);
// Ampache went to user classes so i have to do this...
- $user = new User($ampacheUsername,$userID[0]);
+ $user = new User($ampacheUserID);
$user->update_stats($queryFilter);
// END 1.1 MODIFICATION