X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=b87fedcd70277732728001a79f51aed9e4c25ce1;hb=53d2c31cae8909b925e5f3ec8981876c4bcf9883;hp=a1c866a5fb8a772de4943198f802a7bd39f636fe;hpb=ec0f3a4dccdc96268614d77fe15fa82f3d9463fc;p=mirrors%2FJukeBox.git diff --git a/index.php b/index.php index a1c866a..b87fedc 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,18 @@ 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('_', ' ', $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,9 +342,9 @@ if(isset($_GET['blank'])) { -
+
- + < BACK | HOME () | ABOUT/HELP @@ -363,11 +375,13 @@ if(!isset($_GET['search'])) {
- +
- @@ -382,7 +396,7 @@ if(!isset($_GET['search'])) { ?> - +   @@ -434,12 +448,14 @@ foreach($indexlist as $index) @readfile($dir.$index); > -P/RF'); ?> +P/RF'); ?> -^ [DIR] .. () +^ [DIR] .. +() 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("". - ''.$i.'P/'. - 'R'); - if($GLOBALS['useflash']) echo('/F'); - echo('[DIR] '.unxss(str_replace('_', ' ', $item))."\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)); }