* Depth: header support

 * Committing current WebDAV library

Author: Jack Bates

caldav.php

@@ -148,13 +148,13 @@ function move(&$options) {
 		return true;
 	}
 
-	// FIXME Handle depth
 	// FIXME Use file_exists
 	function propfind($options, &$files) {
 		$files = array();
-		$paths = array();
-		$path = $options['path'];
-		while (isset($path)) {
+		$paths = array(array($options['path'], 0));
+		while (!empty($paths)) {
+			list ($path, $depth) = array_pop($paths);
+
 			$file = array();
 			$file['path'] = $path;
 
@@ -168,26 +168,28 @@ function propfind($options, &$files) {
 			if (is_dir($absolutePath)) {
 				$file['props'][] = $this->mkprop('resourcetype', 'collection');
 
-				$handle = opendir($absolutePath);
-				if (!$handle) {
-					return;
-				}
+				if ($depth < $options['depth']) {
+					$handle = opendir($absolutePath);
+					if (!$handle) {
+						return;
+					}
 
-				while (($pathComponent = readdir($handle)) !== false) {
-					if ($pathComponent != '.' && $pathComponent != '..') {
-						$paths[] = $path != '' ? "$path/$pathComponent" :
-							$pathComponent;
+					while (($pathComponent = readdir($handle)) !== false) {
+						if ($pathComponent != '.' && $pathComponent != '..') {
+							$paths[] = array($path != '' ?
+								"$path/$pathComponent" : $pathComponent,
+								$depth + 1);
+						}
 					}
+					closedir($handle);
 				}
-				closedir($handle);
 			} else {
 				$file['props'][] = $this->mkprop('getcontentlength',
 					$stat['size']);
 				$file['props'][] = $this->mkprop('resourcetype', null);
 			}
 
 			$files[] = $file;
-			$path = array_pop($paths);
 		}
 
 		return true;
@@ -211,9 +213,10 @@ function put(&$options) {
 
 	function report($options, &$files) {
 		$files = array();
-		$paths = array();
-		$path = $options['path'];
-		while (isset($path)) {
+		$paths = array(array($options['path'], 0));
+		while (!empty($paths)) {
+			list ($path, $depth) = array_pop($paths);
+
 			$file = array();
 			$file['path'] = $path;
 
@@ -227,26 +230,28 @@ function report($options, &$files) {
 			if (is_dir($absolutePath)) {
 				$file['props'][] = $this->mkprop('resourcetype', 'collection');
 
-				$handle = opendir($absolutePath);
-				if (!$handle) {
-					return;
-				}
+				if ($depth < $options['depth']) {
+					$handle = opendir($absolutePath);
+					if (!$handle) {
+						return;
+					}
 
-				while (($pathComponent = readdir($handle)) !== false) {
-					if ($pathComponent != '.' && $pathComponent != '..') {
-						$paths[] = $path != '' ? "$path/$pathComponent" :
-							$pathComponent;
+					while (($pathComponent = readdir($handle)) !== false) {
+						if ($pathComponent != '.' && $pathComponent != '..') {
+							$paths[] = array($path != '' ?
+								"$path/$pathComponent" : $pathComponent,
+								$depth + 1);
+						}
 					}
+					closedir($handle);
 				}
-				closedir($handle);
 			} else {
 				$file['props'][] = $this->mkprop('getcontentlength',
 					$stat['size']);
 				$file['props'][] = $this->mkprop('resourcetype', null);
 			}
 
 			$files[] = $file;
-			$path = array_pop($paths);
 		}
 
 		return true;