windows path fixes

diskoverdata · Oct 18, 2023 · 5737ef0 · 5737ef0
1 parent 9780b95
commit 5737ef0
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 6 deletions.
diff --git a/diskover-web/CHANGELOG.md b/diskover-web/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Diskover-web v2 Community Edition Change Log
 
+# [2.2.1] - 2023-10-17
+### fixed
+- Windows issues
+
+
 # [2.2.0] - 2023-10-07
 ### fixed
 - slow logins when indexing

diff --git a/diskover-web/public/d3_inc.php b/diskover-web/public/d3_inc.php
@@ -59,7 +59,7 @@ function get_dir_info($client, $index, $path) {
             ]
         ];
     } else {
-        $p = escape_chars(dirname($path));
+        $p = escape_chars(getDirName($path));
         $f = escape_chars(basename($path));
         $searchParams['body'] = [
             'size' => 1,

diff --git a/diskover-web/public/results.php b/diskover-web/public/results.php
@@ -136,7 +136,7 @@
                             $splitpath = explode('/', $path);
                             $x = substr_count($_SESSION['rootpath'], '/');
                             $splitpath = array_slice($splitpath, $x);
-                            $pathfull = dirname($_SESSION['rootpath']);
+                            $pathfull = getDirName($_SESSION['rootpath']);
                             if ($pathfull == '/') $pathfull = '';
                             $n = 0;
                             foreach ($splitpath as $pathitem) {

diff --git a/diskover-web/src/diskover/Diskover.php b/diskover-web/src/diskover/Diskover.php
@@ -557,7 +557,7 @@ function setRootPath($p) {
 function getRootPath($p)
 {
     if ($p == $_SESSION['toppath']) return $p;
-    $p = dirname($p);
+    $p = getDirName($p);
     if ($p == '/') return $p;
     if ($p != '' && $p != '.') {
         return getRootPath($p);
@@ -566,6 +566,17 @@ function getRootPath($p)
 }
 
 
+// return parent directory path and handle Windows backslash
+function getDirName($path)
+{
+    $p = dirname($path);
+    if ($p == '/' || $p == '\\') {
+        return '/';
+    }
+    return $p;
+}
+
+
 // remove index from globals and session vars
 function removeIndex($index, $uuid = null)
 {
@@ -906,7 +917,7 @@ function changePercent($a, $b)
 function getParentDir($p)
 {
     if (strlen($p) > strlen($_SESSION['rootpath'])) {
-        return dirname($p);
+        return getDirName($p);
     } else {
         return $_SESSION['rootpath'];
     }

diff --git a/diskover-web/src/diskover/version.php b/diskover-web/src/diskover/version.php
@@ -17,4 +17,4 @@
 */
 
 // diskover-web version
-$VERSION = '2.2.0 community edition (ce)';
+$VERSION = '2.2.1 community edition (ce)';
diff --git a/diskover/CHANGELOG.md b/diskover/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Diskover v2 Community Edition Change Log
 
+# [2.2.1] - 2023-10-17
+### changed
+- version change only
+
+
 # [2.2.0] - 2023-10-07
 ### fixed
 - python error when scanning file/directory with invalid future timestamps causing scan to exit with critical error

diff --git a/diskover/diskover.py b/diskover/diskover.py
@@ -42,7 +42,7 @@
     get_file_name, load_plugins, list_plugins, get_plugins_info, set_times, \
     get_mem_usage, get_win_path, rem_win_path
 
-version = '2.2.0 community edition (ce)'
+version = '2.2.1 community edition (ce)'
 __version__ = version
 
 # Windows check