GIT.Harvie.CZ / mirrors / JukeBox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2fa6491)
$base_url now should always have slash at the end
authorHarvie <tomas@mudrunka.cz>
Fri, 29 Oct 2010 18:09:41 +0000 (20:09 +0200)
committerHarvie <tomas@mudrunka.cz>
Fri, 29 Oct 2010 18:09:41 +0000 (20:09 +0200)
example_config.php patch | blob | blame | history
index.php patch | blob | blame | history

diff --git a/example_config.php b/example_config.php
index 2de765b6705dd77a878237d6155e4cb7b74d0b14..5956ab017bc2e9e7bc5f704e271854bb067305ee 100755 (executable)
--- a/example_config.php
+++ b/example_config.php
@@ -12,7 +12,6 @@
 //Config-basic
 $title =                'Harvie\'s&nbsp;JuKe!Box'; //Title of jukebox
 $music_dir =            'music'; //Local path to directory with music
-$base_url =             dirname($_SERVER['SCRIPT_NAME']); //URL of this directory ("./")
 $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
@@ -29,5 +28,5 @@ $search_engines = array_merge($search_engines, array(
 */
 //Bonuses
 if(isset($bonus_dir) && is_dir($bonus_dir)) {
-       $css_file =     $base_url.'/'.$bonus_dir.'/themes/default/jukebox.css'; //CSS (Design/Theme)
+       $css_file =     $base_url.$bonus_dir.'/themes/default/jukebox.css'; //CSS (Design/Theme)
 }
diff --git a/index.php b/index.php
index 92a0507e1a624794501b3d2b81ae7ffa4053b491..40b7db3eca2de8a7b8ed76df73cd6ab8e6db03c6 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ Version info:
 //Config-basic
 $title =               'Harvie\'s&nbsp;JuKe!Box'; //Title of jukebox
 $music_dir =           'music'; //Local path to directory with music
-$base_url =            dirname($_SERVER['SCRIPT_NAME']); //URL of this directory ("./")
+$base_url =            preg_replace('/[^\/]*$/', '', $_SERVER['SCRIPT_NAME']); //URL of this directory (always ends with slash)
 $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)
@@ -39,8 +39,8 @@ $indexlist =          array('index.html', 'index.txt'); //Search for this file in each
 $bonus_dir =           'jbx'; //Misc. files directory
 ////
 $search_cache =        $bonus_dir.'/cache.db'; //Database for searching music (php +rw) - .htaccess: Deny from all!!!
-$css_file =            $base_url.'/'.$bonus_dir.'/themes/default/jukebox.css'; //CSS (Design)
-$favicon_file =                $base_url.'/favicon.png'; //favicon
+$css_file =            $base_url.$bonus_dir.'/themes/default/jukebox.css'; //CSS (Design)
+$favicon_file =                $base_url.'favicon.png'; //favicon
 $header_file =         $bonus_dir.'/header.html'; //header file
 $footer_file =         $bonus_dir.'/footer.html'; //footer file
 
@@ -281,7 +281,7 @@ function flash_mp3_player() {
 <style> * { margin: 0; padding: 0; border: 0; } </style></head><body>
 <object width="100%" height="344">
         <embed src="<?php
-               echo($GLOBALS['base_url'].'/'.$GLOBALS['flash_player_swf'].$GLOBALS['flash_player_options']);
+               echo($GLOBALS['base_url'].$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);
        ?>"
https://github.com/Harvie/JukeBox.git (mirrored @ Thu, 21 Nov 2024 12:10:07 +0100)
This page took 0.184244 seconds and 4 git commands to generate.