From 06668db697827803a378ea2333bcb7789e3fad02 Mon Sep 17 00:00:00 2001 From: Loic d'Anterroches Date: Tue, 6 Oct 2009 21:28:37 +0200 Subject: [PATCH] Fixed issue 304, cannot display source files with brackets in their names. --- src/IDF/Scm/Svn.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/IDF/Scm/Svn.php b/src/IDF/Scm/Svn.php index 5c6b682..44df0b7 100644 --- a/src/IDF/Scm/Svn.php +++ b/src/IDF/Scm/Svn.php @@ -169,7 +169,7 @@ class IDF_Scm_Svn extends IDF_Scm $cmd = sprintf(Pluf::f('svn_path', 'svn').' info --xml --username=%s --password=%s %s@%s', escapeshellarg($this->username), escapeshellarg($this->password), - escapeshellarg($this->repo.'/'.$path), + escapeshellarg($this->repo.'/'.urlencode($path)), escapeshellarg($rev)); $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $xmlInfo = shell_exec($cmd); @@ -196,7 +196,7 @@ class IDF_Scm_Svn extends IDF_Scm $cmd = sprintf(Pluf::f('svn_path', 'svn').' ls --xml --username=%s --password=%s %s@%s', escapeshellarg($this->username), escapeshellarg($this->password), - escapeshellarg($this->repo.'/'.$folder), + escapeshellarg($this->repo.'/'.urlencode($folder)), escapeshellarg($commit)); $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $xml = simplexml_load_string(shell_exec($cmd)); @@ -253,7 +253,7 @@ class IDF_Scm_Svn extends IDF_Scm $cmd = sprintf(Pluf::f('svn_path', 'svn').' info --xml --username=%s --password=%s %s@%s', escapeshellarg($this->username), escapeshellarg($this->password), - escapeshellarg($this->repo.'/'.$filename), + escapeshellarg($this->repo.'/'.urlencode($filename)), escapeshellarg($rev)); $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $xml = simplexml_load_string(shell_exec($cmd)); @@ -280,7 +280,7 @@ class IDF_Scm_Svn extends IDF_Scm $cmd = sprintf(Pluf::f('svn_path', 'svn').' cat --username=%s --password=%s %s@%s', escapeshellarg($this->username), escapeshellarg($this->password), - escapeshellarg($this->repo.'/'.$def->fullpath), + escapeshellarg($this->repo.'/'.urlencode($def->fullpath)), escapeshellarg($def->rev)); $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; return ($cmd_only) ? $cmd : shell_exec($cmd); @@ -458,7 +458,7 @@ class IDF_Scm_Svn extends IDF_Scm $cmd = sprintf(Pluf::f('svn_path', 'svn').' proplist --xml --username=%s --password=%s %s@%s', escapeshellarg($this->username), escapeshellarg($this->password), - escapeshellarg($this->repo.'/'.$path), + escapeshellarg($this->repo.'/'.urlencode($path)), escapeshellarg($rev)); $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $xmlProps = shell_exec($cmd); @@ -494,7 +494,7 @@ class IDF_Scm_Svn extends IDF_Scm escapeshellarg($property), escapeshellarg($this->username), escapeshellarg($this->password), - escapeshellarg($this->repo.'/'.$path), + escapeshellarg($this->repo.'/'.urlencode($path)), escapeshellarg($rev)); $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $xmlProp = shell_exec($cmd);