From a7f27dd4873488a14e6b3aa8b257b267bad6c3b2 Mon Sep 17 00:00:00 2001
From: Maxim Stewart <maximstewart1@gmail.com>
Date: Sun, 19 Aug 2018 13:51:20 -0500
Subject: [PATCH] Cleaned up logic, setting up for favorites list, changed file
 upload design.

---
 README.md                           |   8 +-
 index.html                          |   5 +-
 resources/db/webfm.db               | Bin 0 -> 16384 bytes
 resources/js/ajax.js                |  88 ++++++---------------
 resources/js/filesystemActions.js   | 114 ++++++++++++++++++++++------
 resources/js/passwordFieldInsert.js |   4 +-
 resources/js/xmlParser.js           |  35 +++++----
 resources/php/config.php            |   1 +
 resources/php/dbController.php      |  64 ++++++++++++++++
 resources/php/filesystemActions.php |  54 +++++++------
 resources/php/getDirList.php        |   7 +-
 resources/php/lockedFolders.php     |   2 +-
 12 files changed, 242 insertions(+), 140 deletions(-)
 create mode 100644 resources/db/webfm.db
 create mode 100644 resources/php/dbController.php

diff --git a/README.md b/README.md
index 905588e..fde407f 100644
--- a/README.md
+++ b/README.md
@@ -10,18 +10,20 @@ WebFM is a media and file viewer aspiring to become a full fledged file manager
 6. Double click the text name to change the file's or folder's name and press enter to set it.
 7. Right-click to get context menu options.
 8. Place an image such as a jpg, png, or gif labeled "000.itsExtension" in a directory then the viewer will use it as the background image for that folder/directory.
+9. Password protect folder based on resources/php/config.php file setting.
 
 Notes:
-1. Folders and files CAN NOT have & or '  in the names. Otherwise, you can't access that item with the viewer.
+1. Folders and files CAN NOT have & in the names. Otherwise, you can't access that item with the viewer.
 3. The provided folders except "resources" are optional. You can add and remove them as you please.
 4. The media and image pane can be moved by dragging from the transparentish bar that has the close button and other controls.
 5. Edit the resources/php/config.php file and put your own programs there.
+6. Edit your php.ini file "upload_max_filesize" and "post_max_size" to be higher to upload larger files.
 
 # TO-DO
 1. Allow for move and copy.
-3. Fixed the ' issue but & remains a problem.
+3. Fix & problem.
 4. Implement themes functionality.
-5. Allow users and groups to password protect based on account type.
+
 
 # Images
 ![1 Home](Images/1.png)
diff --git a/index.html b/index.html
index 12dc572..2bea4df 100644
--- a/index.html
+++ b/index.html
@@ -35,9 +35,9 @@
 
     <div id="popOutControls" style="display:none;">
         <center>
-        <form action="resources/php/filesystemActions.php" method="post" enctype="multipart/form-data" target="FormSubmitter">
+        <form>
             <input class="ulFile" type="file" title="files To Upload" name="filesToUpload[]" data-multiple-caption="{count} files selected" multiple />
-            <input type="submit" name="UploadFiles" title="Upload File(s)" value="Upload File(s)" />
+            <input type="button" onclick="uploadFiles()" name="UploadFiles" title="Upload File(s)" value="Upload File(s)" />
             <input type="reset" title="Clear" id="CLEARBTTN" value="Clear" style="display:none;">
             <input type="text" id="DIRPATHUL" name="DIRPATHUL" value="">
         </form>
@@ -56,7 +56,6 @@
 
     <!-- Uploader processor -->
     <div id="serverMsgView" style="display:none;">
-        <iframe id="FormSubmitter" name="FormSubmitter" frameborder="0" ></iframe>
     </div>
 
     <script type="text/javascript" src="resources/js/passwordFieldInsert.js" charset="utf-8"></script>
