From: Harvie <tomas@mudrunka.cz>
Date: Mon, 24 May 2010 02:46:22 +0000 (+0200)
Subject: upgraded to version 0.3.5
X-Git-Tag: 0.3.5
X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=fa66dda599c20cf96e6d27eae592da79a3e5321e;p=mirrors%2FJukeBox.git

upgraded to version 0.3.5
---

diff --git a/example_config.php b/example_config.php
new file mode 100755
index 0000000..302d87f
--- /dev/null
+++ b/example_config.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ * Harvie's JuKe!Box configuration file.
+ *
+ * Quick Instalation HowTo:
+ * 1.) Change $passwd and $music_dir_url!
+ * 2.) Rename to: _config.php
+ * 3.) Place your music into the $music_dir ($music_dir_url must lead to the same directory on web)
+ * 4.) create file jbx/cache.db writeable by webserver (set permissions)
+ * 5.) Refresh search database using $cache_passwd on search page
+ */
+//Config-basic
+$title =                'Harvie\'s&nbsp;JuKe!Box'; //Title of jukebox
+$music_dir =            './music'; //Local path to directory with music
+$music_dir_url =        'http://your-server.net/jukebox/music'; //URL path to the same directory CHANGE IT!
+$cache_passwd =         'renew123'; //You need this passwd to refresh search cache CHANGE IT!
+//Login
+$realm =		'music';//Banner
+$user =			'music';//User
+$passwd =		'Default-Secr3t_PaSsw0rd'; //Password CHANGE IT!
+$require_login = 	true;
+//More search engines
+/*
+$search_engines = array_merge($search_engines, array(
+        'Harvie\'s blog!'                   => 'http://blog.harvie.cz/?s='
+));
+*/
+//Bonuses
+if(isset($bonus_dir) && is_dir($bonus_dir)) {
+	$css_file =             $bonus_dir.'/themes/default/jukebox.css'; //CSS (Design/Theme)
+}
diff --git a/favicon.png b/favicon.png
new file mode 100755
index 0000000..b37b263
Binary files /dev/null and b/favicon.png differ
diff --git a/http_auth.php b/http_auth.php
index 3a6e120..6a0d892 100755
--- a/http_auth.php
+++ b/http_auth.php
@@ -1 +1 @@
-<?php
//Harvie's PHP HTTP-Auth script (2oo7)
//CopyLefted4U ;)
///SETTINGS//////////////////////////////////////////////////////////////////////////////////////////////////////
//Login
$realm = 'music'; //This is used by browser to identify protected area and saving passwords (one_site+one_realm==one_user+one_password)
$user = 'music'; //User
$passwd = 'music'; //Password
//Misc
$require_login = true; //Require login? (if false, no login needed) - WARNING!!!
$location = '401'; //Location after logout - 401 = default logout page (can be overridden by ?logout=[LOCATION])
//CopyLeft
$ver = '2oo7-3.8';
$link = '<a href="https://harvie.ath.cx/">harvie.ath.cx</a>';
$banner = "Harvie's PHP HTTP-Auth script (v$ver)";
$hbanner = "<hr /><i>$banner\n-\n$link</i>\n";
$cbanner = "<!-- $banner -->\n";
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//MANUAL/////////////////////////////////////////////////////////////////////////////////////////////////////////
/* HOWTO
 * To each file, you want to lock add this line (at begin of first line - Header-safe):
 * <?php require_once('http_auth.php'); ?> //Password Protection 8')
 * Protected file have to be php script (if it's html, simply rename it to .php)
 * Server needs to have PHP as module (not CGI).
 * You need HTTP Basic auth enabled on server and php.
 */
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////CODE/////////////////////////////////////////////////////////////////////////////////////////////////////////
  function send_auth_headers($realm='') {
    Header('WWW-Authenticate: Basic realm="'.$realm.'"');
    Header('HTTP/1.0 401 Unauthorized');
  }
  
  function check_auth($PHP_AUTH_USER, $PHP_AUTH_PW) { //Check if login is succesfull (U can modify this to use DB, or anything else)
    return (($PHP_AUTH_USER == $GLOBALS['user']) && ($PHP_AUTH_PW == $GLOBALS['passwd']));
  }
    
  function unauth() { //Do this when login fails
    $cbanner = $GLOBALS['cbanner'];
    $hbanner = $GLOBALS['hbanner'];
    die("$cbanner<title>401 - Forbidden</title>\n<h1>401 - Forbidden</h1>\n<a href=\"?\">Login...</a>\n$hbanner"); //Show warning and die
    die(); //Don't forget!!!
  }

