From 7f3669335313adf9108119df4186a51a5f94e292 Mon Sep 17 00:00:00 2001
From: Paul 'flowerysong' Arthur <flowerysong00@yahoo.com>
Date: Thu, 10 Jun 2010 05:33:57 +0000
Subject: Change Browse from static to instantiable.  Among other things, fixes
 FS#13; probably also breaks things.  Most things appear to still work, but I
 may have missed some cases.

---
 server/ajax.server.php | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'server/ajax.server.php')

diff --git a/server/ajax.server.php b/server/ajax.server.php
index d2fce49c..ecba7026 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -268,8 +268,8 @@ switch ($_REQUEST['action']) {
 				} // end foreach
 			break;
 			case 'browse_set':
-				Browse::set_type($_REQUEST['object_type']);
-				$objects = Browse::get_saved();
+				$browse = new Browse($_REQUEST['browse_id']);
+				$objects = $browse->get_saved();
 				foreach ($objects as $object_id) {
 					$GLOBALS['user']->playlist->add_object($object_id,'song');
 				}
@@ -341,25 +341,6 @@ switch ($_REQUEST['action']) {
 		$results[$key] = ob_get_contents();
 		ob_end_clean();
 	break;
-	// Used to change filter/settings on browse
-	case 'browse':
-		if ($_REQUEST['key'] && $_REQUEST['value']) {
-			// Set any new filters we've just added
-			Browse::set_filter($_REQUEST['key'],$_REQUEST['value']);
-		}
-		if ($_REQUEST['sort']) {
-			// Set the new sort value
-			Browse::set_sort($_REQUEST['sort']);
-		}
-
-		// Refresh the browse div with our new filter options
-		$object_ids = Browse::get_objects();
-
-		ob_start();
-		Browse::show_objects($object_ids, true);
-		$results['browse_content'] = ob_get_contents();
-		ob_end_clean();
-	break;
 	default:
 		$results['rfc3514'] = '0x1';
 	break;
-- 
cgit