Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
294
Merge Requests
294
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
62e5dafd
Commit
62e5dafd
authored
Apr 19, 2013
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#1182374
by lyricnz, brianV: Code style fixes for includes/filetransfer.
parent
2141c28c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
core/lib/Drupal/Core/FileTransfer/FTPExtension.php
core/lib/Drupal/Core/FileTransfer/FTPExtension.php
+3
-3
core/lib/Drupal/Core/FileTransfer/SSH.php
core/lib/Drupal/Core/FileTransfer/SSH.php
+4
-2
No files found.
core/lib/Drupal/Core/FileTransfer/FTPExtension.php
View file @
62e5dafd
...
...
@@ -56,11 +56,11 @@ protected function removeDirectoryJailed($directory) {
if
(
!
$list
)
{
$list
=
array
();
}
foreach
(
$list
as
$item
){
foreach
(
$list
as
$item
)
{
if
(
$item
==
'.'
||
$item
==
'..'
)
{
continue
;
}
if
(
@
ftp_chdir
(
$this
->
connection
,
$item
)){
if
(
@
ftp_chdir
(
$this
->
connection
,
$item
))
{
ftp_cdup
(
$this
->
connection
);
$this
->
removeDirectory
(
ftp_pwd
(
$this
->
connection
)
.
'/'
.
$item
);
}
...
...
@@ -108,7 +108,7 @@ public function isFile($path) {
*/
function
chmodJailed
(
$path
,
$mode
,
$recursive
)
{
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
)
{
$filelist
=
@
ftp_nlist
(
$this
->
connection
,
$path
);
...
...
core/lib/Drupal/Core/FileTransfer/SSH.php
View file @
62e5dafd
...
...
@@ -106,7 +106,8 @@ public function isDirectory($path) {
return
TRUE
;
}
return
FALSE
;
}
else
{
}
else
{
throw
new
FileTransferException
(
'Cannot check @path.'
,
NULL
,
array
(
'@path'
=>
$path
));
}
}
...
...
@@ -122,7 +123,8 @@ public function isFile($path) {
return
TRUE
;
}
return
FALSE
;
}
else
{
}
else
{
throw
new
FileTransferException
(
'Cannot check @path.'
,
NULL
,
array
(
'@path'
=>
$path
));
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment