diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-11-26 22:21:39 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-11-26 22:21:39 +0000 |
| commit | b8fe75626cdd4fe526f31de959f3ab5888c1671a (patch) | |
| tree | afe8146e692747abf22a2013daa4897cd5d306de | |
| parent | c00113be9819dcdea198a3ce5411ff0139067411 (diff) | |
| download | ampache-b8fe75626cdd4fe526f31de959f3ab5888c1671a.tar.gz ampache-b8fe75626cdd4fe526f31de959f3ab5888c1671a.tar.bz2 ampache-b8fe75626cdd4fe526f31de959f3ab5888c1671a.zip | |
patch from rosensama
| -rw-r--r-- | amp-mpd.php | 40 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 2 |
2 files changed, 29 insertions, 13 deletions
diff --git a/amp-mpd.php b/amp-mpd.php index fa83ef6b..f1a27656 100644 --- a/amp-mpd.php +++ b/amp-mpd.php @@ -163,12 +163,7 @@ if (is_object($myMpd)) { } else { $mpd_dir = conf('mpd_dir') . '/'; $pl_ids = scrub_in( $_REQUEST['song'] ); - foreach( $pl as $id => $entry ) { - // remember in_array( needle, haystack ) - if( in_array( $id, $pl_ids ) ) { - $song_files[] = $mpd_dir . $entry['file']; - } - } + // basically copied from playlist.php Add to case $pl_id = scrub_in( $_REQUEST['playlist_id'] ); $playlist = new Playlist($pl_id); @@ -177,13 +172,32 @@ if (is_object($myMpd)) { $playlist->create_playlist($playlist_name, $user->username, 'private'); $pl_id = $playlist->id; } - foreach( $song_files as $song_file ) { - $song_file = sql_escape( $song_file ); - $sql = "SELECT id FROM song WHERE `file` = '$song_file'"; - $db_results = mysql_query( $sql, dbh() ); - $results = mysql_fetch_object( $db_results ); - $song_ids[] = $results->id; - } + + // need to detect file or URL method to get id's differently + if( conf('mpd_method') == 'file' ) { + foreach( $pl as $id => $entry ) { + // remember in_array( needle, haystack ) + if( in_array( $id, $pl_ids ) ) { + $song_files[] = $mpd_dir . $entry['file']; + } + } + foreach( $song_files as $song_file ) { + $song_file = sql_escape( $song_file ); + $sql = "SELECT id FROM song WHERE `file` = '$song_file'"; + $db_results = mysql_query( $sql, dbh() ); + $results = mysql_fetch_object( $db_results ); + $song_ids[] = $results->id; + } + } else { + // left edge @ song= and right at & + foreach( $pl as $id => $entry ) { + if( in_array( $id, $pl_ids ) ) { + $temp_split_array = split( 'song=', $entry['file'] ); + $temp_split_array = split( '&', $temp_split_array[1] ); + $song_ids[] = $temp_split_array[0]; + } + } + } if (isset($song_ids) && is_array($song_ids)) { $playlist->add_songs($song_ids, true); // $is_ordered = true } diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 8dd4b4aa..b292aebf 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.3.2-Alpha3 + - Fixed problem where Add to Playlist from mpd.php only works for + file method - Added 'Simple' Genre Bar (Thx sigger) - Added initial TV page for viewing of nowplaying and additional information (Thx sigger) |