diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-04-21 00:28:18 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-04-21 00:28:18 +0000 |
| commit | 41db2472342bd0cdcd572f9f37bca698db6f6d2f (patch) | |
| tree | 742102e58f80f1e8b715efb9ac34a4d8e8a589cf /server | |
| parent | d642b02e2d03c920ce8fa77cff33f24e1f407021 (diff) | |
| download | ampache-41db2472342bd0cdcd572f9f37bca698db6f6d2f.tar.gz ampache-41db2472342bd0cdcd572f9f37bca698db6f6d2f.tar.bz2 ampache-41db2472342bd0cdcd572f9f37bca698db6f6d2f.zip | |
fixed shoutbox typo so albums add correctly, can now edit playlist tracks and change their track in the playlist, added batch download link to single playlist view
Diffstat (limited to 'server')
| -rw-r--r-- | server/browse.ajax.php | 2 | ||||
| -rw-r--r-- | server/playlist.ajax.php | 39 |
2 files changed, 35 insertions, 6 deletions
diff --git a/server/browse.ajax.php b/server/browse.ajax.php index a3673173..02d6126c 100644 --- a/server/browse.ajax.php +++ b/server/browse.ajax.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or diff --git a/server/playlist.ajax.php b/server/playlist.ajax.php index bfd32967..12cd7a70 100644 --- a/server/playlist.ajax.php +++ b/server/playlist.ajax.php @@ -30,7 +30,7 @@ switch ($_REQUEST['action']) { $playlist = new Playlist($_REQUEST['playlist_id']); $playlist->format(); if ($playlist->has_access()) { - $playlist->delete_track($_REQUEST['track']); + $playlist->delete_track($_REQUEST['track_id']); } $object_ids = $playlist->get_items(); @@ -39,9 +39,39 @@ switch ($_REQUEST['action']) { Browse::add_supplemental_object('playlist',$playlist->id); Browse::save_objects($object_ids); Browse::show_objects($object_ids); - $results['browse_content'] = ob_get_contents(); - ob_end_clean(); + $results['browse_content'] = ob_get_clean(); break; + case 'edit_track': + $playlist = new Playlist($_REQUEST['playlist_id']); + if (!$playlist->has_access()) { + $results['rfc3514'] = '0x1'; + break; + } + + // They've got access, show the edit page + $track = $playlist->get_track($_REQUEST['track_id']); + $song = new Song($track['object_id']); + $song->format(); + require_once Config::get('prefix') . '/templates/show_edit_playlist_song_row.inc.php'; + $results['track_' . $track['id']] = ob_get_clean(); + break; + case 'save_track': + $playlist = new Playlist($_REQUEST['playlist_id']); + if (!$playlist->has_access()) { + $results['rfc3514'] = '0x1'; + break; + } + $playlist->format(); + + // They've got access, save this guy and re-display row + $playlist->update_track_number($_GET['track_id'],$_POST['track']); + $track = $playlist->get_track($_GET['track_id']); + $song = new Song($track['object_id']); + $song->format(); + $playlist_track = $track['track']; + require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php'; + $results['track_' . $track['id']] = ob_get_clean(); + break; case 'create': // Pull the current active playlist items $objects = $GLOBALS['user']->playlist->get_items(); @@ -66,8 +96,7 @@ switch ($_REQUEST['action']) { $playlist->format(); ob_start(); require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; - $results['content'] = ob_get_contents(); - ob_end_clean(); + $results['content'] = ob_get_clean(); break; case 'append': // Pull the current active playlist items |