From cc273d76c088d5f787d27ec36c0a1d2687e65fe2 Mon Sep 17 00:00:00 2001
From: TheTroll <trolldev@gmail.com>
Date: Thu, 18 Mar 2010 18:03:08 +0100
Subject: List folders in first position

---
 bin/files.php | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'bin/files.php')

diff --git a/bin/files.php b/bin/files.php
index 7afe9e1..34db5bf 100755
--- a/bin/files.php
+++ b/bin/files.php
@@ -178,17 +178,38 @@ function filesgetlisting($dir)
 	// Alphabetical sorting
 	sort($medianame_array);
 	
-	$number = 1;
-
+	// List folders
 	foreach($medianame_array as $value)
 	{	
-		$newentry = array();
+		$type = filegettype($dir ."/" .$value);
+
+		if ($type != 'folder')
+			continue;
 
+		$newentry = array();
 		$newentry['name'] = $value;
-		$newentry['path'] = $dir ."/" .$value;
+		$newentry['path'] = $dir ."/" .$value .'/';
+		$newentry['type'] = 'folder';
+
+		$listing[] = $newentry;
+	}
+
+	$number = 1;
+	
+	// List files
+	foreach($medianame_array as $value)
+	{
 
 		$type = filegettype($dir ."/" .$value);
 
+		if ($type == 'folder')
+			continue;
+
+		$newentry = array();
+		$newentry['name'] = $value;
+		$newentry['path'] = $dir ."/" .$value;
+		$newentry['type'] = $type;
+
 		switch ($type)
 		{
 			case 'audio':
@@ -197,10 +218,6 @@ function filesgetlisting($dir)
 				$number++;
 			case 'video':
 			case 'rec':
-			case 'folder':
-				$newentry['type'] = $type;
-				if ($type == 'folder')
-					$newentry['path'] = $newentry['path'] .'/';
 				$listing[] = $newentry;
 				break;
 			default:
-- 
cgit v1.2.3