X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=6c13be1c91d36d293f791851959de114437f2c1e;hb=4641c2f0ed0ed505df32a6bec7f126b4dd1d4747;hp=91b2afb7de3b3a1c0ddaeccbdf31ffdbdcc932bc;hpb=aa3a0f3272105445bd4f6de949c0ccf70a16fad3;p=mirrors%2FJukeBox.git

diff --git a/index.php b/index.php
index 91b2afb..6c13be1 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
@@ -201,31 +202,32 @@ function render_file_line($dir, $item, $dir_url, $index, $filesize, $parent = fa
 			'" target="'.$GLOBALS['flash_player_frame'].'" class="icon ifplay">F</a>/'.
 			'<a href="?blank" target="'.$GLOBALS['flash_player_frame'].'" class="icon ifstop">S</a>');
 	}
-	echo('&nbsp;</td><td><a href="'.$temp.'">'.unxss(str_replace('_', ' ', $item)).'</a></td><td>'.$filesize."&nbsp;MiB&nbsp;</td></tr>\n");			
+	echo('&nbsp;</td><td class="maximize-width"><a href="'.$temp.'">'.unxss(str_replace('-',' - ',str_replace('_', ' ', 
+$item))).'</a></td><td>'.$filesize."&nbsp;MiB&nbsp;</td></tr>\n");			
 }
 
-function render_dir_line($item, $i) {
-	$parclass=($i%2?'even':'odd'); $parcolor=($index%2?'lightblue':'white');
+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)).
+	echo('</td><td colspan="100%" class="maximize-width"><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">
-<td><a href="?blank" target="playframe-show" title="Stop playback">S</a></td>
+<td><a href="?blank" target="playframe-show" title="Stop playback" class="icon ifstop">S</a></td>
 <td colspan="100%">
 <iframe
 src="?blank"
 name="playframe-show"
 width="100%"
 height="24"
-style="border: none;"
+style="border:none;"
 transparentpagebg="yes"
 ></iframe></td></tr>
 	<?php }
@@ -374,11 +376,13 @@ if(!isset($_GET['search'])) {
 <span style="float: right;">
 	<form action="?" method="GET" align="right" style="display: inline;">
 		<input type="hidden" name="download" value="" />
-		<input type="number" name="random" value="<?=$default_random_count?>" />
+		<input type="number" min="1" name="random" value="<?=$default_random_count?>" style="width:4em;" title="how many randomly selected tracks should be in 
+playlist?" 
+/>
 		<input type="submit" value="random" title="Generate random music playlist..." />
 	</form>
 	<form action="?" method="GET" align="right" style="display: inline;">
-		<input type="search" name="search" autofocus placeholder="search regexp..."
+		<span class="icon isearch"></span><input type="search" name="search" autofocus placeholder="search regexp..."
 			title="Search in music/google/lyrics/mp3/youtube; Hint: You can use regular expressions in search query..."
 			value="<?=unxss($_GET['search'])?>"
 		/>
@@ -393,7 +397,7 @@ if(!isset($_GET['search'])) {
 ?>
 <span style="float: right;">
 	<form action="?" method="POST" align="right">
-		<input type="password" name="cache-refresh" value="" title="Password for refreshing - good for avoiding DoS Attacks!!!" />
+		<input type="password" name="cache-refresh" value="" style="width:5em;" title="Password for refreshing - good for avoiding DoS Attacks!!!" />
 		<input type="submit" value="refresh cache" title="You should refresh cache each time when you add new music or upgrade to newer version of JuKe!Box !!!" />
 	&nbsp;
 	</form>
@@ -420,8 +424,8 @@ if(!($searchfp = fopen($search_cache, 'r')))
 $i = 0;
 echo('<table border="1" width="100%">');
 render_tr_playframe_show();
-echo('<tr><td>S</td><td><a href="?download&playlist&search='.unxss($_GET['search']).'">P</a>');
-if($GLOBALS['useflash']) echo('/<a href="?f&playlist&search='.unxss($_GET['search']).'" target="'.$GLOBALS['flash_player_frame'].'">F</a>');
+echo('<tr class="directory"><td>S</td><td><a href="?download&playlist&search='.unxss($_GET['search']).'" class="icon iplay">P</a>');
+if($GLOBALS['useflash']) echo('/<a href="?f&playlist&search='.unxss($_GET['search']).'" target="'.$GLOBALS['flash_player_frame'].'" class="icon ifplay">F</a>');
 echo('</td><td colspan="100%">Search: '.unxss($_GET['search']).'</td></tr>');
 
 while(!feof($searchfp)) {
@@ -476,7 +480,7 @@ for($s=2;$s;$s--) { while(($item = readdir($dd)) != false) {
 			render_file_line($dir, $item, $music_dir_url, $i, filesize($dir.$item));
 		}
 		if(is_dir($dir.$item)) {
-			render_dir_line($item, $i);
+			render_dir_line($current_dir, $item, $i);
 		}
 	}
 } rewinddir($dd); }
@@ -486,7 +490,7 @@ if($sort > 1) {
 	@sort($itemsd);
 	foreach($itemsd as $item) {
 		$i++;
-		render_dir_line($item, $i);
+		render_dir_line($current_dir, $item, $i);
 	}
 	foreach($itemsf as $item) {
 		$i++;