From 54d13d93d03bdc1de2aed632140987c66bab16b0 Mon Sep 17 00:00:00 2001 From: Botanic Date: Mon, 21 Oct 2013 23:57:27 -0700 Subject: [PATCH] Fixed path bugs --HG-- branch : rc-botanic-webdev --- code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini | 2 +- code/ryzom/tools/server/ryzom_ams/www/config.default.php | 2 +- code/ryzom/tools/server/ryzom_ams/www/html/index.php | 2 +- .../tools/server/ryzom_ams/www/html/installer/libsetup.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini index 865a842c4..b7c44044e 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini @@ -2,7 +2,7 @@ ; Comments start with ';', as in php.ini [install] -login_info = "Please enter your MySQL Username and Password to install the database." +login_info = "Please enter your MySQL Username and Password to install the database.
This is being loaded because config.php is missing.
This process will take about 30 seconds." login_here = "here" [dashboard] diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.default.php b/code/ryzom/tools/server/ryzom_ams/www/config.default.php index cb6641609..a091ed635 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/config.default.php +++ b/code/ryzom/tools/server/ryzom_ams/www/config.default.php @@ -88,7 +88,7 @@ $AMS_CACHEDIR = $AMS_LIB . '/cache'; $SITEBASE = dirname( __FILE__ ) . '/html/' ; //the paths to your website url -$BASE_WEBPATH = $_SERVER['REQUEST_URI'].; +$BASE_WEBPATH = dirname($_SERVER['PHP_SELF']); $IMAGELOC_WEBPATH = $_SERVER['REQUEST_URI'].'/img'; $WEBPATH = $BASE_WEBPATH . '/index.php'; $INGAME_WEBPATH = $BASE_WEBPATH . '/index.php'; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index.php b/code/ryzom/tools/server/ryzom_ams/www/html/index.php index aec5d1825..50d8227be 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index.php @@ -16,7 +16,7 @@ ini_set('display_errors', 'on'); require_once( '../../ams_lib/libinclude.php' ); if (!@include '../config.php') { //if config doesnt exist run setup - require( 'install/libsetup.php' ); + require( 'installer/libsetup.php' ); } else { //if config exists then include it require( '../config.php' ); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php index f4a6a50b4..0f39633e1 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php @@ -27,7 +27,7 @@ //var used to access the DB; global $cfg; - + sleep(15); try{ //SETUP THE WWW DB $dbw = new DBLayer("install", "web"); @@ -490,7 +490,7 @@ echo "failed to copy ../config.php ...\n"; } } - echo 'Reload! '; + echo '
Reload! '; exit;