X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=bb5708e9a6f0205f04da0f88e772f8a6d2264a19;hb=37c84adff611afaf4de0c64491ea77c6b3fc3fe6;hp=1e7a509fa8c4fa30e04a1a5e3d30cbfb30022774;hpb=a74cdde6f41804cffbc62f2a3112917f26e66b6e;p=mirrors%2FJukeBox.git diff --git a/index.php b/index.php index 1e7a509..bb5708e 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,7 +202,19 @@ function render_file_line($dir, $item, $dir_url, $index, $filesize, $parent = fa '" target="'.$GLOBALS['flash_player_frame'].'" class="icon ifplay">F/'. 'S'); } - echo(' '.unxss(str_replace('_', ' ', $item)).''.$filesize." MiB \n"); + echo(' '.unxss(str_replace('-',' - ',str_replace('_', ' ', +$item))).''.$filesize." MiB \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("". + ''.$i.'P/'. + 'R'); + if($GLOBALS['useflash']) echo('/F'); + echo('[DIR] '.unxss(str_replace('_', ' ', $item)). + "\n"); } function render_tr_playframe_show() { @@ -330,7 +343,7 @@ if(isset($_GET['blank'])) { -
+
< BACK @@ -363,11 +376,13 @@ if(!isset($_GET['search'])) {
- +
- @@ -382,7 +397,7 @@ if(!isset($_GET['search'])) { ?> - +   @@ -409,8 +424,8 @@ if(!($searchfp = fopen($search_cache, 'r'))) $i = 0; echo(''); render_tr_playframe_show(); -echo(''); while(!feof($searchfp)) { @@ -440,7 +455,8 @@ if($GLOBALS['useflash']) echo('/F'); ?> - + 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("". - '\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)); }
SP'); -if($GLOBALS['useflash']) echo('/F'); +echo('
SP'); +if($GLOBALS['useflash']) echo('/F'); echo('Search: '.unxss($_GET['search']).'
^ [DIR] .. ()
^ [DIR] .. +()
'.$i.'P/'. - 'R'); - if($GLOBALS['useflash']) echo('/F'); - echo('[DIR] '.unxss(str_replace('_', ' ', $item))."