diff --git a/resources/db/webfm.db b/resources/db/webfm.db
new file mode 100644
index 0000000000000000000000000000000000000000..633291d66bef54f854c0d078ba0b763acd752887
GIT binary patch
literal 16384
zcmeI#K}*9h6u|Lh8-*5TcPog4u+sz)L3X!FyjTyLoy=P+c2e9X*q|prfZs*Ik7!m`
zQFa(RR{nuD=}XId@7GhVhEZ-ZHGO=Vr$!x%j*wEEC?$kw{ko)G@2;NhRE}kA(`bpq
zz0bD)DjNPk_yhlA=WWv`>?42x0tg_000IagfB*sr{A&SwMtrYJgXfMD1c98J^mdj_
z)90)xZ;i8&4r8t2@HEn@SH^m(@3~2Sm$;YV<iIXx`QjmQV?BwzecSKRHa!nLC+K$N
zOPROGjL8@GMKw47X0O8E1zhNxp9-$SXsoLe+ROZ%ZHnMs1Q0*~0R#|0009ILKmY**
z5U85~=l{C>G3rGC0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I|sE;0yjJ
BHx2**

literal 0
HcmV?d00001

diff --git a/resources/js/ajax.js b/resources/js/ajax.js
index 53618fa..847f2da 100644
--- a/resources/js/ajax.js
+++ b/resources/js/ajax.js
@@ -1,5 +1,3 @@
-var pathNodes = [];
-
 // SSE events if supported
 if(typeof(EventSource) !== "undefined") {
     var source = new EventSource("resources/php/sse.php");
@@ -12,70 +10,14 @@ if(typeof(EventSource) !== "undefined") {
     console.log("SSE Not Supported In Browser...");
 }
 
-function getDir(query) {
-    var formUlPth  = document.getElementById("DIRPATHUL");
-    var mergeType  = document.getElementById("MergeType");
-    var passwd = undefined;
-    var path       = "";
-    var cookies    = "";
-    var dirCookie  = "";
+function doAjax(actionPath, data) {
+    var xhttp = new XMLHttpRequest();
 
-    // push or pop to path list
-    if (query === "/") {
-        // Process path from cookie and set to array/list
-        dirCookie = getCookie("dirQuery");
-        if (dirCookie != "" && dirCookie != "./") {
-            dirCookie = dirCookie.split("/");
-            dirCookie.pop(); // account for ending empty slot
-
-            var size = dirCookie.length;
-            for (var i = 0; i < size; i++) {
-                pathNodes.push(dirCookie[i] + "/");
-            }
-        } else {
-            pathNodes = [];
-            pathNodes.push("." + query);
-        }
-    } else if (query === "../") {
-        // Only remove while not in root
-        if (pathNodes.length > 1) {
-            pathNodes.pop();
-        }
-    } else if (query === "./") {
-        // Do nothing since re-scanning dir
-    } else    {
-        pathNodes.push(query); // Add path
-    }
-
-    // Create path from array of items
-    for (pathNode of pathNodes) { path += pathNode; }
-
-    try {
-        passwd = document.getElementById("PASSWD").value;
-    } catch (e) {
-        passwd = "";
-    }
-
-    // Setup upload path for form and make a cookie for persistence during browser session....
-    formUlPth.value = path;
-    path            = "dirQuery=" + encodeURIComponent(path);
-    document.cookie = path + "; expires=Sun, 31 Dec 2034 12:00:00 UTC";
-    path            +="&mergeType=" + mergeType.checked
-                    + "Here&passwd=" + passwd;
-
-    process(path);
-}
-
-// Get dir info...
-function process(path) {
-    var xhttp = new XMLHttpRequest();   // Create the xhttp object
-
-    // This is actually run after open and send are done
     xhttp.onreadystatechange = function() {
         if (this.readyState === 4 && this.status === 200) {
             // Send the returned data to further process
             if (this.responseXML != null) {
-                updateHTMLDirList(this.responseXML);
+                handleXMLReturnData(this.responseXML);
             } else {
                 document.getElementById('dynDiv').innerHTML =
                 "<p class=\"error\" style=\"width:100%;text-align:center;\"> "
@@ -83,8 +25,26 @@ function process(path) {
             }
         }
     };
-    xhttp.open("POST", "resources/php/getDirList.php", true);        // Open the connection
+
+    xhttp.open("POST", actionPath, true);
     xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-    xhttp.overrideMimeType('application/xml');                       // Force return to be XML
-    xhttp.send(path);                                                // Start the process
+    xhttp.overrideMimeType('application/xml'); // Force return to be XML
+    xhttp.send(data);
+}
+
+function fileUploader(data) {
+    var xhttp = new XMLHttpRequest();
+
+    xhttp.onreadystatechange = function() {
+        if (this.readyState === 4 && this.status === 200) {
+            // Send the returned data to further process
+            if (this.responseXML != null) {
+                handleXMLReturnData(this.responseXML);
+            }
+        }
+    };
+
+    xhttp.open("POST", "resources/php/filesystemActions.php", true);
+    xhttp.overrideMimeType('application/xml'); // Force return to be XML
+    xhttp.send(data);
 }
diff --git a/resources/js/filesystemActions.js b/resources/js/filesystemActions.js
index 752338f..16cf1d7 100644
--- a/resources/js/filesystemActions.js
+++ b/resources/js/filesystemActions.js
@@ -1,16 +1,80 @@
-var itemObj = undefined;
+var itemObj   = undefined;
+var binary    = null;
+var pathNodes = [];
 
-function renameItem(obj) {
-    var path      = encodeURIComponent(document.getElementById("path").innerHTML);
-    var oldName   = encodeURIComponent(formerFileName);
-    var newName   = encodeURIComponent(obj.value);
-    var formData  = "renameItem=true&oldName=" + oldName + "&newName=" + newName + "&path=" + path;
 
-    console.log("Old name:  " + oldName);
-    console.log("New name:  " + newName);
+function getDir(query) {
+    var formUlPth  = document.getElementById("DIRPATHUL");
+    var mergeType  = document.getElementById("MergeType");
+    var passwd     = undefined;
+    var data       = "";
+    var cookies    = "";
+    var dirCookie  = "";
 
-    doFSAction("resources/php/filesystemActions.php",
-               formData);
+    // push or pop to path list
+    if (query === "/") {
+        // Process path from cookie and set to array/list
+        dirCookie = getCookie("dirQuery");
+        if (dirCookie != "" && dirCookie != "./") {
+            dirCookie = dirCookie.split("/");
+            dirCookie.pop(); // account for ending empty slot
+
+            var size = dirCookie.length;
+            for (var i = 0; i < size; i++) {
+                pathNodes.push(dirCookie[i] + "/");
+            }
+        } else {
+            pathNodes = [];
+            pathNodes.push("." + query);
+        }
+    } else if (query === "../") {
+        // Only remove while not in root
+        if (pathNodes.length > 1) {
+            pathNodes.pop();
+        }
+    } else if (query === "./") {
+        // Do nothing since re-scanning dir
+    } else    {
+        pathNodes.push(query); // Add path
+    }
+
+    // Create path from array of items
+    for (pathNode of pathNodes) { data += pathNode; }
+
+    try {
+        passwd = document.getElementById("PASSWD").value;
+    } catch (e) {
+        passwd = "";
+    }
+
+    // Setup upload path for form and make a cookie for persistence during browser session....
+    formUlPth.value = data;
+    data            = "dirQuery=" + encodeURIComponent(data);
+    document.cookie = data + "; expires=Sun, 31 Dec 2034 12:00:00 UTC";
+    data            +="&mergeType=" + mergeType.checked
+                    + "Here&passwd=" + passwd;
+
+    doAjax("resources/php/getDirList.php", data);
+}
+
+async function uploadFiles() {
+    var toUpload = document.getElementsByName("filesToUpload[]")[0];
+    var path     = document.getElementById("path").innerHTML;
+    var reader   = new FileReader();
+    var data     = new FormData();
+    var size     = toUpload.files.length;
+
+    data.append("UploadFiles", "trut");
+    data.append("DIRPATHUL", path);
+
+    // Add files
+    if (size > 0) {
+        for (var i = 0; i < size; i++) {
+            data.append("filesToUpload[]", toUpload.files[i]);
+        }
+    }
+
+    fileUploader(data);
 }
 
 function createItem(type) {
@@ -20,8 +84,8 @@ function createItem(type) {
     newItem.value = "";
     fullPth       = encodeURIComponent(fullPth);
 
-    doFSAction("resources/php/filesystemActions.php",
-               "createItem=true&item=" + fullPth + "&type=" + type);
+    doAjax("resources/php/filesystemActions.php",
+           "createItem=true&item=" + fullPth + "&type=" + type);
 }
 
 function startDeleteItem(item) {
@@ -37,8 +101,8 @@ function deleteItem() {
         fullPth     = encodeURIComponent(fullPth);
         var answer  = confirm("Are you sure you want to delete: " + fullPth);
         if (answer == true) {
-            doFSAction("resources/php/filesystemActions.php",
-                       "deleteItem=true&item=" + fullPth);
+            doAjax("resources/php/filesystemActions.php",
+                   "deleteItem=true&item=" + fullPth);
 
             console.log("Deleted:  " + fullPth);
             itemObj = null;
@@ -46,14 +110,20 @@ function deleteItem() {
     }
 }
 
-function openInLocalProg(media) {
-    doFSAction("resources/php/filesystemActions.php",
-               "media=" + media);
+function renameItem(obj) {
+    var path      = encodeURIComponent(document.getElementById("path").innerHTML);
+    var oldName   = encodeURIComponent(formerFileName);
+    var newName   = encodeURIComponent(obj.value);
+    var formData  = "renameItem=true&oldName=" + oldName + "&newName=" + newName + "&path=" + path;
+
+    console.log("Old name:  " + oldName);
+    console.log("New name:  " + newName);
+
+    doAjax("resources/php/filesystemActions.php",
+            formData);
 }
 
-function doFSAction(actionPath, data) {
-    var xhttp = new XMLHttpRequest();
-    xhttp.open("POST", actionPath, true);
-    xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-    xhttp.send(data);
+function openInLocalProg(media) {
+    doAjax("resources/php/filesystemActions.php",
+           "media=" + media);
 }
diff --git a/resources/js/passwordFieldInsert.js b/resources/js/passwordFieldInsert.js
index 5ba436a..0a07f74 100644
--- a/resources/js/passwordFieldInsert.js
+++ b/resources/js/passwordFieldInsert.js
@@ -1,5 +1,5 @@
-function createPassField(returnData) {
-    var msg = returnData.getElementsByTagName('MESSAGE')[0].innerHTML;
+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);
 
diff --git a/resources/js/xmlParser.js b/resources/js/xmlParser.js
index 3b77af5..9c4b054 100644
--- a/resources/js/xmlParser.js
+++ b/resources/js/xmlParser.js
@@ -1,20 +1,27 @@
 const insertArea = document.getElementById('dynDiv');
 
-async function updateHTMLDirList(returnData) {
-    try {
-        var dirPath = returnData.getElementsByTagName('PATH_HEAD')[0].innerHTML;
-    } catch (e) {
-        createPassField(returnData);
-        return;
-    }
 
-    var dirs       = returnData.getElementsByTagName('DIR');
-    var videos     = returnData.getElementsByTagName('VID_FILE');
-    var images     = returnData.getElementsByTagName('IMG_FILE');
-    var files      = returnData.getElementsByTagName('FILE');
-    var dirImg     = "resources/images/icons/folder.png";
-    var i          = 0;
-    var size       = 0;
+function handleXMLReturnData(data) {
+    if (data.activeElement.tagName == "DIR_LIST") {
+        updateHTMLDirList(data);
+    } else if (data.activeElement.tagName == "LOCK_MESSAGE") {
+        createPassField(data);
+    } else if (data.activeElement.tagName == "SERV_MSG") {
+        console.log(document.getElementById("serverMsgView"));
+        document.getElementById("serverMsgView").appendChild(data.activeElement);
+    }
+}
+
+
+async function updateHTMLDirList(data) {
+    var dirPath = data.getElementsByTagName('PATH_HEAD')[0].innerHTML;
+    var dirs    = data.getElementsByTagName('DIR');
+    var videos  = data.getElementsByTagName('VID_FILE');
+    var images  = data.getElementsByTagName('IMG_FILE');
+    var files   = data.getElementsByTagName('FILE');
+    var dirImg  = "resources/images/icons/folder.png";
+    var i       = 0;
+    var size    = 0;
 
     // Insert dirs
     document.getElementById("path").innerHTML = dirPath;
diff --git a/resources/php/config.php b/resources/php/config.php
index 5a12446..f2f5d0c 100644
--- a/resources/php/config.php
+++ b/resources/php/config.php
@@ -7,6 +7,7 @@
     $PDFVIEWER       = "evince";
     $TEXTVIEWER      = "leafpad";
     $FILEMANAGER     = "spacefm";
+    // NOTE:  Split folders with ::::
     $LOCKEDFOLDERS   = "./dirLockCheck/";
     $LOCKPASSWORD    = "1234";
 ?>
diff --git a/resources/php/dbController.php b/resources/php/dbController.php
new file mode 100644
index 0000000..dcb88a3
--- /dev/null
+++ b/resources/php/dbController.php
@@ -0,0 +1,64 @@
+<?php
+session_start();
+
+function getTabLinks() {
+    $db = new SQLite3('resources/db/webfm.db');
+
+    if($db === false){
+        die("ERROR: Could not connect to db.");
+    }
+
+    $res = $db->query('Select * FROM faves');
+    $GeneratedXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><TABS_LIST>";
+    while ($row = $res->fetchArray(SQLITE3_ASSOC)) {
+        $GeneratedXML .= "<TAB_ID>" . $row['id'] . "</TAB_ID>" .
+                         "<TAB_LINK>" . $row['link'] . "</TAB_LINK>";
+    }
+    $GeneratedXML .= "</TABS_LIST>";
+    echo $GeneratedXML;
+}
+
+function addLink($PATHID, $PATH) {
+    $db = new SQLite3('resources/db/webfm.db');
+
+    if($db === false){
+        die("ERROR: Could not connect to db.");
+    }
+
+    $stmt = $db->prepare('INSERT INTO faves VALUES(:id,:link)');
+    $stmt->bindValue(":id", $PATHID, SQLITE3_TEXT);
+    $stmt->bindValue(":link", $PATH, SQLITE3_TEXT);
+
+    $stmt->execute();
+}
+
+function deleteLink($PATHID) {
+    $db = new SQLite3('resources/db/webfm.db');
+
+    if($db === false){
+        die("ERROR: Could not connect to db.");
+    }
+
+    $stmt = $db->prepare('DELETE FROM faves WHERE id = :id');
+    $stmt->bindValue(":id", $PATHID, SQLITE3_TEXT);
+    $stmt->execute();
+}
+
+
+// Determin action
+chdir("../../");
+if (isset($_POST['getTabs'])) {
+    getTabLinks();
+} elseif (isset($_POST['addLink'],
+          $_POST['pathID'],
+          $_POST['linkPath'])) {
+    addLink($_POST['pathID'], $_POST['linkPath']);
+} elseif (isset($_POST['deleteLink'],
+                $_POST['pathID'])) {
+    deleteLink($_POST['pathID']);
+} else {
+    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><SERV_MSG class='error'>" .
+         "Server: [Error] --> Illegal Access Method!</SERV_MSG>";
+}
+
+?>
diff --git a/resources/php/filesystemActions.php b/resources/php/filesystemActions.php
index b088366..80c74a2 100644
--- a/resources/php/filesystemActions.php
+++ b/resources/php/filesystemActions.php
@@ -38,13 +38,9 @@ function renameItem($OLDFILE, $NEWNAME, $PATH) {
 
 // Uploader
 function uploadFiles($targetDir) {
-    echo "<!DOCTYPE html>"
-        . "<head>"
-        . "<link type='text/css' rel='stylesheet' href='../css/base.css'/>"
-        . "<link type='text/css' rel='stylesheet' href='../css/main.css'/>"
-        . "</head><body>";
-
+    $GeneratedXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
     $numberOfFiles = count($_FILES['filesToUpload']['name']);
+
     for ($i=0; $i < $numberOfFiles; $i++) {
         $uploadOk = 1;
         $fileName = $_FILES['filesToUpload']['name'][$i];
@@ -55,9 +51,11 @@ function uploadFiles($targetDir) {
         if (file_exists($targetFile)) {
             if (is_file($targetFile)) {
                 unlink($targetFile);
-                echo "<span class='warnning'>Server: [Warnning] --> This file already exists. Overwriting it.</span>";
+                $GeneratedXML .= "<SERV_MSG class='warnning'>" .
+                     "Server: [Warnning] --> This file already exists. Overwriting it.</SERV_MSG>";
             } else {
-                echo "<span class='warnning'>Server: [Warnning] --> This file might be a directory. Or, no files were submitted for uploading.</span>";
+                $GeneratedXML .= "<SERV_MSG class='warnning'>" .
+                     "Server: [Warnning] --> This file might be a directory. Or, no files were submitted for uploading.</SERV_MSG>";
                 $uploadOk = 0;
             }
         }
@@ -65,35 +63,31 @@ function uploadFiles($targetDir) {
         // Check file size
         $fileSize = $_FILES['filesToUpload']['size'][$i];
         if ($fileSize > 500000000000) {
-            echo "<span class='warnning'>Server: [Warnning] --> This file is too large.</span>";
+            $GeneratedXML .= "<SERV_MSG class='warnning'>" .
+                 "Server: [Warnning] --> This file is too large.</SERV_MSG>";
             $uploadOk = 0;
         }
 
         // Allow certain file formats
         // $ext = pathinfo($targetFile,PATHINFO_EXTENSION);
-        // if($ext != "rar" && $ext != "iso" && $ext != "img" && $ext != "tar"
-        // && $ext != "zip" && $ext != "7z" && $ext != "7zip" && $ext != "jpg"
-        // && $ext != "png" && $ext != "jpeg" && $ext != "gif" && $ext != "mpeg"
-        // && $ext != "MOV" && $ext != "flv" && $ext != "avi" && $ext != "mp4"
-        // && $ext != "mov" && $ext != "mp3" && $ext != "m4a" && $ext != "ogg"
-        // && $ext != "mkv" && $ext != "docx" && $ext != "doc" && $ext != "odt"
-        // && $ext != "txt" && $ext != "pdf" && $ext != "webm" && $ext != "M4A"
-        //                                                 && $ext != "mpg" ) {
-        //     echo "<span class='warnning'>This file type is not allowed. File Not uploade.</span>";
+        // 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 .= "<SERV_MSG class='warnning'>This file type is not allowed. File Not uploade.</SERV_MSG>";
         //     $uploadOk = 0;
         // }
 
         // if everything is ok, try to upload file
         if ($uploadOk !== 0) {
             if (move_uploaded_file($fileTmpName, $targetFile)) {
-                echo "<span class='success'>Server: [Success] --> The file " . $fileName . " has been uploaded.</span>";
+                $GeneratedXML .= "<SERV_MSG class='success'>" .
+                     "Server: [Success] --> The file " . $fileName . " has been uploaded.</SERV_MSG>";
                 $_SESSION["refreshState"] = "updateListing";
             }
         } else {
-            echo "<span class='error'>Server: [Error] --> Your file " . $fileName . " was not uploaded.</span>";
+            $GeneratedXML .= "<SERV_MSG class='error'>" .
+                 "Server: [Error] --> Your file " . $fileName . " was not uploaded.</SERV_MSG>";
         }
     }
-    echo "</body></html>";
+    echo $GeneratedXML;
 }
 
 // Local program file access
@@ -118,20 +112,24 @@ function openFile($FILE) {
 
 
 chdir("../../");
-if (isset($_POST["createItem"]) && isset($_POST["item"]) && isset($_POST["type"])) {
+if (isset($_POST["createItem"],
+          $_POST["item"],
+          $_POST["type"])) {
     createItem($_POST["item"], $_POST["type"]);
-} else if (isset($_POST["deleteItem"]) && isset($_POST["item"])) {
+} else if (isset($_POST["deleteItem"], $_POST["item"])) {
     deleteItem($_POST["item"]);
-} else if (isset($_POST["renameItem"]) && isset($_POST["oldName"]) && isset($_POST["newName"]) && isset($_POST["path"])) {
+} else if (isset($_POST["renameItem"],
+                 $_POST["oldName"],
+                 $_POST["newName"],
+                 $_POST["path"])) {
     renameItem($_POST["oldName"], $_POST["newName"], $_POST["path"]);
-} else if(isset($_POST["UploadFiles"]) && isset($_POST["DIRPATHUL"])) {
+} else if(isset($_POST["UploadFiles"], $_POST["DIRPATHUL"])) {
     uploadFiles($_POST["DIRPATHUL"]);
 } else if (isset($_POST["media"])) {
     openFile($_POST["media"]);
 } else {
-    echo "<span style='color:rgb(255, 0, 0);'>Server: [Error] --> Incorrect access attempt!</span>";
+    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><SERV_MSG class='error'>" .
+         "Server: [Error] --> Incorrect access attempt!</SERV_MSG>";
 }
 
-
-
 ?>
diff --git a/resources/php/getDirList.php b/resources/php/getDirList.php
index c056457..afeab66 100644
--- a/resources/php/getDirList.php
+++ b/resources/php/getDirList.php
@@ -16,8 +16,8 @@ function startListing($NEWPATH, $MERGESEASSONS, $PASSWD) {
             echo $GeneratedXML;
         } else {
             $GeneratedXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-                          . "<MESSAGE>Folder is locked."
-                          . "</MESSAGE>";
+                          . "<LOCK_MESSAGE>Folder is locked."
+                          . "</LOCK_MESSAGE>";
             echo $GeneratedXML;
         }
     }
@@ -76,7 +76,8 @@ chdir("../../");
 if (isset($_POST['dirQuery'])) {
     startListing(trim($_POST['dirQuery']), $_POST['mergeType'], $_POST['passwd']);
 } else {
-    echo "<h2 class='error'>Error! Illegal Access Method!</h2>";
+    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><SERV_MSG class='error'>" .
+         "Server: [Error] --> Incorrect access attempt!</SERV_MSG>";
 }
 
 ?>
diff --git a/resources/php/lockedFolders.php b/resources/php/lockedFolders.php
index a5a51b4..e76ec25 100644
--- a/resources/php/lockedFolders.php
+++ b/resources/php/lockedFolders.php
@@ -6,7 +6,7 @@
         $LOCKS = explode("::::", $LOCKEDFOLDERS);
         $size  = sizeof($LOCKS);
 
-        if ($_SESSION["unlockTime"] > 0) {
+        if (isset($_SESSION["unlockTime"]) && $_SESSION["unlockTime"] > 0) {
             return false;
         }