diff --git a/resources/css/main.css b/resources/css/main.css
index a50c241..7f279c5 100644
--- a/resources/css/main.css
+++ b/resources/css/main.css
@@ -100,6 +100,14 @@
text-align: center;
}
+#serverMsgView {
+ position: fixed;
+ bottom: 0em;
+ height: 5em;
+ overflow-y: scroll;
+ width: 100%;
+}
+
/* Classes */
.imgViewImg {
width: inherit;
diff --git a/resources/js/filesystemActions.js b/resources/js/filesystemActions.js
index 16cf1d7..e95ec6f 100644
--- a/resources/js/filesystemActions.js
+++ b/resources/js/filesystemActions.js
@@ -72,9 +72,8 @@ async function uploadFiles() {
for (var i = 0; i < size; i++) {
data.append("filesToUpload[]", toUpload.files[i]);
}
+ fileUploader(data);
}
-
- fileUploader(data);
}
function createItem(type) {
diff --git a/resources/js/passwordFieldInsert.js b/resources/js/passwordFieldInsert.js
index 0a07f74..5277cd7 100644
--- a/resources/js/passwordFieldInsert.js
+++ b/resources/js/passwordFieldInsert.js
@@ -1,8 +1,4 @@
function createPassField(data) {
- var msg = data.getElementsByTagName('SERV_MSG')[0].innerHTML;
- console.log("No PATH_HEAD tag in XML. Checking for error MESSAGE tag.");
- console.log("Message: " + msg);
-
insertArea.innerHTML = "";
var passField = document.createElement("INPUT");
var submitBttn = document.createElement("BUTTON");
diff --git a/resources/php/filesystemActions.php b/resources/php/filesystemActions.php
index 80c74a2..90d87d5 100644
--- a/resources/php/filesystemActions.php
+++ b/resources/php/filesystemActions.php
@@ -1,10 +1,11 @@
The file " . $FILE . " has been created.";
+ serverMessage("success", $message);
$_SESSION["refreshState"] = "updateListing";
}
@@ -27,19 +31,25 @@ function deleteItem($FILE) {
} else if (is_file($FILE)) {
unlink($FILE);
}
+
+ $message = "Server: [Success] --> The file(s) has/have been deleted.";
+ serverMessage("success", $message);
$_SESSION["refreshState"] = "updateListing";
}
// Rename file or folder
function renameItem($OLDFILE, $NEWNAME, $PATH) {
rename($PATH . $OLDFILE, $PATH . $NEWNAME);
+ $message = "Server: [Success] --> The file " . $OLDFILE . " has been renamed to " . $NEWNAME . " side.";
+ serverMessage("success", $message);
$_SESSION["refreshState"] = "updateListing";
}
// Uploader
function uploadFiles($targetDir) {
- $GeneratedXML = "";
$numberOfFiles = count($_FILES['filesToUpload']['name']);
+ $type = "";
+ $message = "";
for ($i=0; $i < $numberOfFiles; $i++) {
$uploadOk = 1;
@@ -51,11 +61,9 @@ function uploadFiles($targetDir) {
if (file_exists($targetFile)) {
if (is_file($targetFile)) {
unlink($targetFile);
- $GeneratedXML .= "" .
- "Server: [Warnning] --> This file already exists. Overwriting it.";
+ $message = "Server: [Warnning] --> This file already exists. Overwriting it.";
} else {
- $GeneratedXML .= "" .
- "Server: [Warnning] --> This file might be a directory. Or, no files were submitted for uploading.";
+ $message = "Server: [Warnning] --> This file might be a directory. Or, no files were submitted for uploading.";
$uploadOk = 0;
}
}
@@ -63,31 +71,31 @@ function uploadFiles($targetDir) {
// Check file size
$fileSize = $_FILES['filesToUpload']['size'][$i];
if ($fileSize > 500000000000) {
- $GeneratedXML .= "" .
- "Server: [Warnning] --> This file is too large.";
+ $message = "Server: [Warnning] --> This file is too large.";
$uploadOk = 0;
}
// Allow certain file formats
// $ext = pathinfo($targetFile,PATHINFO_EXTENSION);
// if(!preg_match('/^.*\.(rar|iso|img|tar|zip|7z|7zip|jpg|jpeg|png|gif|mpeg|mov|flv|avi|mp4|webm|mpg|mkv|m4a|mp3|ogg|docx|doc|odt|txt|pdf|)$/i', strtolower($ext))) {
- // $GeneratedXML .= "This file type is not allowed. File Not uploade.";
+ // $message = "Server: [Warnning] --> This file type is not allowed.";
// $uploadOk = 0;
// }
// if everything is ok, try to upload file
if ($uploadOk !== 0) {
if (move_uploaded_file($fileTmpName, $targetFile)) {
- $GeneratedXML .= "" .
- "Server: [Success] --> The file " . $fileName . " has been uploaded.";
+ $type = "success";
+ $message = "Server: [Success] --> The file " . $fileName . " has been uploaded.";
$_SESSION["refreshState"] = "updateListing";
}
} else {
- $GeneratedXML .= "" .
- "Server: [Error] --> Your file " . $fileName . " was not uploaded.";
+ $type = "error";
+ $message .= "\nServer: [Error] --> Your file " . $fileName . " was not uploaded.";
}
}
- echo $GeneratedXML;
+
+ serverMessage($type, $message);
}
// Local program file access
@@ -108,6 +116,9 @@ function openFile($FILE) {
} else if (preg_match('(pdf)', $EXTNSN) === 1) {
shell_exec($PDFVIEWER . ' "' . $FILE . '" > /dev/null &');
}
+
+ $message = "Server: [Success] --> The file " . $FILE . " has been opened server side.";
+ serverMessage("success", $message);
}
@@ -128,8 +139,8 @@ if (isset($_POST["createItem"],
} else if (isset($_POST["media"])) {
openFile($_POST["media"]);
} else {
- echo "" .
- "Server: [Error] --> Incorrect access attempt!";
+ $message = "Server: [Error] --> Incorrect access attempt!";
+ serverMessage("error", $message);
}
?>
diff --git a/resources/php/serverMessanger.php b/resources/php/serverMessanger.php
new file mode 100644
index 0000000..2daedbb
--- /dev/null
+++ b/resources/php/serverMessanger.php
@@ -0,0 +1,7 @@
+";
+ $GeneratedXML .= "" . $MESSAGE ."";
+ echo $GeneratedXML;
+}
+?>