From b3f5bdacf729e637f2db4c377ac35c951a01c06c Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 4 Dec 2008 08:57:42 +1300 Subject: [PATCH] Better track escaping. --- inc/xmms2Player.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/inc/xmms2Player.php b/inc/xmms2Player.php index c7f9297..e3c39b4 100644 --- a/inc/xmms2Player.php +++ b/inc/xmms2Player.php @@ -71,10 +71,11 @@ class xmms2Connection { */ function EncodeFileName( $track ) { $encoded = str_replace( chr(92), '\\\\', $track); - $encoded = preg_replace( '/([\\\'"#&;`|*?~<>^()[]{}$ ])/', '\\\\\1', $encoded); + $encoded = str_replace( "'", "\\'", $track); + // $encoded = preg_replace( '/([\\\'"#&;`|*?~<>^\(\)[]{}$ ])/', '\\\\\1', $encoded); # $encoded = escapeshellarg($track); - $encoded = "file://" . $encoded; - error_log( "Trying to play: '$encoded'" ); + $encoded = "'file://" . $encoded . "'"; + error_log( "Trying to play: $encoded" ); return $encoded; } -- 2.11.4.GIT