yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity

Fix file:// sheme on Windows playlist files

Browse source
This commit is contained in:
Afterster 2014-02-22 12:06:30 +01:00
parent 5ae92b93c5
commit b023466475
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/class/catalog.class.php
View file

@ -1086,8 +1086,17 @@ abstract class Catalog extends database_object
else {
// Remove file:// prefix if any
if (strpos($file, "file://") !== false) {
$file = substr($file, 7);
$file = urldecode(substr($file, 7));
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
// Removing starting / on Windows OS.
if (substr($file, 0, 1) == '/') {
$file = substr($file, 1);
}
// Restore real directory separator
$file = str_replace("/", DIRECTORY_SEPARATOR, $file);
}
}
debug_event('catalog', 'Add file ' . $file . ' to playlist.', '5');
// First, try to found the file as absolute path
$sql = "SELECT `id` FROM `song` WHERE `file` = ?";
@ -1216,9 +1225,8 @@ abstract class Catalog extends database_object
{
$files = array();
$xml = simplexml_load_string($data);
if ($xml) {
foreach ($xml->trackList as $track) {
foreach ($xml->trackList->track as $track) {
$file = trim($track->location);
if (!empty($file)) {
$files[] = $file;