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

item 0 removed when deleting from serverQueue, dont lowercase filename replace in modal, exclude findFilesExclude

Browse Source
This commit is contained in:
mattpass
2020-07-20 22:22:12 +01:00
parent 8625c41cf9
commit 501d9f048d
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/File.php
View File

@@ -149,7 +149,7 @@ class File
$this->ftpClass->ftpStart();
// Show user warning if no good connection
if (!$ftpConn || !$ftpLogin) {
die('parent.parent.ICEcoder.message("Sorry, no FTP connection to ' . $ftpHost . ' for user ' . $ftpUser . '");parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue("del",0);</script>');
die('parent.parent.ICEcoder.message("Sorry, no FTP connection to ' . $ftpHost . ' for user ' . $ftpUser . '");parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue("del");</script>');
}
// Get our file contents and close the FTP connection
$loadedFile = toUTF8noBOM($this->ftpClass->ftpGetContents($ftpConn, $ftpRoot . $fileLoc . "/" . $fileName, $ftpMode), false);
@@ -339,7 +339,7 @@ class File
/* UI dialog cancelling and saving contents for save as looparound */
if (!newFileName || newFileName && !overwriteOK) {
ICEcoder.saveAsContent = document.getElementById(\'saveTemp1\').value;
ICEcoder.serverMessage();ICEcoder.serverQueue("del", 0);
ICEcoder.serverMessage();ICEcoder.serverQueue("del");
}
';

24
lib/file-control.php
View File

@@ -63,7 +63,7 @@ if (isset($_POST['newFileName']) && "" != $_POST['newFileName']) {
if (false === $error) {
$fileClass->check();
if ("load" === $_GET['action'] && true === $error) {
die("parent.parent.ICEcoder.message('" . $errorMsg . "');parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue(\"del\",0);</script>");
die("parent.parent.ICEcoder.message('" . $errorMsg . "');parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue(\"del\");</script>");
}
}
@@ -88,7 +88,7 @@ if (!$error && "load" === $_GET['action']) {
echo $fileClass->returnLoadTextScript();
echo $fileClass->returnLoadImageScript();
?>
parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del", 0);
parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del");
// Finally, switch mode in case we have saved, renamed file etc
parent.parent.ICEcoder.switchMode();
@@ -184,7 +184,7 @@ if (!$error && "save" === $_GET['action']) {
$finalAction = "nothing";
$doNext .= "ICEcoder.message('" . $t['Sorry, cannot save'] . "\\\\n" . $file . "');";
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
}
};
@@ -215,7 +215,7 @@ if (!$error && "newFolder" === $_GET['action']) {
$doNext .= "ICEcoder.message('" . $t['Sorry, cannot create...'] . "\\\\n" . $fileLoc . "');";
$finalAction = "nothing";
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// ================
@@ -265,7 +265,7 @@ if (!$error && "move" === $_GET['action']) {
$doNext .= "";
$finalAction = "nothing";
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// ==================
@@ -301,7 +301,7 @@ if (!$error && "rename" === $_GET['action']) {
$doNext .= "ICEcoder.message('".$t['Sorry, cannot rename'] . "\\\\n" . str_replace("|", "/", $_GET['oldFileName']) . "\\\\n\\\\n" . $t['Maybe public write...'] . "');";
$finalAction = "nothing";
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// =================
@@ -325,7 +325,7 @@ if (!isset($ftpSite) && !$error && "paste" === $_GET['action']) {
$doNext .= "ICEcoder.message('" . $t['Sorry, cannot copy'] . " \\\\n" . str_replace($docRoot, "", $source) . "\\\\n " . $t['into'] . " \\\\n" . str_replace($docRoot, "", $dest) . "');";
$finalAction = "nothing";
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// ==============
@@ -387,7 +387,7 @@ if (!$error && "delete" === $_GET['action']) {
} else {
$fileClass->delete();
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// ======================
@@ -413,7 +413,7 @@ if (!isset($ftpSite) && !$error && "replaceText" === $_GET['action']) {
$finalAction = "nothing";
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// ==========================
@@ -438,7 +438,7 @@ if (!isset($ftpSite) && !$error && "getRemoteFile" === $_GET['action']) {
$doNext .= 'ICEcoder.message(\'' . $t['Sorry, could not...'] . ' '.$file . '\');';
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// =======================
@@ -468,7 +468,7 @@ if (!$error && "perms" === $_GET['action']) {
$finalAction = "nothing";
$doNext .= "ICEcoder.message('" . $t['Sorry, cannot change...'] . " \\n" . $file . "');";
}
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// ====================
@@ -479,7 +479,7 @@ if (!isset($ftpSite) && !$error && "checkExists" === $_GET['action']) {
// This action is called under seperate AJAX call and the responseText object stored in ICEcoder.lastFileDirCheckStatusObj
// Nothing really done here though, we do something with the responseText
$finalAction = "checkExists";
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
$doNext .= 'ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
};
// ===================

10
lib/multiple-results.php
View File

@@ -122,7 +122,7 @@ if (true === isset($_GET['target']) && false !== strpos($_GET['target'], "filena
'<div id="foundCount' + i + '">' + spansArray[i].innerHTML +
', <?php echo $t['rename to'];?> ' +
targetURL.replace(/\|/g, "/").replace(/_perms/g, "").replace(/<?php echo str_replace("/", "\/",strtolower($findText)); ?>/g,"<b><?php
if (isset($_GET['replace'])) {echo strtolower($_GET['replace']);};
if (isset($_GET['replace'])) {echo $_GET['replace'];};
?></b>")+'</div>';
<?php
;};
@@ -152,11 +152,17 @@ if (true === isset($_GET['target']) && false !== strpos($_GET['target'], "filena
$bFile = false;
$foundInSelFile = false;
// Exclude banned files
for ($i = 0;$i < count($ICEcoder['bannedFiles']); $i++) {
for ($i = 0; $i < count($ICEcoder['bannedFiles']); $i++) {
if (false !== strpos($f, str_replace("*", "", $ICEcoder['bannedFiles'][$i]))) {
$bFile = true;
};
}
// Exclude the dirs & files we wish to exclude from find & replace tasks
for ($i = 0; $i < count($ICEcoder['findFilesExclude']); $i++) {
if (false !== strpos($f, str_replace("*", "", $ICEcoder['findFilesExclude'][$i]))) {
$bFile = true;
};
}
// Exclude the folder ICEcoder is running from
$rootPrefix = '/' . str_replace("/", "\/", preg_quote(str_replace("\\", "/", $docRoot))) . '/';
$localPath = preg_replace($rootPrefix, '', $fullPath, 1);

2
lib/settings-save-current-files.php
View File

@@ -36,5 +36,5 @@ if (true === $_SESSION['loggedIn'] && true === isset($_GET["saveFiles"])) {
}
}
}
echo '<script>parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del", 0);</script>';
echo '<script>parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del");</script>';
}