From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 5 Jul 2015 19:03:57 +0000 (+0200)
Subject: baculum: Fix sorting files and directories in restore files browser
X-Git-Tag: Release-7.2.0~33
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=014314a58c2f2e26a9544f66c9333c13abbd53f1;p=bacula%2Fbacula

baculum: Fix sorting files and directories in restore files browser
---

diff --git a/gui/baculum/protected/Class/Miscellaneous.php b/gui/baculum/protected/Class/Miscellaneous.php
index f44e0b7930..cf149e9b80 100644
--- a/gui/baculum/protected/Class/Miscellaneous.php
+++ b/gui/baculum/protected/Class/Miscellaneous.php
@@ -1,7 +1,18 @@
 <?php
 
-// small sorting callback function to sort by name
-function sortListByName($a, $b) {
+/*
+ * Small sorting callback function to sort files and directories by name.
+ * Function keeps '.' and '..' names always in the beginning of array.
+ * Used to sort files and directories from Bvfs.
+ */
+function sortFilesListByName($a, $b) {
+	$firstLeft = substr($a['name'], 0, 1);
+	$firstRight = substr($b['name'], 0, 1);
+	if ($firstLeft == '.' && $firstRight != '.') {
+		return -1;
+	} else if ($firstRight == '.' && $firstLeft != '.') {
+		return 1;
+	}
 	return strcasecmp($a['name'], $b['name']);
 }
 
@@ -210,7 +221,7 @@ class Miscellaneous extends TModule {
 				$elements[] = array('pathid' => $match['pathid'], 'filenameid' => $match['filenameid'], 'fileid' => $match['fileid'], 'jobid' => $match['jobid'], 'lstat' => $match['lstat'], 'name' => $match['name'], 'type' => 'file'); 
 			}
 		}
-		usort($elements, 'sortListByName');
+		usort($elements, 'sortFilesListByName');
 		return $elements;
 	}