diff options
| author | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-10 05:33:57 +0000 |
|---|---|---|
| committer | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-10 05:33:57 +0000 |
| commit | 7f3669335313adf9108119df4186a51a5f94e292 (patch) | |
| tree | f8b488a09df2198723de5661b050bc31e112b7ab /browse.php | |
| parent | c1ed41a16dcbf1a632ad2ac99b40174628bf072e (diff) | |
| download | ampache-7f3669335313adf9108119df4186a51a5f94e292.tar.gz ampache-7f3669335313adf9108119df4186a51a5f94e292.tar.bz2 ampache-7f3669335313adf9108119df4186a51a5f94e292.zip | |
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.
Diffstat (limited to 'browse.php')
| -rw-r--r-- | browse.php | 51 |
1 files changed, 27 insertions, 24 deletions
@@ -25,15 +25,17 @@ * Browse By Page * This page shows the browse menu, which allows you to browse by many different * fields including genre, artist, album, catalog, ??? - * this page also handles the actuall browse action + * This page also handles the actual browse action * */ /* Base Require */ require_once 'lib/init.php'; -// 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... +// 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... +$browse = new Browse(); switch ($_REQUEST['action']) { case 'tag': case 'file': @@ -43,9 +45,8 @@ switch ($_REQUEST['action']) { case 'live_stream': case 'video': case 'song': - Browse::set_type($_REQUEST['action']); - Browse::reset(); - Browse::set_simple_browse(true); + $browse->set_type($_REQUEST['action']); + $browse->set_simple_browse(true); break; } // end switch @@ -55,51 +56,53 @@ switch($_REQUEST['action']) { case 'file': break; case 'album': - Browse::set_sort('name','ASC'); - Browse::show_objects(); + $browse->set_sort('name','ASC'); + $browse->show_objects(); break; case 'tag': - Browse::set_sort('count','ASC'); + $browse->set_sort('count','ASC'); // This one's a doozy - Browse::set_simple_browse(0); - Browse::save_objects(Tag::get_tags(Config::get('offset_limit'),array())); - $keys = array_keys(Browse::get_saved()); + $browse->set_simple_browse(false); + $browse->save_objects(Tag::get_tags(Config::get('offset_limit'),array())); + $object_ids = $browse->get_saved(); + $keys = array_keys($object_ids); Tag::build_cache($keys); - $object_ids = Browse::get_saved(); show_box_top(_('Tag Cloud'),$class); require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php'; show_box_bottom(); require_once Config::get('prefix') . '/templates/browse_content.inc.php'; break; case 'artist': - Browse::set_sort('name','ASC'); - Browse::show_objects(); + $browse->set_sort('name','ASC'); + $browse->show_objects(); break; case 'song': - Browse::set_sort('title','ASC'); - Browse::show_objects(); + $browse->set_sort('title','ASC'); + $browse->show_objects(); break; case 'live_stream': - Browse::set_sort('name','ASC'); - Browse::show_objects(); + $browse->set_sort('name','ASC'); + $browse->show_objects(); break; case 'catalog': break; case 'playlist': - Browse::set_sort('type','ASC'); - Browse::set_filter('playlist_type','1'); - Browse::show_objects(); + $browse->set_sort('type','ASC'); + $browse->set_filter('playlist_type','1'); + $browse->show_objects(); break; case 'video': - Browse::set_sort('title','ASC'); - Browse::show_objects(); + $browse->set_sort('title','ASC'); + $browse->show_objects(); break; default: break; } // end Switch $action +$browse->store(); + /* Show the Footer */ show_footer(); ?> |