Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #935036 by bfroehle, dww: file exists in FileTransferFTPExtension->createDirectoryJailed().

merge-requests/26/head
Dries Buytaert 2010-11-19 03:26:14 +00:00
parent 98ee6861a0
commit 0aaf53e529
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/filetransfer/filetransfer.inc
View File

@ -208,7 +208,7 @@ abstract class FileTransfer {
$destination = $destination . '/' . basename($source); $destination = $destination . '/' . basename($source);
} }
$this->createDirectory($destination); $this->createDirectory($destination);
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) { foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($source, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) {
$relative_path = substr($filename, strlen($source)); $relative_path = substr($filename, strlen($source));
if ($file->isDir()) { if ($file->isDir()) {
$this->createDirectory($destination . $relative_path); $this->createDirectory($destination . $relative_path);

4
includes/filetransfer/local.inc
View File

@ -31,7 +31,7 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa
// Programmer error assertion, not something we expect users to see. // Programmer error assertion, not something we expect users to see.
throw new FileTransferException('removeDirectoryJailed() called with a path (%directory) that is not a directory.', NULL, array('%directory' => $directory)); throw new FileTransferException('removeDirectoryJailed() called with a path (%directory) that is not a directory.', NULL, array('%directory' => $directory));
} }
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $filename => $file) { foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::CHILD_FIRST) as $filename => $file) {
if ($file->isDir()) { if ($file->isDir()) {
if (@!drupal_rmdir($filename)) { if (@!drupal_rmdir($filename)) {
throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $filename)); throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $filename));
@ -64,7 +64,7 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa
public function chmodJailed($path, $mode, $recursive) { public function chmodJailed($path, $mode, $recursive) {
if ($recursive && is_dir($path)) { if ($recursive && is_dir($path)) {
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) { foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) {
if (@!chmod($filename, $mode)) { if (@!chmod($filename, $mode)) {
throw new FileTransferException('Cannot chmod %path.', NULL, array('%path' => $filename)); throw new FileTransferException('Cannot chmod %path.', NULL, array('%path' => $filename));
} }