From 204033157b6c90aac4d0984513c4dc8d56341749 Mon Sep 17 00:00:00 2001
From: John Campbell <jcampbell1@gmail.com>
Date: Thu, 24 Oct 2019 12:34:14 -0600
Subject: [PATCH] feat: default sort ordering is directory first, then name

---
 index.php | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/index.php b/index.php
index 09e9312..2fb9d85 100644
--- a/index.php
+++ b/index.php
@@ -69,21 +69,26 @@ if($_GET['do'] == 'list') {
 		$result = [];
 		$files = array_diff(scandir($directory), ['.','..']);
 		foreach ($files as $entry) if (!is_entry_ignored($entry, $allow_show_folders, $hidden_patterns)) {
-		$i = $directory . '/' . $entry;
-		$stat = stat($i);
-	        $result[] = [
-	        	'mtime' => $stat['mtime'],
-	        	'size' => $stat['size'],
-	        	'name' => basename($i),
-	        	'path' => preg_replace('@^\./@', '', $i),
-	        	'is_dir' => is_dir($i),
-	        	'is_deleteable' => $allow_delete && ((!is_dir($i) && is_writable($directory)) ||
-                                                           (is_dir($i) && is_writable($directory) && is_recursively_deleteable($i))),
-	        	'is_readable' => is_readable($i),
-	        	'is_writable' => is_writable($i),
-	        	'is_executable' => is_executable($i),
-	        ];
-	    }
+			$i = $directory . '/' . $entry;
+			$stat = stat($i);
+			$result[] = [
+				'mtime' => $stat['mtime'],
+				'size' => $stat['size'],
+				'name' => basename($i),
+				'path' => preg_replace('@^\./@', '', $i),
+				'is_dir' => is_dir($i),
+				'is_deleteable' => $allow_delete && ((!is_dir($i) && is_writable($directory)) ||
+														(is_dir($i) && is_writable($directory) && is_recursively_deleteable($i))),
+				'is_readable' => is_readable($i),
+				'is_writable' => is_writable($i),
+				'is_executable' => is_executable($i),
+			];
+		}
+		usort($result,function($f1,$f2){
+			$f1_key = ($f1['is_dir']?:2) . $f1['name'];
+			$f2_key = ($f2['is_dir']?:2) . $f2['name'];
+			return $f1_key > $f2_key;
+		});
 	} else {
 		err(412,"Not a Directory");
 	}