diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-11-24 21:16:13 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-11-24 21:16:13 +0000 |
| commit | 27ba8110cab5b09220a110f0e2f3af026582c9fc (patch) | |
| tree | d54b665062b1dab40deff47ca519eca1ee251db0 /democratic.php | |
| parent | 3508380e994d80c6df1a287606a969c218d81694 (diff) | |
| download | ampache-27ba8110cab5b09220a110f0e2f3af026582c9fc.tar.gz ampache-27ba8110cab5b09220a110f0e2f3af026582c9fc.tar.bz2 ampache-27ba8110cab5b09220a110f0e2f3af026582c9fc.zip | |
democratic play working, if still slightly sketchy
Diffstat (limited to 'democratic.php')
| -rw-r--r-- | democratic.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/democratic.php b/democratic.php index 67953f03..bf208e5b 100644 --- a/democratic.php +++ b/democratic.php @@ -87,13 +87,9 @@ switch ($_REQUEST['action']) { access_denied(); break; } - - $stream_type = scrub_in($_REQUEST['play_type']); - $tmp_playlist = new tmpPlaylist($_REQUEST['tmp_playlist_id']); - $stream = new Stream($stream_type,array()); - $stream->manual_url_add(unhtmlentities($tmp_playlist->get_vote_url())); - $stream->start(); - if ($stream_type != 'localplay') { exit; } + // Tmp just to make this work + header("Location: " . Config::get('web_path') . "/stream.php?action=democratic"); + exit; break; case 'manage_playlists': if (!$GLOBALS['user']->has_access('75')) { @@ -116,8 +112,8 @@ switch ($_REQUEST['action']) { $tmp_playlist->update_playlist($_REQUEST['playlist_id']); case 'show_playlist': default: - $tmp_playlist = Democratic::get_current_playlist(); - $objects = $tmp_playlist->get_items(); + $democratic = Democratic::get_current_playlist(); + $objects = $democratic->get_items(); require_once Config::get('prefix') . '/templates/show_democratic.inc.php'; break; } // end switch on action |