Remove Dba::query from a few more classes

6 files changed, 57 insertions, 56 deletions

diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index 12a5d8cf..d399b952 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -973,7 +973,7 @@ class Album extends database_object {
                         " `art_mime` = '" . Dba::escape($mime) . "'" .
         	        ", `album_id` = '$this->id'," . 
 			"`thumb` = NULL, `thumb_mime`=NULL";
-	        $db_results = Dba::query($sql);
+	        $db_results = Dba::write($sql);
 
 		return true;
 
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index c2c80a61..a61b0e92 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -84,7 +84,7 @@ class Artist extends database_object {
 		$idlist = '(' . implode(',', $ids) . ')';
 
 		$sql = "SELECT * FROM `artist` WHERE `id` IN $idlist";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 	  	while ($row = Dba::fetch_assoc($db_results)) {
 	  		parent::add_to_cache('artist',$row['id'],$row); 
@@ -94,7 +94,7 @@ class Artist extends database_object {
 		if ($extra) { 
 	                $sql = "SELECT `song`.`artist`, COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` " .
                         "WHERE `song`.`artist` IN $idlist GROUP BY `song`.`artist`";
-	                $db_results = Dba::query($sql);
+	                $db_results = Dba::read($sql);
 
 			while ($row = Dba::fetch_assoc($db_results)) { 
 				parent::add_to_cache('artist_extra',$row['artist'],$row); 
@@ -114,7 +114,7 @@ class Artist extends database_object {
 
 		$name = Dba::escape($name); 
 		$sql = "SELECT `id` FROM `artist` WHERE `name`='$name'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		$row = Dba::fetch_assoc($db_results); 
 
@@ -135,7 +135,7 @@ class Artist extends database_object {
 
 		$sql = "SELECT `album`.`id` FROM album LEFT JOIN `song` ON `song`.`album`=`album`.`id` " . 
 			"WHERE `song`.`artist`='$this->id' GROUP BY `album`.`id` ORDER BY `album`.`name`,`album`.`disk`,`album`.`year`";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		while ($r = Dba::fetch_assoc($db_results)) { 
 			$results[] = $r['id'];
@@ -152,7 +152,7 @@ class Artist extends database_object {
 	public function get_songs() { 
 	
 		$sql = "SELECT `song`.`id` FROM `song` WHERE `song`.`artist`='" . Dba::escape($this->id) . "' ORDER BY album, track";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		while ($r = Dba::fetch_assoc($db_results)) { 
 			$results[] = $r['id'];
@@ -171,7 +171,7 @@ class Artist extends database_object {
                 $results = array();
 
                 $sql = "SELECT `id` FROM `song` WHERE `artist`='$this->id' ORDER BY RAND()";
-                $db_results = Dba::query($sql);
+                $db_results = Dba::read($sql);
 
                 while ($r = Dba::fetch_assoc($db_results)) {
                         $results[] = $r['id'];
@@ -195,7 +195,7 @@ class Artist extends database_object {
 			$uid = Dba::escape($this->id); 
 			$sql = "SELECT `song`.`artist`,COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` " . 
 				"WHERE `song`.`artist`='$uid' GROUP BY `song`.`artist`";
-			$db_results = Dba::query($sql);
+			$db_results = Dba::read($sql);
 			$row = Dba::fetch_assoc($db_results); 
 			parent::add_to_cache('artist_extra',$row['artist'],$row); 
 		} 
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index fb898417..973b0a8b 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -157,7 +157,7 @@ class Catalog extends database_object {
 	public static function get_catalogs() {
 
 		$sql = "SELECT `id` FROM `catalog` ORDER BY `name`";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = array();
 
@@ -176,7 +176,7 @@ class Catalog extends database_object {
 	public static function get_catalog_ids() {
 
 		$sql = "SELECT `id` FROM `catalog`";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		while ($r = Dba::fetch_assoc($db_results)) {
 			$results[] = $r['id'];
@@ -235,10 +235,10 @@ class Catalog extends database_object {
 
 		/* Whip out everything */
 		$sql = "TRUNCATE `object_count`";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		$sql = "UDPATE `song` SET `played`='0'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -265,7 +265,7 @@ class Catalog extends database_object {
 
 		// Make sure this path isn't already in use by an existing catalog
 		$sql = "SELECT `id` FROM `catalog` WHERE `path`='$path'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		if (Dba::num_rows($db_results)) {
 			Error::add('general','Error: Catalog with ' . $path . ' already exists');
@@ -384,19 +384,19 @@ class Catalog extends database_object {
 		$catalog_search = $catalog_id ? "WHERE `catalog`='" . Dba::escape($catalog_id) . "'" : ''; 
 
 		$sql = "SELECT COUNT(`id`),SUM(`time`),SUM(`size`) FROM `song` $catalog_search";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		$data = Dba::fetch_row($db_results);
 		$songs	= $data['0'];
 		$time	= $data['1'];
 		$size	= $data['2'];
 
 		$sql = "SELECT COUNT(DISTINCT(`album`)) FROM `song` $catalog_search";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		$data = Dba::fetch_row($db_results);
 		$albums = $data['0'];
 
 		$sql = "SELECT COUNT(DISTINCT(`artist`)) FROM `song` $catalog_search";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		$data = Dba::fetch_row($db_results);
 		$artists = $data['0'];
 
@@ -418,7 +418,7 @@ class Catalog extends database_object {
 
 		// Count total users
 		$sql = "SELECT COUNT(id) FROM `user`";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		$data = Dba::fetch_row($db_results);
 		$results['users'] = $data['0'];
 
@@ -429,7 +429,7 @@ class Catalog extends database_object {
 	                "INNER JOIN user AS u ON s.username = u.username " .
 	                "WHERE s.expire > " . $time . " " .
 	                "AND u.last_seen > " . $last_seen_time;
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		$data = Dba::fetch_row($db_results);
 
 		$results['connected'] = $data['0'];
@@ -629,7 +629,7 @@ class Catalog extends database_object {
 		$results = array();
 
 		$sql = "SELECT DISTINCT(song.album) FROM `song` WHERE `song`.`catalog`='$id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		while ($r = Dba::fetch_assoc($db_results)) {
 			$results[] = $r['album'];
@@ -731,7 +731,7 @@ class Catalog extends database_object {
 		$results = array();
 
 		$sql = "SELECT DISTINCT(`song`.`album`) FROM `song`  WHERE `song`.`catalog`='$catalog_id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		while ($row = Dba::fetch_assoc($db_results)) {
 			$results[] = $row['album'];
@@ -754,7 +754,7 @@ class Catalog extends database_object {
 		$catalog_id = $catalog_id ? Dba::escape($catalog_id) : Dba::escape($this->id);
 
 		$sql = "SELECT `id` FROM `song` WHERE `catalog`='$catalog_id' AND `enabled`='1'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = array(); // return an emty array instead of nothing if no objects
 		while ($r = Dba::fetch_assoc($db_results)) {
@@ -2021,7 +2021,7 @@ class Catalog extends database_object {
 		$exists = false;
 
 		$sql = "SELECT `id` FROM `artist` WHERE `mbid` LIKE '$mbid'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		// Check for results
 		if ($r = Dba::fetch_assoc($db_results)) {
@@ -2031,7 +2031,7 @@ class Catalog extends database_object {
 
 		else { // No exact match based on MBID
 			$sql = "SELECT `id`, `mbid` FROM `artist` WHERE `name` LIKE '$artist'";
-			$db_results = Dba::query($sql);
+			$db_results = Dba::read($sql);
 
 
 			/* If we have results */
@@ -2052,7 +2052,7 @@ class Catalog extends database_object {
 					$exists = true;
 					if (!$readonly) {
 						$sql = "UPDATE `artist` SET `mbid`='$mbid' WHERE `id`='$artist_id'";
-						$db_results = Dba::query($sql);
+						$db_results = Dba::write($sql);
 						if (!$db_results) {
 		        	                        Error::add('general',"Updating Artist: $artist");
 		                	        }
@@ -2071,7 +2071,7 @@ class Catalog extends database_object {
 
 			$sql = "INSERT INTO `artist` (`name`, `prefix`, `mbid`) " .
 			"VALUES ('$artist',$prefix_txt,$mbid)";
-			$db_results = Dba::query($sql);
+			$db_results = Dba::write($sql);
 			$artist_id = Dba::insert_id();
 
 			if (!$db_results) {
@@ -2128,7 +2128,7 @@ class Catalog extends database_object {
 		if ($album_disk) { $sql .= " AND `disk`='$album_disk'"; }
 		if ($mbid) { $sql .= " AND `mbid`='$mbid'"; }
 		if ($prefix) { $sql .= " AND `prefix`='" . Dba::escape($prefix) . "'"; }
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		/* If it's found */
 		if ($r = Dba::fetch_assoc($db_results)) {
@@ -2151,7 +2151,7 @@ class Catalog extends database_object {
 
 			$sql = "INSERT INTO `album` (`name`, `prefix`,`year`,`disk`,`mbid`) " .
 			"VALUES ('$album',$prefix_txt,'$album_year','$album_disk',$mbid)";
-			$db_results = Dba::query($sql);
+			$db_results = Dba::write($sql);
 			$album_id = Dba::insert_id();
 
 			if (!$db_results) {
@@ -2251,7 +2251,7 @@ class Catalog extends database_object {
 
 		$sql = "INSERT INTO `song` (file,catalog,album,artist,title,bitrate,rate,mode,size,time,track,addition_time,year,mbid)" .
 			" VALUES ('$add_file','$this->id','$album_id','$artist_id','$title','$bitrate','$rate','$mode','$size','$song_time','$track','$current_time','$year','$track_mbid')";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		if (!$db_results) {
 			debug_event('insert',"Unable to insert $file -- $sql" . Dba::error(),'5','ampache-catalog');
@@ -2272,7 +2272,7 @@ class Catalog extends database_object {
 		/* Add the EXT information */
 		$sql = "INSERT INTO `song_data` (`song_id`,`comment`,`lyrics`) " .
 			" VALUES ('$song_id','$comment','$lyrics')"; 
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		if (!$db_results) {
 			debug_event('insert',"Unable to insert EXT Info for $file -- $sql",'5','ampache-catalog');
@@ -2295,7 +2295,7 @@ class Catalog extends database_object {
 
 		$sql = "INSERT INTO song (file,catalog,album,artist,title,bitrate,rate,mode,size,time,track,addition_time,year)" .
 			" VALUES ('$url','$song->catalog','$song->album','$song->artist','$title','$song->bitrate','$song->rate','$song->mode','$song->size','$song->time','$song->track','$current_time','$song->year')";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		if (!$db_results) {
 			debug_event('insert',"Unable to Add Remote $url -- $sql",'5','ampache-catalog');
@@ -2354,7 +2354,7 @@ class Catalog extends database_object {
 		$url = Dba::escape($url);
 
 		$sql = "SELECT `id` FROM `song` WHERE `file`='$url'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		if (Dba::num_rows($db_results)) {
 			return true;
@@ -2437,7 +2437,7 @@ class Catalog extends database_object {
 		$full_file = Dba::escape($full_file);
 
 		$sql = "SELECT `id` FROM `song` WHERE `file` = '$full_file'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		//If it's found then return true
 		if (Dba::fetch_row($db_results)) {
@@ -2477,7 +2477,7 @@ class Catalog extends database_object {
 
 				/* Search for this filename, cause it's a audio file */
 				$sql = "SELECT `id` FROM `song` WHERE `file` LIKE '%" . Dba::escape($file) . "'";
-				$db_results = Dba::query($sql);
+				$db_results = Dba::read($sql);
 				$results = Dba::fetch_assoc($db_results);
 
 				if (isset($results['id'])) { $songs[] = $results['id']; }
@@ -2488,7 +2488,7 @@ class Catalog extends database_object {
 				$song_id = intval(Song::parse_song_url($value));
 
 				$sql = "SELECT COUNT(*) FROM `song` WHERE `id`='$song_id'";
-				$db_results = Dba::query($sql);
+				$db_results = Dba::read($sql);
 
 				if (Dba::num_rows($db_results)) {
 					$songs[] = $song_id;
diff --git a/lib/class/preference.class.php b/lib/class/preference.class.php
index 338f14b7..cfc08bf8 100644
--- a/lib/class/preference.class.php
+++ b/lib/class/preference.class.php
@@ -65,7 +65,7 @@ class Preference {
 			$user_id	= Dba::escape($user_id); 
 			$sql = "UPDATE `user_preference` SET `value`='$value' " . 
 				"WHERE `preference`='$id'$user_check"; 
-			$db_results = Dba::query($sql); 
+			$db_results = Dba::write($sql); 
 			Preference::clear_from_session();
 			return true; 
 		} 
@@ -94,7 +94,7 @@ class Preference {
 		$level		= Dba::escape($level); 
 
 		$sql = "UPDATE `preference` SET `level`='$level' WHERE `id`='$preference_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return true; 
 
@@ -110,7 +110,7 @@ class Preference {
 		$value		= Dba::escape($value); 
 
 		$sql = "UPDATE `user_preference` SET `value`='$value' WHERE `preference`='$preference_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return true; 
 
@@ -125,7 +125,7 @@ class Preference {
 		// We assume it's the name
 		$name = Dba::escape($preference); 
 		$sql = "SELECT * FROM `preference` WHERE `name`='$name'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		return Dba::num_rows($db_results); 
 
@@ -144,7 +144,7 @@ class Preference {
 		$preference = Dba::escape($preference); 
 
 		$sql = "SELECT `level` FROM `preference` WHERE `name`='$preference'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 		$data = Dba::fetch_assoc($db_results);
 
 		if (Access::check('interface',$data['level'])) { 
@@ -164,7 +164,7 @@ class Preference {
 		$name = Dba::escape($name); 
 
 		$sql = "SELECT `id` FROM `preference` WHERE `name`='$name'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$row = Dba::fetch_assoc($db_results); 
 
@@ -182,7 +182,7 @@ class Preference {
 		$id = Dba::escape($id); 
 
 		$sql = "SELECT `name` FROM `preference` WHERE `id`='$id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$row = Dba::fetch_assoc($db_results); 
 
@@ -198,7 +198,7 @@ class Preference {
 	public static function get_catagories() { 
 
 		$sql = "SELECT `preference`.`catagory` FROM `preference` GROUP BY `catagory` ORDER BY `catagory`"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = array(); 
 
@@ -227,7 +227,7 @@ class Preference {
 		$sql = "SELECT `preference`.`name`,`preference`.`description`,`user_preference`.`value` FROM `preference` " . 
 			" INNER JOIN `user_preference` ON `user_preference`.`preference`=`preference`.`id` " . 
 			" WHERE `user_preference`.`user`='$user_id' AND `preference`.`catagory` != 'internal' $user_limit"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = array(); 
 
@@ -256,7 +256,7 @@ class Preference {
 
 		$sql = "INSERT INTO `preference` (`name`,`description`,`value`,`level`,`type`,`catagory`) " . 
 			"VALUES ('$name','$description','$default','$level','$type','$catagory')"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		if (!$db_results) { return false; } 
 
@@ -280,7 +280,7 @@ class Preference {
 			$sql = "DELETE FROM `preference` WHERE `id`='$id'"; 
                 }
 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		self::rebuild_preferences(); 
 
@@ -295,10 +295,11 @@ class Preference {
 		// First remove garbage
 		$sql = "DELETE FROM `user_preference` USING `user_preference` LEFT JOIN `preference` ON `preference`.`id`=`user_preference`.`preference` " . 
 			"WHERE `preference`.`id` IS NULL"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		// Now add anything that we are missing back in, except System
 		$sql = "SELECT * FROM `preference` WHERE `type`!='system'"; 	
+		//FIXME: Uhh WTF shouldn't there be something here??
 
 	} // rebuild_preferences
 
diff --git a/lib/class/rating.class.php b/lib/class/rating.class.php
index 9348c4e7..0494d9b1 100644
--- a/lib/class/rating.class.php
+++ b/lib/class/rating.class.php
@@ -121,7 +121,7 @@ class Rating extends database_object {
 		$user_id = Dba::escape($user_id); 
 
 		$sql = "SELECT `rating` FROM `rating` WHERE `user`='$user_id' AND `object_id`='$id' AND `object_type`='$this->type'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		
 		$results = Dba::fetch_assoc($db_results);
 
@@ -150,7 +150,7 @@ class Rating extends database_object {
 		} 
 
 		$sql = "SELECT `rating` FROM `rating` WHERE `object_id`='$id' AND `object_type`='$this->type'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$i = 0;
 
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 9a1b1bdd..7d30b116 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -143,7 +143,7 @@ class Song extends database_object implements media {
 			"title,bitrate,rate,mode,size,time,track,played,song.enabled,update_time,".
 			"mbid,".
 			"addition_time FROM `song` WHERE `song`.`id` = '$id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = Dba::fetch_assoc($db_results);
 
@@ -167,7 +167,7 @@ class Song extends database_object implements media {
 		} 
 
 		$sql = "SELECT * FROM song_data WHERE `song_id`='$id'";
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = Dba::fetch_assoc($db_results); 
 
@@ -286,7 +286,7 @@ class Song extends database_object implements media {
 	public function has_flag() { 
 
 		$sql = "SELECT `id` FROM `flagged` WHERE `object_type`='song' AND `object_id`='$this->id' LIMIT 1";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		if (Dba::fetch_assoc($db_results)) { 
 			return true;
@@ -433,7 +433,7 @@ class Song extends database_object implements media {
 			"`size`='$size', `time`='$time', `track`='$track', " . 
 			"`mbid`='$mbid', " .
 			"`update_time`='$update_time' WHERE `id`='$song_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 		
 
 		$comment 	= Dba::escape($new_song->comment); 
@@ -442,7 +442,7 @@ class Song extends database_object implements media {
 		
 		$sql = "UPDATE `song_data` SET `lyrics`='$lyrics', `language`='$language', `comment`='$comment' " . 
 			"WHERE `song_id`='$song_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 	} // update_song
 
@@ -632,7 +632,7 @@ class Song extends database_object implements media {
 		$value = Dba::escape($value);
 
 		$sql = "UPDATE `song` SET `$field`='$value' WHERE `id`='$song_id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -651,7 +651,7 @@ class Song extends database_object implements media {
 		$value = Dba::escape($value); 
 
 		$sql = "UPDATE `song_data` SET `$field`='$value' WHERE `song_id`='$song_id'";
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return true; 
 
@@ -929,7 +929,7 @@ class Song extends database_object implements media {
 			"FROM `object_count` " . 
 			"WHERE `object_type`='song'$user_limit " . 
 			"ORDER BY `object_count`.`date` DESC ";
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = array();