- fixed use of rawurl[de|en]code

This commit is contained in:
steinm 2011-12-08 18:30:49 +00:00
parent f714187b14
commit d44a1a8549

View File

@ -136,7 +136,7 @@ class HTTP_WebDAV_Server_LetoDMS extends HTTP_WebDAV_Server
*/ */
function reverseLookup($path) /* {{{ */ function reverseLookup($path) /* {{{ */
{ {
$path = urldecode($path); $path = rawurldecode($path);
if($this->logger) if($this->logger)
$this->logger->log('reverseLookup: path='.$path.'', PEAR_LOG_DEBUG); $this->logger->log('reverseLookup: path='.$path.'', PEAR_LOG_DEBUG);
@ -275,12 +275,14 @@ class HTTP_WebDAV_Server_LetoDMS extends HTTP_WebDAV_Server
array_shift($patharr); array_shift($patharr);
$path = ''; $path = '';
foreach($patharr as $pathseg) foreach($patharr as $pathseg)
$path .= '/'.rawurlencode($pathseg->getName()); // $path .= '/'.rawurlencode($pathseg->getName());
$path .= '/'.$pathseg->getName();
if(!$path) { if(!$path) {
$path = '/'; $path = '/';
$info["props"][] = $this->mkprop("isroot", "true"); $info["props"][] = $this->mkprop("isroot", "true");
} }
$info["path"] = htmlspecialchars($path); // $info["path"] = htmlspecialchars($path);
$info["path"] = $path;
$info["props"][] = $this->mkprop("displayname", $obj->getName()); $info["props"][] = $this->mkprop("displayname", $obj->getName());
$info["props"][] = $this->mkprop("resourcetype", "collection"); $info["props"][] = $this->mkprop("resourcetype", "collection");
$info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory"); $info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory");
@ -294,8 +296,10 @@ class HTTP_WebDAV_Server_LetoDMS extends HTTP_WebDAV_Server
array_shift($patharr); array_shift($patharr);
$path = '/'; $path = '/';
foreach($patharr as $pathseg) foreach($patharr as $pathseg)
$path .= rawurlencode($pathseg->getName()).'/'; // $path .= rawurlencode($pathseg->getName()).'/';
$info["path"] = htmlspecialchars($path.rawurlencode($obj->getName())); $path .= $pathseg->getName().'/';
// $info["path"] = htmlspecialchars($path.rawurlencode($obj->getName()));
$info["path"] = $path.$obj->getName();
$info["props"][] = $this->mkprop("displayname", $obj->getName()); $info["props"][] = $this->mkprop("displayname", $obj->getName());
$info["props"][] = $this->mkprop("resourcetype", ""); $info["props"][] = $this->mkprop("resourcetype", "");