summaryrefslogtreecommitdiffstats
path: root/lib/class/browse.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-03 05:53:50 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-03 05:53:50 +0000
commit28f7ad7026a864479feb92007315a22096c9e6d2 (patch)
treeff5a1b7de9fbfa35f22e00fb1f615aeb7734486f /lib/class/browse.class.php
parent552c3cedd78263ce385d0ac47b02ccd22ea474b3 (diff)
downloadampache-28f7ad7026a864479feb92007315a22096c9e6d2.tar.gz
ampache-28f7ad7026a864479feb92007315a22096c9e6d2.tar.bz2
ampache-28f7ad7026a864479feb92007315a22096c9e6d2.zip
broke some stuff, fixed some stuff... commiting before I turn of this box
Diffstat (limited to 'lib/class/browse.class.php')
-rw-r--r--lib/class/browse.class.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index 020f486b..2fb346f5 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -117,6 +117,7 @@ class Browse {
switch($type) {
case 'user':
case 'playlist':
+ case 'playlist_song':
case 'song':
case 'catalog':
case 'album':
@@ -142,6 +143,7 @@ class Browse {
switch ($_SESSION['browse']['type']) {
+ case 'playlist_song':
case 'song':
$valid_array = array('title','year','track','time');
break;
@@ -280,6 +282,7 @@ class Browse {
case 'playlist':
$sql = "SELECT `playlist`.`id` FROM `playlist` ";
break;
+ case 'playlist_song':
case 'song':
default:
$sql = "SELECT `song`.`id` FROM `song` ";
@@ -534,7 +537,7 @@ class Browse {
if (count($object_ids) > self::$start) {
$object_ids = array_slice($object_ids,self::$start,$limit);
}
-
+print_r($object_ids);
// Format any matches we have so we can show them to the masses
$match = $_SESSION['browse']['filter']['alpha_match'] ? ' (' . $_SESSION['browse']['filter']['alpha_match'] . ')' : '';
@@ -568,7 +571,7 @@ class Browse {
show_box_bottom();
break;
case 'live_stream':
- show_box_top(_('Radion Stations') . $match, $class);
+ show_box_top(_('Radio Stations') . $match, $class);
require_once Config::get('prefix') . '/templates/show_live_streams.inc.php';
show_box_bottom();
break;
@@ -577,6 +580,13 @@ class Browse {
require_once Config::get('prefix') . '/templates/show_playlists.inc.php';
show_box_bottom();
break;
+ case 'playlist_song':
+ // We need a playlist for this one man this is a hack, should figure out a better way
+ $playlist = $GLOBALS['playlist'];
+ show_box_top(_('Playlist Songs') . $match,$class);
+ require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php';
+ show_box_bottom();
+ break;
case 'catalog':
show_box_top(_('Catalogs'), $class);
require_once Config::get('prefix') . '/templates/show_catalogs.inc.php';