summaryrefslogtreecommitdiffstats
path: root/lib/class/random.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-12-14 05:21:36 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-12-14 05:21:36 +0000
commit9b3232ba299fbbe6bec922bf7034c005175c9365 (patch)
tree6801f81508b60b98cf1c1997775d085423896a76 /lib/class/random.class.php
parent4c4c945d30bd15bb31c531e177c7c93b476454a4 (diff)
downloadampache-9b3232ba299fbbe6bec922bf7034c005175c9365.tar.gz
ampache-9b3232ba299fbbe6bec922bf7034c005175c9365.tar.bz2
ampache-9b3232ba299fbbe6bec922bf7034c005175c9365.zip
whole bunch more Dba::query replacements
Diffstat (limited to 'lib/class/random.class.php')
-rw-r--r--lib/class/random.class.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/class/random.class.php b/lib/class/random.class.php
index 912aac95..d1b8fefe 100644
--- a/lib/class/random.class.php
+++ b/lib/class/random.class.php
@@ -50,7 +50,7 @@ class Random implements media {
public static function album() {
$sql = "SELECT `id` FROM `album` ORDER BY RAND() LIMIT 1";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
$results = Dba::fetch_assoc($db_results);
@@ -65,7 +65,7 @@ class Random implements media {
public static function artist() {
$sql = "SELECT `id` FROM `artist` ORDER BY RAND() LIMIT 1";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
$results = Dba::fetch_assoc($db_results);
@@ -83,7 +83,7 @@ class Random implements media {
$sql = "SELECT `playlist`.`id` FROM `playlist` LEFT JOIN `playlist_data` " .
" ON `playlist`.`id`=`playlist_data`.`playlist` WHERE `playlist_data`.`object_id` IS NOT NULL " .
" ORDER BY RAND()";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
$results = Dba::fetch_assoc($db_results);
@@ -141,7 +141,7 @@ class Random implements media {
$results = array();
$sql = "SELECT `id` FROM `song` ORDER BY RAND() LIMIT $limit";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
while ($row = Dba::fetch_assoc($db_results)) {
$results[] = $row['id'];
@@ -167,7 +167,7 @@ class Random implements media {
}
$sql = "SELECT `id` FROM `song` $where_sql ORDER BY RAND() LIMIT $limit";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
while ($row = Dba::fetch_assoc($db_results)) {
$results[] = $row['id'];
@@ -193,7 +193,7 @@ class Random implements media {
}
$sql = "SELECT `id` FROM `song` $where_sql ORDER BY RAND() LIMIT $limit";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
while ($row = Dba::fetch_assoc($db_results)) {
$results[] = $row['id'];
@@ -218,7 +218,7 @@ class Random implements media {
}
$sql = "SELECT `id` FROM `song` $where_sql ORDER BY RAND() LIMIT $limit";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
while ($row = Dba::fetch_assoc($db_results)) {
$results[] = $row['id'];
@@ -273,7 +273,7 @@ class Random implements media {
case 'full_album':
$query = "SELECT `album`.`id` FROM `song` INNER JOIN `album` ON `song`.`album`=`album`.`id` " .
"WHERE $where GROUP BY `song`.`album` ORDER BY RAND() $limit_sql";
- $db_results = Dba::query($query);
+ $db_results = Dba::read($query);
while ($row = Dba::fetch_assoc($db_results)) {
$albums_where .= " OR `song`.`album`=" . $row['id'];
}
@@ -283,7 +283,7 @@ class Random implements media {
case 'full_artist':
$query = "SELECT `artist`.`id` FROM `song` INNER JOIN `artist` ON `song`.`artist`=`artist`.`id` " .
"WHERE $where GROUP BY `song`.`artist` ORDER BY RAND() $limit_sql";
- $db_results = Dba::query($query);
+ $db_results = Dba::read($query);
while ($row = Dba::fetch_row($db_results)) {
$artists_where .= " OR song.artist=" . $row[0];
}
@@ -293,7 +293,7 @@ class Random implements media {
case 'unplayed':
$uid = Dba::escape($GLOBALS['user']->id);
$sql = "SELECT object_id,COUNT(`id`) AS `total` FROM `object_count` WHERE `user`='$uid' GROUP BY `object_id`";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
$in_sql = "`id` IN (";
@@ -310,7 +310,7 @@ class Random implements media {
case 'high_rating':
$sql = "SELECT `rating`.`object_id`,`rating`.`rating` FROM `rating` " .
"WHERE `rating`.`object_type`='song' ORDER BY `rating` DESC";
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
// Get all of the ratings for songs
while ($row = Dba::fetch_assoc($db_results)) {
@@ -349,7 +349,7 @@ class Random implements media {
} // end switch on type of random play
// Run the query generated above so we can while it
- $db_results = Dba::query($sql);
+ $db_results = Dba::read($sql);
$results = array();
while ($row = Dba::fetch_assoc($db_results)) {