Updated code to use new path splitter instead of dirname/basename

Author: evert

lib/Sabre/DAV/Browser/Plugin.php

@@ -100,16 +100,21 @@ public function httpPOSTHandler($method) {
             case 'mkcol' :
                 if (isset($_POST['name']) && trim($_POST['name'])) {
                     // Using basename() because we won't allow slashes
-                    $folderName = trim(basename($_POST['name']));
+                    list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($_POST['name']));
                     $this->server->createDirectory($this->server->getRequestUri() . '/' . $folderName);
                 }
                 break;
             case 'put' :
                 if ($_FILES) $file = current($_FILES);
                 else break;
-                $newName = basename($file['name']);
+                $newName = trim($file['name']);
+                list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
                 if (isset($_POST['name']) && trim($_POST['name']))
-                    $newName = trim(basename($_POST['name']));
+                    $newName = trim($_POST['name']);
+
+                // Making sure we only have a 'basename' component
+                list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
+                    
 
                 if (is_uploaded_file($file['tmp_name'])) {
                     $parent = $this->server->tree->getNodeForPath(trim($this->server->getRequestUri(),'/'));

lib/Sabre/DAV/Server.php

@@ -1010,13 +1010,13 @@ public function getPropertiesForPath($path,$propertyNames = array(),$depth = 0)
      */
     public function createFile($uri,$data) {
 
-        $parentUri = dirname($uri);
-        if ($parentUri=='.') $parentUri = '';
+        list($dir,$name) = Sabre_DAV_URLUtil::splitPath($uri);
+
         if (!$this->broadcastEvent('beforeBind',array($uri))) return;
         if (!$this->broadcastEvent('beforeCreateFile',array($uri,$data))) return;
 
-        $parent = $this->tree->getNodeForPath($parentUri);
-        $parent->createFile(basename($uri),$data);
+        $parent = $this->tree->getNodeForPath($dir);
+        $parent->createFile($name,$data);
 
         $this->broadcastEvent('afterBind',array($uri));
     }

lib/Sabre/DAV/TemporaryFileFilterPlugin.php

@@ -134,11 +134,12 @@ public function beforeCreateFile($uri,$data) {
      * temporary file storage.
      * 
      * @param string $path 
-     * @return mixed 
+     * @return boolean|string 
      */
     protected function isTempFile($path) {
 
-        $tempPath = basename($path);
+        // We're only interested in the basename.
+        list(, $tempPath) = Sabre_DAV_URLUtil::splitPath($path);
 
         $tempFiles = array(
             '/^\._(.*)$/',      // OS/X resource forks

lib/Sabre/DAV/Tree.php

@@ -32,8 +32,12 @@ abstract function getNodeForPath($path);
     public function copy($sourcePath, $destinationPath) {
 
         $sourceNode = $this->getNodeForPath($sourcePath);
-        $destinationParent = $this->getNodeForPath(dirname($destinationPath));
-        $this->copyNode($sourceNode,$destinationParent,basename($destinationPath));
+       
+        // grab the dirname and basename components
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        $destinationParent = $this->getNodeForPath($destinationDir);
+        $this->copyNode($sourceNode,$destinationParent,$destinationName);
 
     }
 
@@ -46,9 +50,12 @@ public function copy($sourcePath, $destinationPath) {
      */
     public function move($sourcePath, $destinationPath) {
 
-        if (dirname($sourcePath)==dirname($destinationPath)) {
+        list($sourceDir, $sourceName) = Sabre_DAV_URLUtil::splitPath($sourcePath);
+        list($destinationDir, $destinationName) = Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+        if ($sourceDir===$destinationDir) {
             $renameable = $this->getNodeForPath($sourcePath);
-            $renameable->setName(basename($destinationPath));
+            $renameable->setName($destinationName);
         } else {
             $this->copy($sourcePath,$destinationPath);
             $this->getNodeForPath($sourcePath)->delete();