- Added Live Stream (Internet Radio) support

- New Database Update corrects some issues and makes internet radio possible
- Fixed ratings
- Added new Transcode preference, doesn't do anything yet
- New "Radio Stations" browse type 

1 files changed, 11 insertions, 6 deletions

diff --git a/lib/class/rating.class.php b/lib/class/rating.class.php
index 349f01d0..1ddd842a 100644
--- a/lib/class/rating.class.php
+++ b/lib/class/rating.class.php
@@ -64,12 +64,12 @@ class Rating {
 
 		$user_id	= Dba::escape($user_id); 
 
-		$sql = "SELECT `rating` FROM `rating` WHERE `user`='$user_id' AND `object_id`='$this->id' AND `object_type`='$this->type'";
+		$sql = "SELECT `score` FROM `rating` WHERE `user`='$user_id' AND `object_id`='$this->id' AND `object_type`='$this->type'";
 		$db_results = Dba::query($sql);
 		
 		$results = Dba::fetch_assoc($db_results);
 		
-		return $results['rating'];
+		return $results['score'];
 
 	} // get_user
 
@@ -82,14 +82,14 @@ class Rating {
 	 */
 	public function get_average() { 
 
-		$sql = "SELECT `rating` FROM `rating` WHERE `object_id`='$this->id' AND `object_type`='$this->type'";
+		$sql = "SELECT `score` FROM `rating` WHERE `object_id`='$this->id' AND `object_type`='$this->type'";
 		$db_results = Dba::query($sql);
 
 		$i = 0;
 
 		while ($r = Dba::fetch_assoc($db_results)) { 
 			$i++;
-			$total += $r['rating'];
+			$total += $r['score'];
 		} // while we're pulling results
 
 		if ($total > 0) { 
@@ -123,11 +123,11 @@ class Rating {
 		$db_results = Dba::query($sql);
 
 		if ($existing = Dba::fetch_assoc($db_results)) { 
-			$sql = "UPDATE `rating` SET `rating`='$score' WHERE `id`='" . $existing['id'] . "'";
+			$sql = "UPDATE `rating` SET `score`='$score' WHERE `id`='" . $existing['id'] . "'";
 			$db_results = Dba::query($sql);
 		}
 		else { 
-			$sql = "INSERT INTO `rating` (`object_id`,`object_type`,`rating`,`user`) VALUES " . 
+			$sql = "INSERT INTO `rating` (`object_id`,`object_type`,`score`,`user`) VALUES " . 
 				" ('$this->id','$this->type','$score','" . $GLOBALS['user']->id . "')";
 			$db_results = Dba::query($sql);
 		} 
@@ -157,7 +157,12 @@ class Rating {
 	 */
 	public static function show_static ($object_id,$type) { 
 
+		// If there aren't ratings don't return anything
+		if (!Config::get('ratings')) { return false; } 
+
+		$rating = new Rating($object_id,$type); 
 
+		require Config::get('prefix') . '/templates/show_static_object_rating.inc.php'; 
 
 	} // show_static