//Back-Compatibility
if(isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_PW'] != '') $PHP_AUTH_USER = $_SERVER['PHP_AUTH_USER'];
if(isset($_SERVER['PHP_AUTH_PW']) && $_SERVER['PHP_AUTH_PW'] != '') $PHP_AUTH_PW = $_SERVER['PHP_AUTH_PW'];

//Logout
if(isset($_GET['logout'])) { //script.php?logout
  if(isset($PHP_AUTH_USER) || isset($PHP_AUTH_PW)) {
    Header('WWW-Authenticate: Basic realm="'.$realm.'"');
    Header('HTTP/1.0 401 Unauthorized');
  } else {
    if($_GET['logout'] != '') $location = $_GET['logout'];
    if(trim($location) != '401') Header('Location: '.$location);
    die("$cbanner<title>401 - Log out successfull</title>\n<h1>401 - Log out successfull</h1>\n<a href=\"?\">Continue...</a>\n$hbanner");
  }
}

if($require_login) {
  if(!isset($PHP_AUTH_USER)) { //Storno or first visit of page
    send_auth_headers($realm);
    unauth();
  } else { //Login sent
    
    if (check_auth($PHP_AUTH_USER, $PHP_AUTH_PW)) { //Login succesfull - probably do nothing
    } else { //Bad login
      send_auth_headers($realm);
      unauth();
    }
    
  }
}
//Rest of file will be displayed only if login is correct

+<?php
//Harvie's PHP HTTP-Auth script (2oo7)
//CopyLefted4U ;)
///SETTINGS//////////////////////////////////////////////////////////////////////////////////////////////////////
//Login
$realm = 'music'; //This is used by browser to identify protected area and saving passwords (one_site+one_realm==one_user+one_password)
$user = 'music'; //User
$passwd = 'passw'; //Password
//Misc
$require_login = true; //Require login? (if false, no login needed) - WARNING!!!
$location = '401'; //Location after logout - 401 = default logout page (can be overridden by ?logout=[LOCATION])
//CopyLeft
$ver = '2oo7-3.8';
$link = '<a href="https://blog.harvie.cz/">Harvie.cz</a>';
$banner = "Harvie's PHP HTTP-Auth script (v$ver)";
$hbanner = "<hr /><i>$banner\n-\n$link</i>\n";
$cbanner = "<!-- $banner -->\n";
//Config file
@include('./_config.php');
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//MANUAL/////////////////////////////////////////////////////////////////////////////////////////////////////////
/* HOWTO
 * To each file, you want to lock add this line (at begin of first line - Header-safe):
 * <?php require_once('http_auth.php'); ?> //Password Protection 8')
 * Protected file have to be php script (if it's html, simply rename it to .php)
 * Server needs to have PHP as module (not CGI).
 * You need HTTP Basic auth enabled on server and php.
 */
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////CODE/////////////////////////////////////////////////////////////////////////////////////////////////////////
  function send_auth_headers($realm='') {
    Header('WWW-Authenticate: Basic realm="'.$realm.'"');
    Header('HTTP/1.0 401 Unauthorized');
  }
  
  function check_auth($PHP_AUTH_USER, $PHP_AUTH_PW) { //Check if login is succesfull (U can modify this to use DB, or anything else)
    return (($PHP_AUTH_USER == $GLOBALS['user']) && ($PHP_AUTH_PW == $GLOBALS['passwd']));
  }
    
  function unauth() { //Do this when login fails
    $cbanner = $GLOBALS['cbanner'];
    $hbanner = $GLOBALS['hbanner'];
    die("$cbanner<title>401 - Forbidden</title>\n<h1>401 - Forbidden</h1>\n<a href=\"?\">Login...</a>\n$hbanner"); //Show warning and die
    die(); //Don't forget!!!
  }

//Back-Compatibility
if(isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_PW'] != '') $PHP_AUTH_USER = $_SERVER['PHP_AUTH_USER'];
if(isset($_SERVER['PHP_AUTH_PW']) && $_SERVER['PHP_AUTH_PW'] != '') $PHP_AUTH_PW = $_SERVER['PHP_AUTH_PW'];

//Logout
if(isset($_GET['logout'])) { //script.php?logout
  if(isset($PHP_AUTH_USER) || isset($PHP_AUTH_PW)) {
    Header('WWW-Authenticate: Basic realm="'.$realm.'"');
    Header('HTTP/1.0 401 Unauthorized');
  } else {
    if($_GET['logout'] != '') $location = $_GET['logout'];
    if(trim($location) != '401') Header('Location: '.$location);
    die("$cbanner<title>401 - Log out successfull</title>\n<h1>401 - Log out successfull</h1>\n<a href=\"?\">Continue...</a>\n$hbanner");
  }
}

if($require_login) {
  if(!isset($PHP_AUTH_USER)) { //Storno or first visit of page
    send_auth_headers($realm);
    unauth();
  } else { //Login sent
    
    if (check_auth($PHP_AUTH_USER, $PHP_AUTH_PW)) { //Login succesfull - probably do nothing
    } else { //Bad login
      send_auth_headers($realm);
      unauth();
    }
    
  }
}
//Rest of file will be displayed only if login is correct
\ No newline at end of file
diff --git a/index.php b/index.php
index 2e1b5b1..f8edbdb 100755
--- a/index.php
+++ b/index.php
@@ -1,23 +1,31 @@
 <?php require_once('./http_auth.php'); /*Delete this line to disable password protection*/ ?>
-<?php /*
+<?php $exec_time = round(microtime(true), 3); /*
 Harvie's JuKe!Box
-///////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 Version info:
- 0.2	- Few new functions (search playlist, random,...)
- 0.1.1	- Few little fixups, written help.html in Czech language ;D
- 0.1	- All functions works - TODO: bugfix & replace ugly code
-///////////////////////////////////////////////////////////////////////
+ * 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
+ * 0.3.2 - Better support for national charsets, few small bugfixes, css improvements, modular search engines
+ * 0.3.1 - Buckfickses in m3u generation, better navigation, magic_quotes_gpc handled, css improvements
+ * 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
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 */
 
 //Config-basic
 $title = 		'Harvie\'s&nbsp;JuKe!Box'; //Title of jukebox
 $music_dir = 		'./music'; //Local path to directory with music
-$music_dir_url = 	'http://192.168.2.163/pub/m3gen/music'; //URL path to same directory
-//$music_dir_url = 	'http://music.harvie.cz/music';
-//$music_dir_url = 	'http://softz.harvie.cz/jukebox/demo/music';
-$cache_passwd = 	'reload'; //You need this passwd to refresh search cache
+$music_dir_url = 	'http://your-server.net/jukebox/music'; //URL path to the same directory
+$cache_passwd = 	'renew123'; //You need this passwd to refresh search cache
 $sort =			3; //Sort? 0 = none, 1 = playlists, 2 = 1+listings; 3 = 2+search-EXPERIMENTAL! (sorting could eat lot of memory)
-$access_limit =		20; //How many files could be accessed without using cache (while searching)
+$access_limit =		40; //How many files could be accessed without using cache (while searching)
+
+//Encoding settins
+$charset =		'UTF-8'; //Charset for page
+$national_characters =	1; //Support searching in filenames with national characters? 0 = no; 1 = yes; (may slowdown search a little)
 
 //Playlist settings
 $playlist_name = 	'playlist.m3u'; //Name of downloaded pl
@@ -26,19 +34,52 @@ $default_random_count =	30; //How many random songs by defaul?
 
 //External files
 $indexlist = 		array('index.html', 'index.txt'); //Search for this file in each directory
-$bonus_dir =		'./jukebox-bonus'; //Misc. files directory
+$bonus_dir =		'./jbx'; //Misc. files directory
+////
 $search_cache = 	$bonus_dir.'/cache.db'; //Database for searching music (php +rw) - .htaccess: Deny from all!!!
-$flash_player =		$bonus_dir.'/musicplayer.swf'; //path to musicplayer
-$css_file =		$bonus_dir.'/jukebox.css'; //CSS
+$css_file =		$bonus_dir.'/themes/default/jukebox.css'; //CSS (Design)
+$favicon_file =		'./favicon.png'; //favicon
 $header_file =		$bonus_dir.'/header.html'; //header file
 $footer_file =		$bonus_dir.'/footer.html'; //footer file
 
+//Search engines extend search experience
+$search_engines = array(
+	'Google.com' 			=> 'http://google.com/search?q=',
+	'Images' 			=> 'http://google.com/images?q=',
+	'Karaoke-Lyrics.net' 		=> 'http://www.karaoke-lyrics.net/index.php?page=find&q=',
+	'Jyxo.cz multimedia' 		=> 'http://jyxo.cz/s?d=mm&q=',
+	'Centrum.cz mp3' 		=> 'http://search.centrum.cz/index.php?sec=mp3&q=',
+	'YOUTube.com' 			=> 'http://youtube.com/results?search_query='
+);
+
+//Flash MusicPlayer (info about settings: http://wpaudioplayer.com/standalone)
+$flash_player_swf =	$bonus_dir.'/player.swf'; //path to musicplayer
+$flash_player_frame =	'playframe-show'; //FlashPlayer Target (playframe-show|playframe-hide) - usefull for compatibility with old music player
+$flash_player_options = '?bg=000099&loader=000000&tracker=AAAAFF&skip=FFFFFF' //.'&leftbg=000077&rightbg=000077&righticon=999999'
+                        .'&autostart=yes&initialvolume=100&soundFile='; //& arguments (urlencoded song url will be added)
+
 //Security
-error_reporting(0);
+error_reporting(0); //This will disable error reporting, wich can pass sensitive data to users
+
+//External configuration file (overrides index.php configuration)
+@include('./_config.php');
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 //Init
 srand(time());
+@ini_set('magic_quotes_gpc' , 'off');
+if(get_magic_quotes_gpc()) die("Error: magic_quotes_gpc needs to be disabled!\n");
+
+//Enable flash?
+$useflash = is_file($flash_player_swf);
+
+//Little magic with directories ;o)
 $current_dir = ereg_replace('/+', '/', '/'.$_GET['dir'].'/');
+if(eregi('(/|\\\\)\\.\\.(/|\\\\)', $current_dir)) { //check for directory traversal ;)
+	header('Location: ?');
+	die('Error - directory not found!');
+}
 $dir = $music_dir.$current_dir;
 $url = $music_dir_url.$current_dir;
 $parent_dir = dirname($current_dir);
@@ -57,26 +98,54 @@ function serve_download($filename) {
 	header('X-PHP-Application: Harvie\'s JuKe!Box');
 }
 
-function generate_m3u($dir, $prefix='', $recursive=0) {
+$nchars_f = array('Á','Ä','Č','Ç','Ď','É','Ě','Ë','Í','Ň','Ó','Ö','Ř','Š','Ť','Ú','Ů','Ü','Ý','Ž','á','ä','č','ç','ď','é','ě','ë','í','ň','ó','ö','ř','š','ť','ú','ů','ü','ý','ž');
+$nchars_t = array('A','A','C','C','D','E','E','E','I','N','O','O','R','S','T','U','U','U','Y','Z','a','a','c','c','d','e','e','e','i','n','o','o','r','s','t','u','u','u','y','z');
+
+function unational($text) {
+	if(!$GLOBALS['national_characters']) return $text;
+	return(str_replace($GLOBALS['nchars_f'], $GLOBALS['nchars_t'], $text));
+}
+
+function generate_m3u($dir, $prefix='', $recursive=0, $nl="\r\n", $doubleenc=0) {
 	$dir = $dir . '/';
-	$dd = opendir($dir);
-	while(($item = readdir($dd)) != false) {
-        	if($item == '.' || $item == '..') continue;
-                if( is_file($dir.$item) && eregi(('\.('.$GLOBALS['m3u_exts'].')$'), $item) ) {
-			if($GLOBALS['sort'] > 0) {
-				$temp[] = $item;
-			} else {
-				echo($prefix.'/'.str_replace('%2F', '/', (rawurlencode($dir.$item)))."\r\n");
+	if(isset($_GET['newline'])) $nl = $_GET['newline'];
+	if(!isset($_GET['search'])) {
+		$dd = opendir($dir);
+		while(($item = readdir($dd)) != false) {
+        		if($item == '.' || $item == '..') continue;
+	                if( is_file($dir.$item) && eregi(('\.('.$GLOBALS['m3u_exts'].')$'), $item) ) {
+				if($GLOBALS['sort'] > 0) {
+					$temp[] = $item;
+				} else {
+					$item=($prefix.'/'.str_replace('%2F', '/', (rawurlencode($dir.$item))).$nl);
+					if($doubleenc) $item = rawurlencode($item);
+					echo($item);
+				}
+			}
+	                if($recursive && is_dir($dir.$item)) {
+				generate_m3u($dir.$item, $prefix, $recursive, $nl, $doubleenc);
+	                }
+		}
+	} else {
+		if(!($searchfp = fopen($GLOBALS['search_cache'], 'r')))
+			die("Cannot read cache from $outfile<br />Refresh cache or set permissions properly!<br />\n");
+		while(!feof($searchfp)) {
+			$line = trim(fgets($searchfp));
+			if(@eregi(str_replace(' ', '(.*)', unational($_GET['search'])), unational($line))) {
+				$line=(dirname($GLOBALS['music_dir_url']).'/'.str_replace('%2F', '/', (rawurlencode($line))).$nl);
+				if($doubleenc) $line = rawurlencode($line);
+				echo($line);
 			}
 		}
-                if($recursive && is_dir($dir.$item)) {
-			generate_m3u($dir.$item, $prefix);
-                }
 	}
+
 	if($GLOBALS['sort'] > 0) {
 		@sort($temp);
-		foreach($temp as $item)
-			echo($prefix.'/'.str_replace('%2F', '/', (rawurlencode($dir.$item)))."\r\n");
+		foreach($temp as $item) {
+			$temp=($prefix.'/'.str_replace('%2F', '/', (rawurlencode($dir.$item))).$nl);
+			if($doubleenc) $temp = rawurlencode($temp);
+			echo($temp);
+		}
 	}
 }
 
@@ -117,35 +186,108 @@ function generate_search_cache($dir, $outfile) {
 }
 
 function render_file_line($dir, $item, $dir_url, $index, $filesize, $parent = false) {
-	$parclass=($index%2?"even":"odd"); $parcolor=($index%2?"lightblue":"white");
+	$parclass=($index%2?'even':'odd'); $parcolor=($index%2?'lightblue':'white');
 	$temp=str_replace('&', '%26', dirname($dir_url)).'/'.str_replace('%2F', '/', (rawurlencode($dir.$item)));
 	if(is_numeric($filesize)) $filesize = round($filesize/(1024*1024), 2);
-	echo("<tr class=\"$parclass\" bgcolor=\"$parcolor\">".'<td>'.$index.'</td><td>');
-	echo('<a href="?download&song='.rawurlencode($temp).'">P</a>');
+	echo("<tr class=\"$parclass\" bgcolor=\"$parcolor\">".'<td><a href="#up">'.$index.'</a></td><td class="btntd">');
+	echo('<a href="?download&song='.rawurlencode($temp).'" class="icon iplay">P</a>');
 	if($parent) {
 		echo('/<a href="?dir='.
 			substr(str_replace(array('&','%2F'), array('%26','/'), (rawurlencode(dirname($dir.$item)))), strlen($GLOBALS['music_dir'])).
-			'">D</a>');
+			'" class="icon ifolder">D</a>');
 	}
-	if(is_file($GLOBALS['flash_player']) && eregi(('\.('.$GLOBALS['m3u_exts'].')$'), $item)) {
-		/*echo('/<object type="application/x-shockwave-flash" width=17 height=17  data="'.
-		$GLOBALS['flash_player'].'?song_url='.rawurlencode($temp).'"></object>');*/
-		echo('/<a href="'.$GLOBALS['flash_player'].'?autoplay=true&song_url='.rawurlencode($temp).'" target="playframe">F</a>/'.
-		'<a href="about:blank" target="playframe">S</a>');
+	if($GLOBALS['useflash'] && eregi(('\.('.$GLOBALS['m3u_exts'].')$'), $item)) {
+		echo('/<a href="?f&song='.rawurlencode($temp).
+			'" 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.'">'.str_replace('_', ' ', $item).'</a></td><td>'.$filesize."&nbsp;MiB&nbsp;</td></tr>\n");			
+	echo('&nbsp;</td><td><a href="'.$temp.'">'.unxss(str_replace('_', ' ', $item)).'</a></td><td>'.$filesize."&nbsp;MiB&nbsp;</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 colspan="100%">
+<iframe
+src="?blank"
+name="playframe-show"
+width="100%"
+height="24"
+style="border: none;"
+transparentpagebg="yes"
+></iframe></td></tr>
+	<?php }
+}
+
+function render_footer() {
+	$quotes = array(
+		'This is NOT advertisments. This is just good text to think about... Remove it if you want!',
+		'Downloading without sharing and other forms of leeching equals STEALING! ;P',
+		'Do NOT support Microsoft!!! Use Linux! ;D',
+		'Don\'t steal! Steal and share!!! ;P',
+		'Linux is not matter of price, it\'s matter of freedom!',
+		'This software brought to you by <a href="http://blog.Harvie.cz">Harvie</a> free of charge! Of course...',
+		'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...'
+	);
+
+	echo('<span id="quote" style="float: left;"><i><small>'.$quotes[rand(0,sizeof($quotes)-1)]."</small></i></span>\n");
+	echo('<span id="exectime" style="float: right;"><small>Page was generated in '.(round(microtime(true), 3) - $GLOBALS['exec_time']).' 
+seconds</small></span>');
+	@readfile($GLOBALS['footer_file']);
+	echo('</body></html>');
 }
 
 function unxss($string) {
-	return str_replace(
-		array('&', '"', '\'', '<', '>'),
-		array('&amp;', '&quot;', '&#039;', '&lt;', '&gt;'),
-		$string);
+	return htmlspecialchars($string);
+}
+
+function explode_path($dir) {
+	$dir = substr($dir, strlen($GLOBALS['music_dir'])+1);
+	$temp = split('/', ereg_replace('/+', '/', $dir));
+	$out = '';
+	for($j=sizeof($temp)-1;$j>0;$j--) {
+		$dir = '';
+		for($i=0;$i<(sizeof($temp)-$j);$i++) {
+			$dir.=$temp[$i].'/';
+		}
+		$out.='<a href="?dir='.rawurlencode($dir).'">'.unxss($temp[$i-1]).'</a>/';
+	}
+	return('<a href="?">.</a>/'.$out);
+}
+
+function flash_mp3_player() {
+	?>
+<html><head><title><?=$GLOBALS['title']?>: Flash Music Player Plugin</title>
+<style> * { margin: 0; padding: 0; border: 0; } </style></head><body>
+<object width="100%" height="344">
+        <embed src="<?php
+		echo($GLOBALS['flash_player_swf'].$GLOBALS['flash_player_options']);
+		if(isset($_GET['song'])) echo(rawurlencode($_GET['song']));
+		if(isset($_GET['playlist'])) generate_m3u($GLOBALS['dir'], dirname($GLOBALS['music_dir_url']), isset($_GET['recursive']), ',', true);
+	?>"
+                type="application/x-shockwave-flash"
+                allowscriptaccess="never"
+                allowfullscreen="true"
+                transparentpagebg="yes" 
+                quality="low"
+                width="100%" height="24px"                
+        >You need Adobe Flash enabled browser to play records directly in website.</embed>
+</object></body></html>
+<?php die();
 }
 
 //GET
 if(isset($_GET['download'])) serve_download($playlist_name);
-if(isset($_GET['song'])) die($_GET['song']."\r\n");
+if(isset($_GET['f'])) flash_mp3_player();
+if(isset($_GET['song'])) {
+	die($_GET['song']."\r\n");
+}
+
+
 
 if($_POST['cache-refresh'] == $cache_passwd) {
 	generate_search_cache($music_dir, $search_cache);
@@ -153,18 +295,8 @@ if($_POST['cache-refresh'] == $cache_passwd) {
 }
 
 if(isset($_GET['playlist'])) {
-	if(!isset($_GET['search'])) {
-		generate_m3u($dir, dirname($music_dir_url), isset($_GET['recursive']));
-	} else {
-		if(!($searchfp = fopen($search_cache, 'r')))
-			die("Cannot read cache from $outfile<br />Refresh cache or set permissions properly!<br />\n");
-		while(!feof($searchfp)) {
-			$line = trim(fgets($searchfp));
-			if(@eregi(str_replace(' ', '(.*)', $_GET['search']), $line)) 
-				echo(dirname($music_dir_url).'/'.str_replace('%2F', '/', (rawurlencode($line)))."\r\n");
-		}
-	}
-	die("\n");
+	generate_m3u($dir, dirname($music_dir_url), isset($_GET['recursive']));
+	die();
 }
 
 if(isset($_GET['random'])) {
@@ -177,16 +309,34 @@ if(isset($_GET['random'])) {
 		for($j=0; $j<rand(0, $flen-1); $j++) fgets($searchfp);
 		echo(dirname($music_dir_url).'/'.str_replace('%2F', '/', (rawurlencode(trim(fgets($searchfp)))))."\r\n");
 	}
-	die("\n");
+	die();
+}
+
+if(isset($_GET['blank'])) {
+	?>
+	<link rel="stylesheet" type="text/css" href="<?=$css_file?>" />
+	<body class="blank"><div class="blank"><b>Music player</b> <small><i>(click 'F' link next to the song name to start, 'S' to stop...)</i></small></div></body>
+	<?php die();
 }
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<link rel="stylesheet" type="text/css" href="<?=$css_file?>">
+<meta http-equiv="Content-Type" content="text/html; charset=<?=$charset?>" />
+<html>
+	<head>
+		<link rel="stylesheet" type="text/css" href="<?=$css_file?>" />
+		<link rel="shortcut icon" href="<?=$favicon_file?>" />
+		<link href="<?=$favicon_file?>" rel="icon" type="image/gif" />
+	</head>
+	<body>
 
 <div align="right" style="position: absolute; top: 0; right: 0;">
-	<iframe src="about:blank" name="playframe" width="0" height="0" style="border: none;"></iframe>
-	&lt; <a href="javascript: history.go(-1)">BACK</a> | <a href="?">HOME (<?=$music_dir?>)</a> | <a href="?help">ABOUT/HELP</a> | <a href="?logout">LOGOUT</a>
+	<a name="up"></a>
+	<iframe src="about:blank" name="playframe-hide" width="0" height="0" style="border: none;"></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="?help" class="icon ihelp">ABOUT/HELP</a>
+	| <a href="?logout" class="icon ilogout">LOGOUT</a>
 </div>
 
 <?php
@@ -196,17 +346,21 @@ if(isset($_GET['help'])) {
 	die();
 }
 
+
 if(!isset($_GET['search'])) {
-	echo('<title>'.$title.': '.$dir.'</title>');
-	echo('<a href="?" style="color: black;"><h1>'.$title.'</h1></a><h2>Index of: '.$dir.'</h2>');
+	echo('<title>'.$title.': '.unxss($dir).'</title>');
+	echo('<a href="?" style="color: black;"><h1 style="float: left;">'.$title.'</h1></a><h2 style="clear: left; display: inline; float: left;">Index of: '.explode_path($dir).'</h2>');
 } else {
 	echo('<title>'.$title.': '.unxss($_GET['search']).'</title>');
-	echo('<a href="?" style="color: black;"><h1>'.$title.'</h1></a><h2>Searching for: '.unxss($_GET['search']).'</h2>');
-}
+	echo('<a href="?" style="color: black;"><h1 style="float: left;">'.$title.'</h1></a><h2 style="clear: left; display: inline; float: left;">Searching for: '.unxss($_GET['search']).'</h2>');
 
 ?>
 
-<div align="right">
+<?php
+}
+
+?>
+<span style="float: right;">
 	<form action="?" method="GET" align="right" style="display: inline;">
 		<input type="hidden" name="download" value="" />
 		<input type="text" name="random" value="<?=$default_random_count?>" />
@@ -219,56 +373,57 @@ if(!isset($_GET['search'])) {
 		/>
 		<input type="submit" value="search" title="Search in this JuKe!Box..." />
 	</form>
-</div><br /><?php
+</span><?php
 
-if(isset($_GET['search'])) {
+if(!isset($_GET['search'])) {
+	echo('<br style="clear: both;" />');
+} else {
 
-?><div align="right">
-	<form action="http://google.com/search" method="GET" align="right" style="display: inline;">
-		<input type="text" name="q" value="<?=unxss($_GET['search'])?>" />
-		<input type="submit" value="google" title="Search on Google..." />
-	</form>
-	<form action="http://www.elyricsworld.com/search.php?phrase=marley" method="GET" align="right" style="display: inline;">
-		<input type="text" name="phrase" value="<?=unxss($_GET['search'])?>" />
-		<input type="submit" value="lyrics" title="Search for lyrics on internet..." />
-	</form>
-	<form action="http://jyxo.cz/s" method="GET" align="right" style="display: inline;">
-		<input type="hidden" name="d" value="mm" />
-		<input type="text" name="q" value="<?=unxss($_GET['search'])?>" />
-		<input type="submit" value="jyxo multimedia" title="Search media on internet..." />
-	</form>
-	<form action="http://youtube.com/results" method="GET" align="right" style="display: inline;">
-		<input type="text" name="search_query" value="<?=unxss($_GET['search'])?>" />
-		<input type="submit" value="youtube" title="Search on YOUTube..." />
-	</form>
-</div><br />
-<div align="right">
+?>
+<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="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>
-</div><?php
-echo('Search DB size: '.(filesize($search_cache)/1024)." kB<br />\n");
+</span>
+<div align="right" style="clear: right;" title="Aditional search engines...">
+<br />
+<?php
+	$search_prefix = 0;
+	foreach($search_engines as $search_desc => $search_link) {
+		if(!$search_prefix) {
+			echo(unxss($_GET['search'])." @\n");
+			$search_prefix = 1;
+		}
+		echo('<a href="'.$search_link.rawurlencode($_GET['search']).'">'.$search_desc."</a>;\n");
+	}
+?>
+</div><br style="clear: both;" />
+<?php
+echo('<small>Search DB size: '.(filesize($search_cache)/1024)." kB<br /></small>\n");
 
 if(!($searchfp = fopen($search_cache, 'r')))
 	die("Cannot read cache from $outfile<br />Refresh cache or set permissions properly!<br />\n");
 
 $i = 0;
 echo('<table border="1" width="100%">');
-echo('<tr><td>S</td><td><a href="?download&playlist&search='.unxss($_GET['search']).'">P</a></td><td colspan="100%">Search: '.unxss($_GET['search']).'</td></tr>');
+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('</td><td colspan="100%">Search: '.unxss($_GET['search']).'</td></tr>');
+
 while(!feof($searchfp)) {
 	$line = trim(fgets($searchfp));
-	$parclass=($i%2?"even":"odd"); $parcolor=($i%2?"lightblue":"white");
-	if(@eregi(str_replace(' ', '(.*)', $_GET['search']), $line)) {
+	$parclass=($i%2?'even':'odd'); $parcolor=($i%2?'lightblue':'white');
+	if(@eregi(str_replace(' ', '(.*)', unational($_GET['search'])), unational($line))) {
 		$i++;
-		echo("<tr class=\"$parclass\" bgcolor=\"$parcolor\">");
 		$filesize = 0; if($i <= $access_limit) $filesize = filesize($line); else $filesize = 'n/a';
 		render_file_line('', $line, $music_dir_url, $i, $filesize, true);
-		echo("</tr>\n");
 	}
 }
-echo("</table>Total: $i results...<br />");
-die();
+echo('<tr><td colspan="100%">Total: '.$i.' results...</td></tr></table>');
+render_footer(); die();
 
 }
 @readfile($header_file);
@@ -276,11 +431,15 @@ foreach($indexlist as $index) @readfile($dir.$index);
 ?>
 <br />
 <table border="1" width="100%">
-<tr><td>&gt;</td>
-<td><b><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></b></td>
-<td colspan="100%"><?=$dir?></td></tr>
-<tr><td>^</td><td>&nbsp;</td><td colspan="100%">[DIR] <a href="?dir=<?=rawurlencode($parent_dir)?>">.. (<?=$parent_dir?>)</a></td></tr>
+<?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>
+<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>
 <?php
 
 $i = 0;
@@ -289,7 +448,7 @@ 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(is_file($dir.$item)) {
 			if($sort > 1) {
 				$i--;
@@ -300,10 +459,11 @@ for($s=2;$s;$s--) { while(($item = readdir($dd)) != false) {
 		}
 		if(is_dir($dir.$item)) {
 			$temp=str_replace('%2F', '/', rawurlencode($current_dir)).rawurlencode($item);
-			echo("<tr class=\"$parclass\" bgcolor=\"$parcolor\">".
-			'<td>'.$i.'</td><td><a href="?download&playlist&dir='.$temp.'">P</a>/'.
-			'<a href="?download&recursive&playlist&dir='.$temp.'">R</a></td>'.
-			'<td colspan="100%">[DIR] <a href="?dir='.$temp.'">'.str_replace('_', ' ', $item)."</a></td></tr>\n");
+			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");
 		}
 } rewinddir($dd); }
 if($sort > 1) {
@@ -317,18 +477,4 @@ if($sort > 1) {
 ?></table>
 
 <?php
-$quotes = array(
-	'This is NOT advertisments. This is just good text to think about... Remove it if you want!',
-	'Downloading without sharing and other forms of leeching equals STEALING! ;P',
-	'Do NOT support Microsoft!!! Use Linux! ;D',
-	'Don\'t steal! Steal and share!!! ;P',
-	'Linux is not matter of price, it\'s matter of freedom!',
-	'This software brought to you by <a href="http://blog.Harvie.cz">Harvie</a> free of charge! Of course...',
-	'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...'
-);
-
-echo('<i>'.$quotes[rand(0,sizeof($quotes)-1)]."</i>\n");
-@readfile($footer_file);
+render_footer();
diff --git a/jukebox-bonus/.htaccess b/jbx/.htaccess
similarity index 100%
rename from jukebox-bonus/.htaccess
rename to jbx/.htaccess
diff --git a/jukebox-bonus/copying b/jbx/COPYING
similarity index 51%
rename from jukebox-bonus/copying
rename to jbx/COPYING
index 30baeb6..a0321ec 100755
--- a/jukebox-bonus/copying
+++ b/jbx/COPYING
@@ -1,3 +1,18 @@
+License for WP Audio Player (http://wpaudioplayer.com/)
+
+Audio Player is released under the Open Source MIT license, which gives you the possibility to use it and modify it in every circumstance.
+Player was downloaded from http://wpaudioplayer.com/download
+
+Copyright (c) 2008 Martin Laine
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+----------------------------------------------License for OBSOLETE player (not needed in newer versions)-------------------------
+
 License for musicplayer (you can get source codes @ http://musicplayer.sourceforge.net/)
 
 Copyright (c) 2005, Fabricio Zuardi
diff --git a/jukebox-bonus/autoplay.png b/jbx/autoplay.png
similarity index 100%
rename from jukebox-bonus/autoplay.png
rename to jbx/autoplay.png
diff --git a/jukebox-bonus/cache.db b/jbx/cache.db
similarity index 92%
rename from jukebox-bonus/cache.db
rename to jbx/cache.db
index 42a8a57..3a5211d 100755
--- a/jukebox-bonus/cache.db
+++ b/jbx/cache.db
@@ -16,3 +16,6 @@
 ./music/František Ringo Čech/Češi a jejich samičky/05 - František Ringo Čech - Češi a jejich samičky - Ne, pití ne, to patří mému miláčkovi.mp3
 ./music/František Ringo Čech/Češi a jejich samičky/06 - František Ringo Čech - Češi a jejich samičky - Čestné neférovosti a svaté lži.mp3
 ./music/František Ringo Čech/Češi a jejich samičky/07 - František Ringo Čech - Češi a jejich samičky - Já, nebohé kachňátko.mp3
+./music/lol<!--lolo/Emine??ěščřžýáíém - Stan.mp3
+./music/lol?lol/Emine??ěščřžýáíém - Stan.mp3
+./music/lol\lol/Emine??ěščřžýáíém - Stan.mp3
diff --git a/jukebox-bonus/footer.html b/jbx/footer.html
similarity index 100%
rename from jukebox-bonus/footer.html
rename to jbx/footer.html
diff --git a/jukebox-bonus/header.html b/jbx/header.html
similarity index 100%
rename from jukebox-bonus/header.html
rename to jbx/header.html
diff --git a/jukebox-bonus/help.html b/jbx/help.html
similarity index 84%
rename from jukebox-bonus/help.html
rename to jbx/help.html
index 509417e..c80626d 100755
--- a/jukebox-bonus/help.html
+++ b/jbx/help.html
@@ -1,5 +1,17 @@
 <title>Harvie's JuKe!Box Help</title>
-<pre><h2>Autorská práva</h2>
+<script type="text/javascript">function showhide(eid) {obj = document.getElementById(eid); obj.style.display = (obj.style.display == 'none' ? '' : 'none');}</script>
+
+<h2>[EN] Warning</h2>
+This document should be outdated or invalid. You can find the latest and valid version <a href="http://code.google.com/p/h-jukebox/wiki/AboutHelp">here</a>.
+If you still want to read this document, then <a href="javascript:showhide('help')">click here to agree</a>.
+<h2>[CZ] Varování</h2>
+Tato stránka může být zastaralá, nebo neplatná. Poslední platnou verzi naleznete <a href="http://code.google.com/p/h-jukebox/wiki/AboutHelp">zde</a>.
+Pokud i přes to chcete tuto stránku číst, pak <a href="javascript:showhide('help')">pro souhlas klikněte zde</a>.
+
+<div id="help">
+<pre>
+
+<hr /><h2>Autorská práva</h2>
 Autorem této aplikace je &lt;~~Harvie (2oo8), který se zříká autorských práv (CopyLefted) a zároveň také zodpovědnosti.
 Licence pro software z třetí strany (musicplayer,...) najdete v souboru COPYING.
 Pokud je pomocí tohoto webu zpřístupněn materiál, jehož stažením se vy nebo poskytovatel dopouštíte porušení autorských práv, tento obsah nestahujete!
@@ -68,3 +80,5 @@ Vyhledávání - skript nemá práva pro zápis/čtení databáze, nebo databáz
 Přehrávání v prohlížeči - není přítomný swf soubor přehrávače, prohlížeč nepodporuje flash, nebo inline framy...
 Něco jiného - UTFS && UTFG...
 </pre>
+</div>
+<script type="text/javascript">showhide("help");</script>
diff --git a/jukebox-bonus/musicplayer.swf b/jbx/musicplayer.swf
similarity index 100%
rename from jukebox-bonus/musicplayer.swf
rename to jbx/musicplayer.swf
diff --git a/jbx/player.swf b/jbx/player.swf
new file mode 100755
index 0000000..04be6a9
Binary files /dev/null and b/jbx/player.swf differ
diff --git a/jukebox-bonus/acorner.gif b/jbx/themes/default/acorner.gif
similarity index 100%
rename from jukebox-bonus/acorner.gif
rename to jbx/themes/default/acorner.gif
diff --git a/jukebox-bonus/corner.gif b/jbx/themes/default/corner.gif
similarity index 100%
rename from jukebox-bonus/corner.gif
rename to jbx/themes/default/corner.gif
diff --git a/jbx/themes/default/icons/back.png b/jbx/themes/default/icons/back.png
new file mode 100755
index 0000000..659cd90
Binary files /dev/null and b/jbx/themes/default/icons/back.png differ
diff --git a/jbx/themes/default/icons/document-save-as.png b/jbx/themes/default/icons/document-save-as.png
new file mode 100755
index 0000000..9bed143
Binary files /dev/null and b/jbx/themes/default/icons/document-save-as.png differ
diff --git a/jbx/themes/default/icons/document-save.png b/jbx/themes/default/icons/document-save.png
new file mode 100755
index 0000000..22ff495
Binary files /dev/null and b/jbx/themes/default/icons/document-save.png differ
diff --git a/jbx/themes/default/icons/folder.png b/jbx/themes/default/icons/folder.png
new file mode 100755
index 0000000..901edc9
Binary files /dev/null and b/jbx/themes/default/icons/folder.png differ
diff --git a/jbx/themes/default/icons/go-next.png b/jbx/themes/default/icons/go-next.png
new file mode 100755
index 0000000..6ef8de7
Binary files /dev/null and b/jbx/themes/default/icons/go-next.png differ
diff --git a/jbx/themes/default/icons/go-top.png b/jbx/themes/default/icons/go-top.png
new file mode 100755
index 0000000..70f2c99
Binary files /dev/null and b/jbx/themes/default/icons/go-top.png differ
diff --git a/jbx/themes/default/icons/help.png b/jbx/themes/default/icons/help.png
new file mode 100755
index 0000000..f25fc3f
Binary files /dev/null and b/jbx/themes/default/icons/help.png differ
diff --git a/jbx/themes/default/icons/home.png b/jbx/themes/default/icons/home.png
new file mode 100755
index 0000000..a46fb22
Binary files /dev/null and b/jbx/themes/default/icons/home.png differ
diff --git a/jbx/themes/default/icons/logout.png b/jbx/themes/default/icons/logout.png
new file mode 100755
index 0000000..0010931
Binary files /dev/null and b/jbx/themes/default/icons/logout.png differ
diff --git a/jbx/themes/default/icons/play.png b/jbx/themes/default/icons/play.png
new file mode 100755
index 0000000..a7de0fe
Binary files /dev/null and b/jbx/themes/default/icons/play.png differ
diff --git a/jbx/themes/default/icons/playlist.png b/jbx/themes/default/icons/playlist.png
new file mode 100755
index 0000000..fd877cb
Binary files /dev/null and b/jbx/themes/default/icons/playlist.png differ
diff --git a/jbx/themes/default/icons/search.png b/jbx/themes/default/icons/search.png
new file mode 100755
index 0000000..fd7f0b0
Binary files /dev/null and b/jbx/themes/default/icons/search.png differ
diff --git a/jbx/themes/default/icons/stop.png b/jbx/themes/default/icons/stop.png
new file mode 100755
index 0000000..ede2815
Binary files /dev/null and b/jbx/themes/default/icons/stop.png differ
diff --git a/jbx/themes/default/jukebox.css b/jbx/themes/default/jukebox.css
new file mode 100755
index 0000000..257fc60
--- /dev/null
+++ b/jbx/themes/default/jukebox.css
@@ -0,0 +1,105 @@
+/*
+ * Example CSS for Harvie's JuKe!Box
+ */
+
+body {
+	color: lightblue;
+	font-family: monospace;
+
+	margin: 5px;
+	background-color: black;
+	background-image: url(corner.gif);
+	background-repeat: no-repeat;
+}
+
+a {
+	color: white;
+	text-decoration: none;
+}
+
+h1 {
+	color: white;
+	margin: 15px 0 0 20px;
+}
+
+input {
+	border: 1px solid lightblue;
+}
+
+table * {
+	background-color: darkblue;
+	color: white;
+}
+
+table {
+	border: 0px solid blue;
+	background-color: black;
+}
+
+td {
+	border: 0px solid blue;
+	margin: 0px;
+}
+
+.odd * {
+	background-color: darkblue;
+}
+
+.even * {
+	background-color: #000044;
+}
+
+.blank {
+	margin: 0;
+	padding: 0;
+	background-image: none;
+	color: white;
+	background-color: #000099;
+}
+
+.directory {
+	font-weight: bolder;
+}
+
+
+/* Hovers */
+
+a:hover, a:hover * {
+	text-decoration: underline;
+}
+
+/*tr:hover, tr:hover * { */
+.odd:hover, .odd:hover *,
+.even:hover, .even:hover * {
+	background-color: black;
+}
+
+tr:hover * a {
+	text-decoration: underline;
+}
+
+
+/* Color Classes */
+
+*.red {		color: red; }
+*.yellow {	color: yellow;}
+*.blue {	color: blue;}
+*.green {	color: green;}
+*.white {	color: white;}
+
+/* Icon Classes */
+
+*.icon { text-decoration: none; width: 16px; height: 16px; display: inline; font-size: 0; padding: 12px 16px 4px 0; margin:0; }
+*.icon, *.icon * a:hover { text-decoration: none; }
+
+*.iplay		{ background-image: url(icons/playlist.png); }
+*.ifplay	{ background-image: url(icons/play.png); }
+*.ifstop	{ background-image: url(icons/stop.png); }
+*.ifolder	{ background-image: url(icons/folder.png); }
+*.ilogout	{ background-image: url(icons/logout.png); }
+*.isearch	{ background-image: url(icons/search.png); }
+*.ihome		{ background-image: url(icons/home.png); }
+*.iback		{ background-image: url(icons/back.png); }
+*.ihelp		{ background-image: url(icons/help.png); }
+
+*/
diff --git a/jukebox-bonus/jukebox.css b/jukebox-bonus/jukebox.css
deleted file mode 100755
index eec9990..0000000
--- a/jukebox-bonus/jukebox.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Example CSS for Harvie's JuKe!Box
- */
-
-body {
-	background-color: black;
-	color: lightblue;
-	font-family: monospace;
-	margin: 5px;
-	background-image: url(corner.gif);
-	background-repeat: no-repeat;
-}
-
-a {
-	color: white;
-}
-
-h1 {
-	color: white;
-	margin: 25px 0px 0px 25px;
-}
-
-a h1 {
-	text-decoration: underline;
-}
-
-input {
-	border: 1px solid lightblue;
-}
-
-table * {
-	background-color: darkblue;
-	color: white;
-}
-
-table {
-	border: 0px solid blue;
-	background-color: black;
-}
-
-td {
-	border: 0px solid blue;
-	margin: 0px;
-}
-
-.odd * {
-	background-color: darkblue;
-}
-
-.even * {
-	background-color: #000044;
-}
-
-*.red {
-	color: red;
-}
-
-*.yellow {
-	color: yellow;
-}
diff --git a/music/index.txt b/music/index.txt
new file mode 100755
index 0000000..2267c5a
--- /dev/null
+++ b/music/index.txt
@@ -0,0 +1 @@
+Here you can write comments for each directory...
diff --git a/music/put-music-here.txt b/music/put-music-here.txt
new file mode 100755
index 0000000..59e6752
--- /dev/null
+++ b/music/put-music-here.txt
@@ -0,0 +1 @@
+Copy your music to this directory and set proper rights.