Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-09 18:16:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use ftpStart and ftpEnd functions

Browse Source
This commit is contained in:
Matt Pass
2015-08-19 06:36:04 +01:00
parent 41592007b9
commit b1df1e8403
3 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/file-control-xhr.php
View File

@@ -190,12 +190,8 @@ if (!$error && $_GET['action']=="save") {
// FTP Saving
if (isset($ftpSite)) {
// Establish connection, result, maybe use pasv and alert error if no good connection
$ftpConn = ftp_connect($ftpHost);
$ftpLogin = ftp_login($ftpConn, $ftpUser, $ftpPass);
if ($ftpPasv) {
ftp_pasv($ftpConn, true);
}
ftpStart();
// Show user warning if no good connection
if (!$ftpConn || !$ftpLogin) {
$doNext .= 'top.ICEcoder.message("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");';
}
@@ -209,7 +205,7 @@ if (!$error && $_GET['action']=="save") {
if (!ftpWriteFile($ftpConn, $ftpFilepath, $contents, $ftpMode)) {
$doNext .= 'top.ICEcoder.message("Sorry, could not write '.$ftpFilepath.' at '.$ftpHost.'");';
}
ftp_close($ftpConn);
ftpEnd();
// Local saving
} else {
// Newly created files have the perms set too
@@ -342,12 +338,8 @@ if (!$error && $_GET['action']=="newFolder") {
$updateFM = false;
// FTP
if (isset($ftpSite)) {
// Establish connection, result, maybe use pasv and alert error if no good connection
$ftpConn = ftp_connect($ftpHost);
$ftpLogin = ftp_login($ftpConn, $ftpUser, $ftpPass);
if ($ftpPasv) {
ftp_pasv($ftpConn, true);
}
ftpStart();
// Show user warning if no good connection
if (!$ftpConn || !$ftpLogin) {
$doNext = 'top.ICEcoder.message("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");';
} else {
@@ -358,7 +350,7 @@ if (!$error && $_GET['action']=="newFolder") {
$updateFM = true;
}
}
ftp_close($ftpConn);
ftpEnd();
// Local
} else {
mkdir($file, octdec($ICEcoder['newDirPerms']));
@@ -661,12 +653,8 @@ if (!$error && $_GET['action']=="perms") {
$updateFM = false;
// FTP
if (isset($ftpSite)) {
// Establish connection, result, maybe use pasv and alert error if no good connection
$ftpConn = ftp_connect($ftpHost);
$ftpLogin = ftp_login($ftpConn, $ftpUser, $ftpPass);
if ($ftpPasv) {
ftp_pasv($ftpConn, true);
}
ftpStart();
// Show user warning if no good connection
if (!$ftpConn || !$ftpLogin) {
$doNext = 'top.ICEcoder.message("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");';
} else {
@@ -677,7 +665,7 @@ if (!$error && $_GET['action']=="perms") {
$updateFM = true;
}
}
ftp_close($ftpConn);
ftpEnd();
// Local
} else {
chmod($file,octdec(numClean($_GET['perms'])));

10
lib/file-control.php
View File

@@ -86,19 +86,15 @@ if ($_GET['action']=="load") {
// Get file over FTP?
if (isset($ftpSite)) {
// Establish connection, result, maybe use pasv and alert error if no good connection
$ftpConn = ftp_connect($ftpHost);
$ftpLogin = ftp_login($ftpConn, $ftpUser, $ftpPass);
if ($ftpPasv) {
ftp_pasv($ftpConn, true);
}
ftpStart();
// Show user warning if no good connection
if (!$ftpConn || !$ftpLogin) {
die('alert("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>');
exit;
}
// Get our file contents and close the FTP connection
$loadedFile = toUTF8noBOM(ftpGetContents($ftpConn, $ftpRoot.$fileLoc."/".$fileName, $ftpMode));
ftp_close($ftpConn);
ftpEnd();
// Get local file
} else {
$loadedFile = toUTF8noBOM(file_get_contents($file,false,$context),true);

10
lib/get-branch.php
View File

@@ -124,12 +124,8 @@ $dirArray = $filesArray = $finalArray = array();
// Get dir/file list over FTP
if (isset($ftpSite)) {
// Establish connection, result, maybe use pasv and alert error if no good connection
$ftpConn = ftp_connect($ftpHost);
$ftpLogin = ftp_login($ftpConn, $ftpUser, $ftpPass);
if ($ftpPasv) {
ftp_pasv($ftpConn, true);
}
ftpStart();
// Show user warning if no good connection
if (!$ftpConn || !$ftpLogin) {
die('<script>alert("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");</script>');
exit;
@@ -138,7 +134,7 @@ if (isset($ftpSite)) {
$ftpList = ftpGetList($ftpConn, $ftpRoot.$location);
$finalArray = $ftpList['simpleList'];
$ftpItems = $ftpList['detailedList'];
ftp_close($ftpConn);
ftpEnd();
// or get local list
} else {
$finalArray = scanDir($scanDir.$location);