octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2020-03-30 07:50:05 -05:00
commit 5ea7be57da
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpseclib/Net/SFTP.php
View File

@ -1695,9 +1695,6 @@ class SFTP extends SSH2
} }
$dir = $this->realpath($dir); $dir = $this->realpath($dir);
// by not providing any permissions, hopefully the server will use the logged in users umask - their
// default permissions.
$attr = $mode == -1 ? "\0\0\0\0" : pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
if ($recursive) { if ($recursive) {
$dirs = explode('/', preg_replace('#/(?=/)|/$#', '', $dir)); $dirs = explode('/', preg_replace('#/(?=/)|/$#', '', $dir));
@ -1708,12 +1705,12 @@ class SFTP extends SSH2
for ($i = 0; $i < count($dirs); $i++) { for ($i = 0; $i < count($dirs); $i++) {
$temp = array_slice($dirs, 0, $i + 1); $temp = array_slice($dirs, 0, $i + 1);
$temp = implode('/', $temp); $temp = implode('/', $temp);
$result = $this->mkdir_helper($temp, $attr); $result = $this->mkdir_helper($temp, $mode);
} }
return $result; return $result;
} }
return $this->mkdir_helper($dir, $attr); return $this->mkdir_helper($dir, $mode);
} }
/** /**
@ -1724,9 +1721,10 @@ class SFTP extends SSH2
* @return bool * @return bool
* @access private * @access private
*/ */
private function mkdir_helper($dir, $attr) private function mkdir_helper($dir, $mode)
{ {
if (!$this->send_sftp_packet(NET_SFTP_MKDIR, Strings::packSSH2('s', $dir) . $attr)) { // send SSH_FXP_MKDIR without any attributes (that's what the \0\0\0\0 is doing)
if (!$this->send_sftp_packet(NET_SFTP_MKDIR, Strings::packSSH2('s', $dir) . "\0\0\0\0")) {
return false; return false;
} }
@ -1742,6 +1740,10 @@ class SFTP extends SSH2
return false; return false;
} }
if ($mode !== -1) {
$this->chmod($mode, $dir);
}
return true; return true;
} }