whole bunch more Dba::query replacements

12 files changed, 89 insertions, 89 deletions

diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index fc2a5de0..f935e1c6 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -65,7 +65,7 @@ class Access {
 
 		/* Grab the basic information from the catalog and return it */
 		$sql = "SELECT * FROM `access_list` WHERE `id`='" . Dba::escape($this->id) . "'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = Dba::fetch_assoc($db_results);
 
@@ -125,7 +125,7 @@ class Access {
 		$sql = "UPDATE `access_list` " . 
 			"SET `start`='$start', `end`='$end', `level`='$level', `user`='$user', `key`='$key', " . 
 			"`name`='$name', `type`='$type',`enabled`='$enabled' WHERE `id`='" . Dba::escape($this->id) . "'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -174,7 +174,7 @@ class Access {
 
 		$sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . 
 			"VALUES ('$name','$level','$start','$end','$key','$user','$type','$enabled')";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -210,7 +210,7 @@ class Access {
 	public static function delete($access_id) { 
 
 		$sql = "DELETE FROM `access_list` WHERE `id`='" . Dba::escape($access_id) . "'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 	} // delete
 	
@@ -471,12 +471,12 @@ class Access {
 				$key = Dba::escape($key); 
 				$time = time(); 
 				$sql = "SELECT * FROM `session_api` WHERE `id`='$key' AND `expire` > '$time'"; 
-				$db_results = Dba::query($sql); 
+				$db_results = Dba::read($sql); 
 		
 				if (Dba::num_rows($db_results)) { 
 					$time = $time + 3600; 
 					$sql = "UPDATE `session_api` WHERE `id`='$key' SET `expire`='$time'"; 
-					$db_results = Dba::query($sql); 
+					$db_results = Dba::write($sql); 
 					return true; 
 				} 
 
diff --git a/lib/class/democratic.class.php b/lib/class/democratic.class.php
index 4e4a9011..3eede6de 100644
--- a/lib/class/democratic.class.php
+++ b/lib/class/democratic.class.php
@@ -98,7 +98,7 @@ class Democratic extends tmpPlaylist {
 		$demo_id = Dba::escape($this->id); 
 
 		$sql = "SELECT * FROM `tmp_playlist` WHERE `session`='$demo_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$row = Dba::fetch_assoc($db_results); 
 
@@ -171,7 +171,7 @@ class Democratic extends tmpPlaylist {
 		// This is kind of hackish, should really think about tweaking the db
 		// and doing this right. 
 		$sql = "SELECT `id` FROM `democratic` ORDER BY `name`"; 
-		$db_results = Dba::query($sql);  
+		$db_results = Dba::read($sql);  
 
 		$results = array(); 
 
@@ -196,7 +196,7 @@ class Democratic extends tmpPlaylist {
 			$level = Dba::escape($GLOBALS['user']->access); 
 			$sql = "SELECT `id` FROM `democratic` WHERE `level` <= '$level' " . 
 				" ORDER BY `level` DESC,`primary` DESC"; 
-			$db_results = Dba::query($sql); 
+			$db_results = Dba::read($sql); 
 			$row = Dba::fetch_assoc($db_results); 
 			$democratic_id = $row['id'];
 		} 
@@ -232,7 +232,7 @@ class Democratic extends tmpPlaylist {
                 $sql = "SELECT `user_vote`.`object_id` AS `vote_id`,`user_vote`.`user`,`tmp_playlist_data`.`id`,`tmp_playlist_data`.`object_type`, `user_vote`.`date`, `tmp_playlist_data`.`object_id` " .
                         "FROM `tmp_playlist_data` $vote_join " .
                         "WHERE `tmp_playlist_data`.`tmp_playlist`='" . Dba::escape($this->tmp_playlist) . "' $order";
-                $db_results = Dba::query($sql);
+                $db_results = Dba::read($sql);
 
                 /* Define the array */
                 $items = array();
@@ -324,7 +324,7 @@ class Democratic extends tmpPlaylist {
                         }
                         else {
                                 $sql = "SELECT `id` as `object_id` FROM `song` WHERE `enabled`='1' ORDER BY RAND() LIMIT 1";
-                                $db_results = Dba::query($sql);
+                                $db_results = Dba::read($sql);
                                 $results = Dba::fetch_assoc($db_results);
                         }
                 }
@@ -345,7 +345,7 @@ class Democratic extends tmpPlaylist {
 
 		$sql = "SELECT `tmp_playlist_data`.`id` FROM `tmp_playlist_data` WHERE `object_type`='$object_type' AND " . 
 			"`tmp_playlist`='$tmp_id' AND `object_id`='$object_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$row = Dba::fetch_assoc($db_results); 
 
@@ -406,7 +406,7 @@ class Democratic extends tmpPlaylist {
                         "WHERE user_vote.user='$user_id' AND tmp_playlist_data.object_type='$type' " .
                         "AND tmp_playlist_data.object_id='$object_id' " .
                         "AND tmp_playlist_data.tmp_playlist='$tmp_id'";
-                $db_results = Dba::query($sql);
+                $db_results = Dba::read($sql);
 
                 /* If we find  row, they've voted!! */
                 if (Dba::num_rows($db_results)) {
@@ -446,7 +446,7 @@ class Democratic extends tmpPlaylist {
                 $time = time();
                 $sql = "INSERT INTO user_vote (`user`,`object_id`,`date`) " .
                         "VALUES ('" . Dba::escape($GLOBALS['user']->id) . "','" . $results['id'] . "','$time')";
-                $db_results = Dba::query($sql);
+                $db_results = Dba::write($sql);
 
                 return true;
 
@@ -464,7 +464,7 @@ class Democratic extends tmpPlaylist {
                 $user_id        = Dba::escape($GLOBALS['user']->id);
 
 		$sql = "DELETE FROM `user_vote` WHERE `object_id`='$object_id' AND `user`='$user_id'";
-                $db_results = Dba::query($sql);
+                $db_results = Dba::write($sql);
 
                 /* Clean up anything that has no votes */
                 self::prune_tracks();
@@ -482,10 +482,10 @@ class Democratic extends tmpPlaylist {
 		$row_id		= Dba::escape($row_id); 
 
 		$sql = "DELETE FROM `user_vote` WHERE `object_id`='$row_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		$sql = "DELETE FROM `tmp_playlist_data` WHERE `id`='$row_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return true; 
 
@@ -500,10 +500,10 @@ class Democratic extends tmpPlaylist {
 		$democratic_id = Dba::escape($democratic_id); 
 
 		$sql = "DELETE FROM `democratic` WHERE `id`='$democratic_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		$sql = "DELETE FROM `tmp_playlist` WHERE `session`='$democratic_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 		
 		self::prune_tracks(); 
 
@@ -545,7 +545,7 @@ class Democratic extends tmpPlaylist {
 
 		$sql = "INSERT INTO `democratic` (`name`,`base_playlist`,`cooldown`,`level`,`user`,`primary`) " . 
 			"VALUES ('$name','$base','$cool','$level','$user','$default')"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		if ($db_results) { 
 			$insert_id = Dba::insert_id(); 
diff --git a/lib/class/flag.class.php b/lib/class/flag.class.php
index 501f6415..a9ba3207 100644
--- a/lib/class/flag.class.php
+++ b/lib/class/flag.class.php
@@ -67,7 +67,7 @@ class Flag extends database_object {
 		$idlist = '(' . implode(',',$ids) . ')'; 
 
 		$sql = "SELECT * FROM `flagged` 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('flagged',$row['id'],$row); 
@@ -140,7 +140,7 @@ class Flag extends database_object {
 		$results = array();
 
 		$sql = "SELECT id FROM flagged ORDER BY date " . $limit;
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		while ($r = Dba::fetch_assoc($db_results)) { 
 			$results[] = $r['id'];
@@ -158,7 +158,7 @@ class Flag extends database_object {
 	public static function get_disabled() { 
 
 		$sql = "SELECT `id` FROM `song` WHERE `enabled`='0'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = array(); 
 		
@@ -180,7 +180,7 @@ class Flag extends database_object {
 		if ($count) { $limit_clause = "LIMIT " . intval($count); } 
 		
 		$sql = "SELECT `id` FROM `flagged` $limit_clause";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		/* Default it to an array */
 		$results = array();
@@ -201,7 +201,7 @@ class Flag extends database_object {
 	public static function get_approved() { 
 
 		$sql = "SELECT `id` FROM `flagged` WHERE `approved`='1'";
-		$db_results = Dba::query($sql);  
+		$db_results = Dba::read($sql);  
 
 
 		/* Default the results array */
@@ -236,7 +236,7 @@ class Flag extends database_object {
 
 		$sql = "INSERT INTO `flagged` (`object_id`,`object_type`,`flag`,`comment`,`date`,`approved`,`user`) VALUES " . 
 			" ('$id','$type','$flag','$comment','$time','$approved','$user')";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -256,7 +256,7 @@ class Flag extends database_object {
 
 		// Delete the row
 		$sql = "DELETE FROM `flagged` WHERE `id`='$this->id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		// Reset the Last-Updated date so that it'll get re-scaned 	
 		$song->update_utime($song->id,1); 
@@ -273,7 +273,7 @@ class Flag extends database_object {
 	 public function approve() { 
 
 		$sql = "UPDATE `flagged` SET `approved`='1' WHERE `id`='$this->id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		$this->approved = 1; 
 
diff --git a/lib/class/plugin.class.php b/lib/class/plugin.class.php
index ac053612..4a3a133f 100644
--- a/lib/class/plugin.class.php
+++ b/lib/class/plugin.class.php
@@ -198,7 +198,7 @@ class Plugin {
 		$name = Dba::escape('Plugin_' . $plugin_name); 
 
 		$sql = "SELECT * FROM `update_info` WHERE `key`='$name'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = Dba::fetch_assoc($db_results); 
 		
@@ -213,7 +213,7 @@ class Plugin {
 	function get_ampache_db_version() { 
 
 		$sql = "SELECT * FROM `update_info` WHERE `key`='db_version'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = Dba::fetch_assoc($db_results); 
 
@@ -231,7 +231,7 @@ class Plugin {
 		$version	= Dba::escape($version);
 
 		$sql = "INSERT INTO `update_info` SET `key`='$name', `value`='$version'";
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		return true; 
 
@@ -246,7 +246,7 @@ class Plugin {
 		$name	= Dba::escape('Plugin_' . $this->_plugin->name);
 	
 		$sql = "DELETE FROM `update_info` WHERE `key`='$name'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		return true; 
 
diff --git a/lib/class/radio.class.php b/lib/class/radio.class.php
index 33154583..e06d4a44 100644
--- a/lib/class/radio.class.php
+++ b/lib/class/radio.class.php
@@ -111,7 +111,7 @@ class Radio extends database_object implements media {
 
 		$sql = "UPDATE `live_stream` SET `name`='$name',`site_url`='$site_url',`url`='$url'" . 
 			",`frequency`='$frequency',`call_sign`='$call_sign' WHERE `id`='$id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return $db_results; 
 
@@ -158,7 +158,7 @@ class Radio extends database_object implements media {
 		// If we've made it this far everything must be ok... I hope
 		$sql = "INSERT INTO `live_stream` (`name`,`site_url`,`url`,`catalog`,`frequency`,`call_sign`) " . 
 			"VALUES ('$name','$site_url','$url','$catalog','$frequency','$call_sign')"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return $db_results;  
 
@@ -173,7 +173,7 @@ class Radio extends database_object implements media {
 		$id = Dba::escape($this->id); 
 
 		$sql = "DELETE FROM `live_stream` WHERE `id`='$id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return true; 
 
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)) { 
diff --git a/lib/class/shoutbox.class.php b/lib/class/shoutbox.class.php
index d8db9a36..d0c591d3 100644
--- a/lib/class/shoutbox.class.php
+++ b/lib/class/shoutbox.class.php
@@ -46,7 +46,7 @@ class shoutBox {
 		$sticky_id = Dba::escape($shout_id); 
 
 		$sql = "SELECT * FROM `user_shout` WHERE `id`='$shout_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$data = Dba::fetch_assoc($db_results); 
 
@@ -76,7 +76,7 @@ class shoutBox {
 		// Only get as many as we need
 		$limit = intval($limit) - count($shouts); 
 		$sql = "SELECT * FROM `user_shout` WHERE `sticky`='0' ORDER BY `date` DESC LIMIT $limit";  
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		while ($row = Dba::fetch_assoc($db_results)) { 
 			$shouts[] = $row['id']; 
@@ -93,7 +93,7 @@ class shoutBox {
 	public static function get_sticky() { 
 
 		$sql = "SELECT * FROM `user_shout` WHERE `sticky`='1' ORDER BY `date` DESC"; 
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = array(); 
 
@@ -165,7 +165,7 @@ class shoutBox {
 
 		$sql = "INSERT INTO `user_shout` (`user`,`date`,`text`,`sticky`,`object_id`,`object_type`) " . 
 			"VALUES ('$user','$date','$text','$sticky','$object_id','$object_type')"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		$insert_id = Dba::insert_id(); 
 
@@ -184,7 +184,7 @@ class shoutBox {
 		$sticky 	= make_bool($data['sticky']); 
 
 		$sql = "UPDATE `user_shout` SET `text`='$text', `sticky`='$sticky' WHERE `id`='$id'";
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return true; 
 
@@ -215,7 +215,7 @@ class shoutBox {
                 // Delete the shoutbox post
 		
                 $sql = "DELETE FROM `user_shout` WHERE `id`='$shout_id'";
-                $db_results = Dba::query($sql);
+                $db_results = Dba::write($sql);
 		
 	} // delete
 
diff --git a/lib/class/stats.class.php b/lib/class/stats.class.php
index 2e3d1a07..b9abdf94 100644
--- a/lib/class/stats.class.php
+++ b/lib/class/stats.class.php
@@ -59,7 +59,7 @@ class Stats {
 
 		$sql = "INSERT INTO `object_count` (`object_type`,`object_id`,`date`,`user`) " . 
 			" VALUES ('$type','$oid','$date','$user')";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		if (!$db_results) { 
 			debug_event('statistics','Unabled to insert statistics:' . $sql,'3');
@@ -81,7 +81,7 @@ class Stats {
 		$user_id = Dba::escape($user_id);
 
 		$sql = "SELECT * FROM `object_count` WHERE `user`='$user_id' AND `object_type`='song' ORDER BY `date` DESC LIMIT 1"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = Dba::fetch_assoc($db_results); 
 
@@ -104,7 +104,7 @@ class Stats {
 
 		$sql = "SELECT * FROM `object_count` WHERE `user`='$user_id' AND `object_type`='song' AND `date`>='$time' " . 
 			"ORDER BY `date` DESC"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = array(); 
 
@@ -140,7 +140,7 @@ class Stats {
 		$sql = "SELECT object_id,COUNT(id) AS `count` FROM object_count" . 
 			" WHERE object_type='$type' AND date >= '$date'" .
 			" GROUP BY object_id ORDER BY `count` DESC LIMIT $count";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = array();
 
@@ -176,7 +176,7 @@ class Stats {
 		$sql = "SELECT object_id,COUNT(id) AS `count` FROM object_count" . 
 			" WHERE object_type='$type' AND date >= '$date' AND user = '$user'" . 
 			" GROUP BY object_id ORDER BY `count` DESC LIMIT $count";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		
 		$results = array();
 
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index 79fb5e83..e238bdd0 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -141,7 +141,7 @@ class Stream {
 
 		$sql = "INSERT INTO `session_stream` (`id`,`expire`,`user`) " . 
 			"VALUES('$sid','$expire','$uid')"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		if (!$db_results) { return false; } 
 
@@ -161,7 +161,7 @@ class Stream {
 		$time	= time(); 
 
 		$sql = "SELECT * FROM `session_stream` WHERE `id`='$sid' AND `expire` > '$time'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		if ($row = Dba::fetch_assoc($db_results)) { 
 			return true; 
@@ -182,7 +182,7 @@ class Stream {
 
 		$time = time(); 
 		$sql = "DELETE FROM `session_stream` WHERE `expire` < '$time'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 		
 		foreach ($append_array as $append_agent) { 
 			if (strstr(strtoupper($agent),$append_agent)) { 
@@ -194,7 +194,7 @@ class Stream {
 		// We need all of this to run this query
 		if ($ip AND $agent AND $uid AND $sid) { 
 			$sql = "DELETE FROM `session_stream` WHERE `ip`='$ip' AND `agent`='$agent' AND `user`='$uid' AND `id` != '$sid'"; 
-			$db_results = Dba::query($sql); 
+			$db_results = Dba::write($sql); 
 		} 
 
 	} // gc_session 
@@ -214,7 +214,7 @@ class Stream {
 
 		$sql = "UPDATE `session_stream` SET `expire`='$expire', `agent`='$agent', `ip`='$ip' " . 
 			"WHERE `id`='$sid'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		self::gc_session($ip,$agent,$uid,$sid); 
 
@@ -612,7 +612,7 @@ class Stream {
 	                $sql = "SELECT COUNT(*) FROM now_playing, user_preference, preference " .
 	                        "WHERE preference.name = 'play_type' AND user_preference.preference = preference.id " .
 	                        "AND now_playing.user = user_preference.user AND user_preference.value='downsample'";
-	                $db_results = Dba::query($sql);
+	                $db_results = Dba::read($sql);
 	                $results = Dba::fetch_row($db_results);
 
 	                // Current number of active streams (current is already in now playing, worst case make it 1)
@@ -722,7 +722,7 @@ class Stream {
 	        $sql = "DELETE FROM `now_playing` USING `now_playing` " .
 	                "LEFT JOIN `session_stream` ON `session_stream`.`id`=`now_playing`.`id` " .
 	                "WHERE `session_stream`.`id` IS NULL OR `now_playing`.`expire` < '" . time() . "'";
-	        $db_results = Dba::query($sql);
+	        $db_results = Dba::write($sql);
 
 	} // gc_now_playing
 
@@ -753,7 +753,7 @@ class Stream {
 	public static function clear_now_playing() {
 
 	        $sql = "TRUNCATE `now_playing`";
-	        $db_results = Dba::query($sql);
+	        $db_results = Dba::write($sql);
 
 	        return true;
 
diff --git a/lib/class/tag.class.php b/lib/class/tag.class.php
index 89fbe573..252158f8 100644
--- a/lib/class/tag.class.php
+++ b/lib/class/tag.class.php
@@ -157,7 +157,7 @@ class Tag extends database_object {
 
                 $sql = "SELECT `tag_map`.`id`,`tag_map`.`tag_id`,`tag_map`.`object_id`,`tag_map`.`user` FROM `tag_map` " .
                         "WHERE `tag_map`.`object_type`='$type' AND `tag_map`.`object_id` IN $idlist ";
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$tags = array(); 
 
@@ -331,7 +331,7 @@ class Tag extends database_object {
 		$sql = "SELECT `tag_map`.`tag_id`,`tag_map`.`user` FROM `tag_map` " . 
 			"WHERE `tag_map`.`object_type`='$type' AND `tag_map`.`object_id`='$object_id' " . 
 			"LIMIT $limit"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = array(); 
 
@@ -503,7 +503,7 @@ class Tag extends database_object {
 			$sql .= 'username in ('.$req.')';
 		}
 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$uids=array();
 		$usernames = array();
diff --git a/lib/class/tmpplaylist.class.php b/lib/class/tmpplaylist.class.php
index 99c30cda..2f89b05c 100644
--- a/lib/class/tmpplaylist.class.php
+++ b/lib/class/tmpplaylist.class.php
@@ -65,7 +65,7 @@ class tmpPlaylist extends database_object {
 	private function _get_info() { 
 
 		$sql = "SELECT * FROM `tmp_playlist` WHERE `id`='" . Dba::escape($this->id) . "'";	
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = Dba::fetch_assoc($db_results);
 
@@ -83,7 +83,7 @@ class tmpPlaylist extends database_object {
 		$session_id = Dba::escape($session_id); 
 
 		$sql = "SELECT `id` FROM `tmp_playlist` WHERE `session`='$session_id'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = Dba::fetch_row($db_results); 
 		
@@ -111,7 +111,7 @@ class tmpPlaylist extends database_object {
 
 		$sql = "SELECT `tmp_playlist`.`id` FROM `tmp_playlist` LEFT JOIN `session` ON `session`.`id`=`tmp_playlist`.`session` " . 
 			" WHERE `session`.`username`='$username' ORDER BY `session`.`expire` DESC"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$data = Dba::fetch_assoc($db_results); 
 		
@@ -133,7 +133,7 @@ class tmpPlaylist extends database_object {
 		$sql = "SELECT tmp_playlist_data.object_type, tmp_playlist_data.id, tmp_playlist_data.object_id " . 
 			"FROM tmp_playlist_data " . 
 			"WHERE tmp_playlist_data.tmp_playlist='" . Dba::escape($this->id) . "' $order";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		
 		/* Define the array */
 		$items = array();
@@ -160,7 +160,7 @@ class tmpPlaylist extends database_object {
 
 		$sql = "SELECT tmp_playlist_data.object_id FROM tmp_playlist_data " . 
 			"WHERE tmp_playlist_data.tmp_playlist = '$tmp_id' $order LIMIT 1";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$results = Dba::fetch_assoc($db_results);
 
@@ -175,7 +175,7 @@ class tmpPlaylist extends database_object {
 	public function count_items() { 
 
 		$sql = "SELECT COUNT(`id`) FROM `tmp_playlist_data` WHERE `tmp_playlist_data`.`tmp_playlist`='" . $this->id . "'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::read($sql); 
 
 		$results = Dba::fetch_row($db_results); 
 
@@ -190,7 +190,7 @@ class tmpPlaylist extends database_object {
 	public function clear() { 
 
 		$sql = "DELETE FROM `tmp_playlist_data` WHERE `tmp_playlist_data`.`tmp_playlist`='" . $this->id . "'"; 
-		$db_results = Dba::query($sql); 
+		$db_results = Dba::write($sql); 
 
 		return true; 
 
@@ -209,7 +209,7 @@ class tmpPlaylist extends database_object {
 
 		$sql = "INSERT INTO `tmp_playlist` (`session`,`type`,`object_type`) " . 
 			" VALUES ('$sessid','$type','$object_type')";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		$id = Dba::insert_id();
 
@@ -236,7 +236,7 @@ class tmpPlaylist extends database_object {
 		$tmp_id		= Dba::escape($this->id);
 
 		$sql = "UPDATE `tmp_playlist` SET tmp_playlist.base_playlist='$playlist_id' WHERE `id`='$tmp_id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -253,7 +253,7 @@ class tmpPlaylist extends database_object {
 		$id	= Dba::escape($id);
 
 		$sql = "DELETE FROM `tmp_playlist` WHERE `session`='$sessid' AND `id` != '$id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		/* Remove assoicated tracks */
 		self::prune_tracks();
@@ -272,7 +272,7 @@ class tmpPlaylist extends database_object {
 		$sql = "DELETE FROM `tmp_playlist` USING `tmp_playlist` " . 
 			"LEFT JOIN session ON session.id=tmp_playlist.session " . 
 			"WHERE session.id IS NULL AND tmp_playlist.type != 'vote'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -288,7 +288,7 @@ class tmpPlaylist extends database_object {
 		$sql = "DELETE FROM tmp_playlist_data USING tmp_playlist_data " . 
 			"LEFT JOIN tmp_playlist ON tmp_playlist_data.tmp_playlist=tmp_playlist.id " . 
 			"WHERE tmp_playlist.id IS NULL";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 	} // prune_tracks
 
@@ -305,7 +305,7 @@ class tmpPlaylist extends database_object {
 
 		$sql = "INSERT INTO `tmp_playlist_data` (`object_id`,`tmp_playlist`,`object_type`) " . 
 			" VALUES ('$object_id','$playlist_id','$object_type')";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
@@ -336,7 +336,7 @@ class tmpPlaylist extends database_object {
 		/* delete the track its self */
 		$sql = "DELETE FROM `tmp_playlist_data` " . 
 			" WHERE `id`='$id'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::write($sql);
 
 		return true;
 
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index 0b63e354..198172af 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -61,7 +61,7 @@ class Update {
 	private function _get_info() {
 
 		$sql = "SELECT * FROM `update_info` WHERE `key`='$this->key'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		return Dba::fetch_assoc($db_results);		
 
@@ -77,7 +77,7 @@ class Update {
 
 		/* Make sure that update_info exits */
 		$sql = "SHOW TABLES LIKE 'update_info'";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 		if (!is_resource(Dba::dbh())) { header("Location: test.php"); } 
 
 		// If no table
@@ -90,7 +90,7 @@ class Update {
 		else {
 			// If we've found the update_info table, let's get the version from it
 			$sql = "SELECT * FROM `update_info` WHERE `key`='db_version'";
-			$db_results = Dba::query($sql);
+			$db_results = Dba::read($sql);
 			$results = Dba::fetch_assoc($db_results);
 			$version = $results['value'];
 		} 
@@ -150,7 +150,7 @@ class Update {
 
 		/* Pull all version info */
 		$sql = "SELECT * FROM `update_info`";
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		while ($results = Dba::fetch_assoc($db_results)) { 
 
@@ -439,7 +439,7 @@ class Update {
 	private static function set_version($key,$value) {
 
 		$sql = "UPDATE update_info SET value='$value' WHERE `key`='$key'";
-		$db_results = Dba::query($sql);		
+		$db_results = Dba::write($sql);		
 
 	} //set_version
 
@@ -454,7 +454,7 @@ class Update {
 
 		// Build the User -> ID map using the username as the key
 		$sql = "SELECT `id`,`username` FROM `user`"; 
-		$db_results = Dba::query($sql);
+		$db_results = Dba::read($sql);
 
 		$user_array = array();