Merge pull request #54412 from nextcloud/backport/54401/stable31

[stable31] fix(ZipFolderPlugin): set mtime of directories in archive

Author: AndyScherzinger

apps/dav/lib/Connector/Sabre/ZipFolderPlugin.php

@@ -67,15 +67,16 @@ protected function streamNode(Streamer $streamer, NcNode $node, string $rootPath
 		// Remove the root path from the filename to make it relative to the requested folder
 		$filename = str_replace($rootPath, '', $node->getPath());
 
+		$mtime = $node->getMTime();
 		if ($node instanceof NcFile) {
 			$resource = $node->fopen('rb');
 			if ($resource === false) {
 				$this->logger->info('Cannot read file for zip stream', ['filePath' => $node->getPath()]);
 				throw new \Sabre\DAV\Exception\ServiceUnavailable('Requested file can currently not be accessed.');
 			}
-			$streamer->addFileFromStream($resource, $filename, $node->getSize(), $node->getMTime());
+			$streamer->addFileFromStream($resource, $filename, $node->getSize(), $mtime);
 		} elseif ($node instanceof NcFolder) {
-			$streamer->addEmptyDir($filename);
+			$streamer->addEmptyDir($filename, $mtime);
 			$content = $node->getDirectoryListing();
 			foreach ($content as $subNode) {
 				$this->streamNode($streamer, $subNode, $rootPath);

lib/private/Streamer.php

@@ -170,11 +170,16 @@ public function addFileFromStream($stream, string $internalName, int|float $size
 	/**
 	 * Add an empty directory entry to the archive.
 	 *
-	 * @param string $dirName Directory Path and name to be added to the archive.
-	 * @return bool $success
+	 * @param $dirName - Directory Path and name to be added to the archive.
+	 * @param $timestamp - Modification time of the directory (defaults to current time)
 	 */
-	public function addEmptyDir($dirName) {
-		return $this->streamerInstance->addEmptyDir($dirName);
+	public function addEmptyDir(string $dirName, int $timestamp = 0): bool {
+		$options = null;
+		if ($timestamp > 0) {
+			$options = ['timestamp' => $timestamp];
+		}
+
+		return $this->streamerInstance->addEmptyDir($dirName, $options);
 	}
 
 	/**