From 537916d828454c1bff9f64f00a5f9c2acba13fa6 Mon Sep 17 00:00:00 2001 From: Quitta Date: Thu, 4 Jul 2013 01:26:55 +0200 Subject: [PATCH] making install dependent on config file for db name --HG-- branch : quitta-gsoc-2013 --- .../tools/server/ryzom_ams/ams_lib/translations/en.ini | 4 ++-- .../ryzom/tools/server/ryzom_ams/www/html/sql/install.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 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 bfb187520..1006594c3 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 @@ -32,8 +32,8 @@ userlist_info = "welcome to the userlist" [login] login_info = "Please login with your Username and Password." -login_error_message = "The filled in username/password were not correct!" -login_register_message ="Register If you dont have an account yet, create one" +login_error_message = "The username/password were not correct!" +login_register_message ="Register If you don't have an account yet, create one" login_register_message_here = "here" [logout] diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php b/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php index e2cf4190f..60ec66676 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/sql/install.php @@ -11,8 +11,8 @@ //SETUP THE WWW DB $dbw = new DBLayer($cfg['db']['web']); $sql = " - CREATE DATABASE IF NOT EXISTS `ryzom_ams`; - USE `ryzom_ams`; + CREATE DATABASE IF NOT EXISTS `" . $cfg['db']['web']['name'] ."`; + USE `". $cfg['db']['web']['name'] . "`; DROP TABLE IF EXISTS ams_user; CREATE TABLE IF NOT EXISTS `ams_user` ( @@ -35,8 +35,8 @@ //SETUP THE AMS_LIB DB $dbl = new DBLayer($cfg['db']['lib']); $sql = " - CREATE DATABASE IF NOT EXISTS `ryzom_ams_lib`; - USE `ryzom_ams_lib`; + CREATE DATABASE IF NOT EXISTS `" . $cfg['db']['lib']['name'] ."`; + USE `" . $cfg['db']['lib']['name'] ."`; DROP TABLE IF EXISTS ams_querycache; CREATE TABLE ams_querycache (