X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=7ef93890dbfe0a3ca884311073ca70c736776220;hb=de30f73122c2806154388a5ead6bcd9d39e80eb8;hp=a1c866a5fb8a772de4943198f802a7bd39f636fe;hpb=ec0f3a4dccdc96268614d77fe15fa82f3d9463fc;p=mirrors%2FJukeBox.git

diff --git a/index.php b/index.php
index a1c866a..7ef9389 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
@@ -11,7 +12,7 @@ Version info:
  * 0.3   - Migrated to standalone WPAudioPlayer (better, nicer, with more functions)
  * 0.2   - Few new functions (search playlist, random,...)
  * 0.1.1 - Few little fixups, written help.html in Czech language ;o)
- * 0.1   - All functions works - TODO: bugfix & replace ugly code
+ * 0.1   - All functions are working - TODO: bugfix & replace ugly code
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 */
 
@@ -201,20 +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($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%" 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 }
@@ -231,7 +244,8 @@ function render_footer() {
 		'Don\'t be looser, use GNU/Linux! ;P',
 		'Make love and not war!',
 		'Take your chance! Prove yourself!',
-		'This software is free of charge. If you wan\'t to donate, please send some money to children in Africa/etc...'
+		'This software is free of charge. If you wan\'t to donate, please send some money to children in Africa/etc...',
+		'Fork <a href="http://github.com/harvie/jukebox">'.$GLOBALS['title'].'</a> on GIThub :-)<a href="http://github.com/harvie/jukebox"><img style="position: absolute; top: 0; left: 0; border: 0; height:120px; background-color:transparent;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_red_aa0000.png" alt="Fork me on GitHub" /></a>'
 	);
 
 	echo('<span id="quote" style="float: left;"><i><small>'.$quotes[rand(0,sizeof($quotes)-1)]."</small></i></span>\n");
@@ -330,11 +344,11 @@ if(isset($_GET['blank'])) {
 	</head>
 	<body>
 
-<div align="right" style="position: absolute; top: 0; right: 0;">
+<div align="right" style="position: absolute; top: 5px; right: 5px;">
 	<a name="up"></a>
-	<iframe src="about:blank" name="playframe-hide" width="0" height="0" style="border: none;"></iframe><!-- -----------???--------------- -->
+	<iframe src="about:blank" name="playframe-hide" width="0" height="0" style="border: none;" class="hide"></iframe><!-- -----------???--------------- -->
 	<span class="icon">&lt;</span> <a href="javascript: history.go(-1)" class="icon iback">BACK</a>
-	| <a href="?"><span class="icon ihome">HOME</span> (<?=$music_dir?>)</a>
+	| <a href="?" class="icon ihome">HOME&nbsp;(<?=$music_dir?>)</a>
 	| <a href="?help" class="icon ihelp">ABOUT/HELP</a>
 	| <a href="?logout" class="icon ilogout">LOGOUT</a>
 </div>
@@ -363,11 +377,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'])?>"
 		/>
@@ -382,7 +398,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>
@@ -409,8 +425,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)) {
@@ -434,12 +450,14 @@ foreach($indexlist as $index) @readfile($dir.$index);
 <?php render_tr_playframe_show(); ?>
 
 <tr class="directory"><td>&gt;</td>
-<td><a href="?download&playlist&dir=<?=str_replace('%2F', '/', rawurlencode($current_dir))?>">P</a>/<a
-href="?download&recursive&playlist&dir=<?=str_replace('%2F', '/', rawurlencode($current_dir))?>">R</a><?php
-if($GLOBALS['useflash']) echo('/<a href="?f&playlist&dir='.str_replace('%2F', '/', rawurlencode($current_dir)).'"  target="'.$GLOBALS['flash_player_frame'].'">F</a>'); ?>
+<td><a href="?download&playlist&dir=<?=str_replace('%2F', '/', rawurlencode($current_dir))?>" class="icon iplay">P</a>/<a
+href="?download&recursive&playlist&dir=<?=str_replace('%2F', '/', rawurlencode($current_dir))?>" class="icon irplay">R</a><?php
+if($GLOBALS['useflash']) echo('/<a href="?f&playlist&dir='.str_replace('%2F', '/', rawurlencode($current_dir)).'"  target="'.$GLOBALS['flash_player_frame'].'" 
+class="icon ifplay">F</a>'); ?>
 </td>
 <td colspan="100%"><?=unxss($dir)?></td></tr>
-<tr><td>^</td><td>&nbsp;</td><td colspan="100%" class="directory"><span class="icon ifolder">[DIR]</span> <a href="?dir=<?=rawurlencode($parent_dir)?>">.. (<?=$parent_dir?>)</a></td></tr>
+<tr><td>^</td><td>&nbsp;</td><td colspan="100%" class="directory"><span class="icon ifolder">[DIR] </span><a href="?dir=<?=rawurlencode($parent_dir)?>">.. 
+(<?=$parent_dir?>)</a></td></tr>
 <?php
 
 $i = 0;
@@ -448,27 +466,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.'">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));
 	}