From 7cc572b78d9ab295f9c773d3689c058828aed598 Mon Sep 17 00:00:00 2001
From: Maxim Stewart <maximstewart1@gmail.com>
Date: Sun, 22 Apr 2018 02:11:11 -0500
Subject: [PATCH] Trimming PHPSESSID from query as temp solution.

---
 resources/js/ajax.js      | 21 +++++++++++++++++++--
 resources/php/process.php | 12 ++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/resources/js/ajax.js b/resources/js/ajax.js
index ba51c02..80fb24b 100644
--- a/resources/js/ajax.js
+++ b/resources/js/ajax.js
@@ -1,10 +1,17 @@
-var pathNodes = [];  // Path parts  Could store a cookie to keep sessions
+var pathNodes = [];
 
 function getDirSSE() {
     var path = "";
 
     // Create path from array of items
     for (pathNode of pathNodes) { path += pathNode; }
+
+    // For some reason, PHPSESSID= gets inserted when in sub dir.
+    // temp work arround is to trim it.
+    if (path.includes("PHPSESSID=")) {
+        path = path.split("; ").pop();
+    }
+
     path = "dirQuery=" + path;
     process(path);
 }
@@ -35,10 +42,20 @@ function getDir(query) {
     } else    { pathNodes.push(query); }                   // Add path
 
     // Create path from array of items
-    for (pathNode of pathNodes) { path += pathNode; }
+    // for (pathNode of pathNodes) { path += pathNode; console.log(pathNode); }
+    for (var i = 0; i < pathNodes.length; i++) {
+        path += pathNodes[i];
+    }
+
+    // For some reason, PHPSESSID= gets inserted when in sub dir.
+    // temp work arround is to trim it.
+    if (path.includes("PHPSESSID=")) {
+        path = path.split("; ").pop();
+    }
 
     formULPTH.value    = path;                             // Used when uploading a file
     path               = "dirQuery=" + path;
+    console.log("Path  :  " + path);
     process(path);
 }
 
diff --git a/resources/php/process.php b/resources/php/process.php
index 4b08e5c..9f6b554 100644
--- a/resources/php/process.php
+++ b/resources/php/process.php
@@ -3,16 +3,16 @@
 session_start();
 
 // Retrieve data
-function dirListing($PATH) {
-    if (is_dir($PATH)) {
+function dirListing($NEWPATH) {
+    if (is_dir($NEWPATH)) {
         $GeneratedXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><DIR_LIST>"
-                        . "<PATH_HEAD>" . $PATH . "</PATH_HEAD>";
+                        . "<PATH_HEAD>" . $NEWPATH . "</PATH_HEAD>";
 
-        $dirContents = scandir($PATH);
+        $dirContents = scandir($NEWPATH);
         foreach ($dirContents as $fileName) {
-            $fullPath = $PATH . $fileName;
+            $fullPath = $NEWPATH . $fileName;
 
-            if (is_dir($PATH . $fileName)) {
+            if (is_dir($NEWPATH . $fileName)) {
                $GeneratedXML .= "<DIR>" . $fileName . "/</DIR>";
            } elseif (preg_match('/^.*\.(mkv|avi|flv|mov|m4v|mpg|wmv|mpeg|mp4|webm)$/i', strtolower($fileName))) {
                $NAMEHASH = hash('sha256', $fileName);