X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=a815230649c532846e17b844f77633d45ecf2b4a;hb=097c55fc743c6c33b87ec7c80bada59285017d78;hp=9d2a21d225fc93a7610064a782b77bde48a85e86;hpb=00f09b5d22661038ec3812b05126aa575b4f928c;p=mirrors%2FJukeBox.git

diff --git a/index.php b/index.php
index 9d2a21d..a815230 100755
--- a/index.php
+++ b/index.php
@@ -3,6 +3,7 @@
 Harvie's JuKe!Box
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 Version info:
+ * 0.3.6 - Now sorting also directories and have icon link support in css
  * 0.3.5 - Fixed security bug - directory traversal in filelisting (upgrade recommended)
  * 0.3.4 - Generating playlist for flashplayer, searching for bugs, cleaning code and preparing for new version release
  * 0.3.3 - Shorter URLs for flashplayer (due to discussion at #skola ;o), nicer national characters handling
@@ -204,6 +205,17 @@ function render_file_line($dir, $item, $dir_url, $index, $filesize, $parent = fa
 	echo('&nbsp;</td><td><a href="'.$temp.'">'.unxss(str_replace('_', ' ', $item)).'</a></td><td>'.$filesize."&nbsp;MiB&nbsp;</td></tr>\n");			
 }
 
+function render_dir_line($current_dir, $item, $i) {
+	$parclass=($i%2?'even':'odd'); $parcolor=($i%2?'lightblue':'white');
+	$temp=str_replace('%2F', '/', rawurlencode($current_dir)).rawurlencode($item);
+	echo("<tr class=\"$parclass directory\" bgcolor=\"$parcolor\">".
+	'<td><a href="#up">'.$i.'</a></td><td class="btntd"><a href="?download&playlist&dir='.$temp.'" class="icon iplay">P</a>/'.
+	'<a href="?download&recursive&playlist&dir='.$temp.'" class="icon irplay">R</a>');
+	if($GLOBALS['useflash']) echo('/<a href="?f&playlist&dir='.$temp.'" target="'.$GLOBALS['flash_player_frame'].'" class="icon ifplay">F</a>');
+	echo('</td><td colspan="100%"><span class="icon ifolder">[DIR] </span><a href="?dir='.$temp.'">'.unxss(str_replace('_', ' ', $item)).
+	"</a></td></tr>\n");
+}
+
 function render_tr_playframe_show() {
 	if($GLOBALS['flash_player_frame'] == 'playframe-show' && $GLOBALS['useflash']) { ?>
 <tr id="playframe-tr">
@@ -450,28 +462,34 @@ for($s=2;$s;$s--) { while(($item = readdir($dd)) != false) {
 	if($item == '.' || $item == '..') continue;
 	if(($s==2 && is_file($dir.$item)) || ($s!=2 && is_dir($dir.$item))) continue;
 	$i++;
-	$parclass=($i%2?'even':'odd'); $parcolor=($i%2?'lightblue':'white');
+	//$parclass=($i%2?'even':'odd'); $parcolor=($i%2?'lightblue':'white');
+	if($sort > 1) {
 		if(is_file($dir.$item)) {
-			if($sort > 1) {
-				$i--;
-				$items[] = $item;
-			} else {
-				render_file_line($dir, $item, $music_dir_url, $i, filesize($dir.$item));
-			}
+			$i--;
+			$itemsf[] = $item;
+		}
+		if(is_dir($dir.$item)) {
+			$i--;
+			$itemsd[] = $item;
+		}
+	} else {
+		if(is_file($dir.$item)) {
+			render_file_line($dir, $item, $music_dir_url, $i, filesize($dir.$item));
 		}
 		if(is_dir($dir.$item)) {
-			$temp=str_replace('%2F', '/', rawurlencode($current_dir)).rawurlencode($item);
-			echo("<tr class=\"$parclass directory\" bgcolor=\"$parcolor\">".
-			'<td><a href="#up">'.$i.'</a></td><td class="btntd"><a href="?download&playlist&dir='.$temp.'" class="icon iplay">P</a>/'.
-			'<a href="?download&recursive&playlist&dir='.$temp.'" class="icon irplay">R</a>');
-			if($GLOBALS['useflash']) echo('/<a href="?f&playlist&dir='.$temp.'" target="'.$GLOBALS['flash_player_frame'].'" class="icon ifplay">F</a>');
-			echo('</td><td colspan="100%"><span class="icon ifolder">[DIR] </span><a href="?dir='.$temp.'">'.unxss(str_replace('_', ' ', 
-$item))."</a></td></tr>\n");
+			render_dir_line($current_dir, $item, $i);
 		}
+	}
 } rewinddir($dd); }
+
 if($sort > 1) {
-	@sort($items);
-	foreach($items as $item) {
+	@sort($itemsf);
+	@sort($itemsd);
+	foreach($itemsd as $item) {
+		$i++;
+		render_dir_line($current_dir, $item, $i);
+	}
+	foreach($itemsf as $item) {
 		$i++;
 		render_file_line($dir, $item, $music_dir_url, $i, filesize($dir.$item));
 	}