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

Issue #1182374 by lyricnz, sivaji, brianV: Code style fixes for includes/filetransfer.

merge-requests/26/head
David Rothstein 2013-12-30 19:05:15 -05:00
parent e04e5302a2
commit 427ae621af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/filetransfer/ftp.inc
View File

@ -82,11 +82,11 @@ class FileTransferFTPExtension extends FileTransferFTP implements FileTransferCh
if (!$list) { if (!$list) {
$list = array(); $list = array();
} }
foreach ($list as $item){ foreach ($list as $item) {
if ($item == '.' || $item == '..') { if ($item == '.' || $item == '..') {
continue; continue;
} }
if (@ftp_chdir($this->connection, $item)){ if (@ftp_chdir($this->connection, $item)) {
ftp_cdup($this->connection); ftp_cdup($this->connection);
$this->removeDirectory(ftp_pwd($this->connection) . '/' . $item); $this->removeDirectory(ftp_pwd($this->connection) . '/' . $item);
} }
@ -122,7 +122,7 @@ class FileTransferFTPExtension extends FileTransferFTP implements FileTransferCh
function chmodJailed($path, $mode, $recursive) { function chmodJailed($path, $mode, $recursive) {
if (!ftp_chmod($this->connection, $mode, $path)) { if (!ftp_chmod($this->connection, $mode, $path)) {
throw new FileTransferException("Unable to set permissions on %file", NULL, array ('%file' => $path)); throw new FileTransferException("Unable to set permissions on %file", NULL, array('%file' => $path));
} }
if ($this->isDirectory($path) && $recursive) { if ($this->isDirectory($path) && $recursive) {
$filelist = @ftp_nlist($this->connection, $path); $filelist = @ftp_nlist($this->connection, $path);