From 427c5ac163cd7a79c83102aaa3fcb6572ab59cfb Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Mon, 14 Jan 2008 05:03:03 +0000
Subject: fixed the filter display and added a playlist_type filter for admins

---
 browse.php | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'browse.php')

diff --git a/browse.php b/browse.php
index 4937081e..e11946ac 100644
--- a/browse.php
+++ b/browse.php
@@ -34,47 +34,49 @@
 /* Base Require */
 require_once 'lib/init.php';
 
-/* Display the headers and menus */
+// This page is a little wonky we don't want the sidebar until we know what type we're dealing with
+// so we've got a little switch here that creates the type.. this feels hackish...
+
+switch ($_REQUEST['action']) { 
+	case 'file': 
+	case 'album': 
+	case 'artist': 
+	case 'genre': 
+	case 'playlist': 
+	case 'live_stream': 
+	case 'song': 
+		Browse::reset_filters(); 
+		Browse::set_type($_REQUEST['action']); 
+		Browse::set_simple_browse(1); 
+	break; 
+} // end switch 
+
 show_header(); 
 
 switch($_REQUEST['action']) {
 	case 'file':
+	break; 
 	case 'album':
-		Browse::reset_filters(); 
-		Browse::set_type('album'); 
-		Browse::set_simple_browse(1); 
 		Browse::set_sort('name','ASC');
 		$album_ids = Browse::get_objects(); 
 		Browse::show_objects($album_ids); 
 	break;
 	case 'artist':
-		Browse::reset_filters(); 
-		Browse::set_type('artist'); 
-		Browse::set_simple_browse(1); 
 		Browse::set_sort('name','ASC');
 		$artist_ids = Browse::get_objects(); 
 		Browse::show_objects($artist_ids); 
 	break;
 	case 'genre':
-		Browse::reset_filters(); 
-		Browse::set_type('genre'); 
-		Browse::set_simple_browse(1); 
 		Browse::set_sort('name','ASC');
 		$genre_ids = Browse::get_objects(); 
 		Browse::show_objects($genre_ids); 
 	break;
 	case 'song':
-		Browse::reset_filters(); 
-		Browse::set_type('song'); 
-		Browse::set_simple_browse(1); 
 		Browse::set_sort('title','ASC');
 		$song_ids = Browse::get_objects(); 
 		Browse::show_objects($song_ids); 
 	break;
 	case 'live_stream':
-		Browse::reset_filters(); 
-		Browse::set_type('live_stream'); 
-		Browse::set_simple_browse(1); 
 		Browse::set_sort('name','ASC');
 		$live_stream_ids = Browse::get_objects(); 
 		Browse::show_objects($live_stream_ids); 
@@ -83,9 +85,6 @@ switch($_REQUEST['action']) {
 	
 	break;
 	case 'playlist': 
-		Browse::reset_filters(); 
-		Browse::set_type('playlist'); 
-		Browse::set_simple_browse(1); 
 		Browse::set_sort('type','ASC');
 		Browse::set_filter('playlist_type','1');
 		$playlist_ids = Browse::get_objects(); 
@@ -93,8 +92,6 @@ switch($_REQUEST['action']) {
 	break;
 	default: 
 
-
-
 	break; 
 } // end Switch $action
 
-- 
cgit