added rightbar and fixed genre playback

2 files changed, 25 insertions, 14 deletions

diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php
index b2eac58a..2886e245 100644
--- a/lib/class/genre.class.php
+++ b/lib/class/genre.class.php
@@ -125,17 +125,15 @@ class Genre {
 	/**
 	 * get_songs
 	 * This gets all of the songs in this genre and returns an array of song objects
-	 * @package Genre
-	 * @catagory Class
 	 */
-	function get_songs() { 
+	public function get_songs() { 
 
-		$sql = "SELECT song.id FROM song WHERE genre='" . $this->id . "'";
-		$db_results = mysql_query($sql, dbh());
+		$sql = "SELECT `song`.`id` FROM `song` WHERE `genre`='" . $this->id . "'";
+		$db_results = Dba::query($sql);
 
 		$results = array();
 
-		while ($r = mysql_fetch_assoc($db_results)) { 
+		while ($r = Dba::fetch_assoc($db_results)) { 
 			$results[] = $r['id'];
 		}
 
@@ -147,19 +145,15 @@ class Genre {
 	 * get_random_songs
 	 * This is the same as get_songs except it returns a random assortment of songs from this
 	 * genre
-	 * @package Genre
-	 * @catagory Class
 	 */
-	function get_random_songs() { 
-
-		$limit = rand(1,$this->get_song_count());
+	public function get_random_songs() { 
 
-		$sql = "SELECT song.id FROM song WHERE genre='" . $this->id . "' ORDER BY RAND() LIMIT $limit";
-		$db_results = mysql_query($sql, dbh());
+		$sql = "SELECT `song`.`id` FROM `song` WHERE `genre`='" . $this->id . "' ORDER BY RAND()";
+		$db_results = Dba::query($sql);
 
 		$results = array();
 
-		while ($r = mysql_fetch_assoc($db_results)) { 
+		while ($r = Dba::fetch_assoc($db_results)) { 
 			$results[] = $r['id'];
 		}
 
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index be447091..1476307a 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -1411,4 +1411,21 @@ function get_users($sql) {
 
 } // get_users
 
+/**
+ * ajax_include
+ * This does an ob_start, getcontents, clean
+ * on the specified require, only works if you
+ * don't need to pass data in
+ */
+function ajax_include($include) { 
+
+	ob_start(); 
+	require_once Config::get('prefix') . '/templates/' . $include; 
+	$results = ob_get_contents(); 
+	ob_end_clean(); 
+
+	return $results; 
+
+} // ajax_include
+
 ?>