diff --git a/classes/File.php b/classes/File.php index 01fa5e7..e902785 100644 --- a/classes/File.php +++ b/classes/File.php @@ -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);'); + die('parent.parent.ICEcoder.message("Sorry, no FTP connection to ' . $ftpHost . ' for user ' . $ftpUser . '");parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue("del");'); } // 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"); } '; diff --git a/lib/file-control.php b/lib/file-control.php index 2c4e983..242d6d2 100644 --- a/lib/file-control.php +++ b/lib/file-control.php @@ -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);"); + die("parent.parent.ICEcoder.message('" . $errorMsg . "');parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue(\"del\");"); } } @@ -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");'; }; // =================== diff --git a/lib/multiple-results.php b/lib/multiple-results.php index 0615565..43fdeb3 100644 --- a/lib/multiple-results.php +++ b/lib/multiple-results.php @@ -122,7 +122,7 @@ if (true === isset($_GET['target']) && false !== strpos($_GET['target'], "filena '
' + spansArray[i].innerHTML + ', ' + targetURL.replace(/\|/g, "/").replace(/_perms/g, "").replace(//g,"")+'
'; parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del", 0);'; + echo ''; }