aboutsummaryrefslogtreecommitdiff
path: root/src/trinitycore
diff options
context:
space:
mode:
Diffstat (limited to 'src/trinitycore')
-rw-r--r--src/trinitycore/CliRunnable.cpp2
-rw-r--r--src/trinitycore/Main.cpp2
-rw-r--r--src/trinitycore/Master.cpp14
-rw-r--r--src/trinitycore/RASocket.cpp10
-rw-r--r--src/trinitycore/WorldRunnable.cpp4
5 files changed, 16 insertions, 16 deletions
diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp
index 15dd45edfff..d950adc22f8 100644
--- a/src/trinitycore/CliRunnable.cpp
+++ b/src/trinitycore/CliRunnable.cpp
@@ -239,7 +239,7 @@ bool ChatHandler::HandleAccountOnlineListCommand(const char* /*args*/)
///- Get the username, last IP and GM level of each account
// No SQL injection. account is uint32.
// 0 1 2 3
- QueryResult *resultLogin = LoginDatabase.PQuery("SELECT username, last_ip, gmlevel, expansion FROM account WHERE id = '%u'",account);
+ QueryResult *resultLogin = loginDatabase.PQuery("SELECT username, last_ip, gmlevel, expansion FROM account WHERE id = '%u'",account);
if(resultLogin)
{
diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp
index eb51c770896..faa88c994d5 100644
--- a/src/trinitycore/Main.cpp
+++ b/src/trinitycore/Main.cpp
@@ -59,7 +59,7 @@ int m_ServiceStatus = -1;
DatabaseType WorldDatabase; ///< Accessor to the world database
DatabaseType CharacterDatabase; ///< Accessor to the character database
-DatabaseType LoginDatabase; ///< Accessor to the realm/login database
+DatabaseType loginDatabase; ///< Accessor to the realm/login database
uint32 realmID; ///< Id of the realm
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index b7159225f42..8a5fba940f1 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -136,7 +136,7 @@ public:
loopCounter = 0;
sLog.outDetail ("Ping MySQL to keep connection alive");
delete WorldDatabase.Query ("SELECT 1 FROM command LIMIT 1");
- delete LoginDatabase.Query ("SELECT 1 FROM realmlist LIMIT 1");
+ delete loginDatabase.Query ("SELECT 1 FROM realmlist LIMIT 1");
delete CharacterDatabase.Query ("SELECT 1 FROM bugreport LIMIT 1");
}
}
@@ -242,7 +242,7 @@ int Master::Run()
t.setPriority ((ACE_Based::Priority )2);
// set server online
- LoginDatabase.PExecute("UPDATE realmlist SET color = 0, population = 0 WHERE id = '%d'",realmID);
+ loginDatabase.PExecute("UPDATE realmlist SET color = 0, population = 0 WHERE id = '%d'",realmID);
#ifdef WIN32
if (sConfig.GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)
@@ -333,7 +333,7 @@ int Master::Run()
sWorldSocketMgr->Wait ();
// set server offline
- LoginDatabase.PExecute("UPDATE realmlist SET color = 2 WHERE id = '%d'",realmID);
+ loginDatabase.PExecute("UPDATE realmlist SET color = 2 WHERE id = '%d'",realmID);
///- Remove signal handling before leaving
_UnhookSignals();
@@ -349,7 +349,7 @@ int Master::Run()
///- Wait for delay threads to end
CharacterDatabase.HaltDelayThread();
WorldDatabase.HaltDelayThread();
- LoginDatabase.HaltDelayThread();
+ loginDatabase.HaltDelayThread();
sLog.outString( "Halting process..." );
@@ -438,7 +438,7 @@ bool Master::_StartDB()
}
///- Get login database info from configuration file
- dbstring = sConfig.GetStringDefault("LoginDatabaseInfo", "");
+ dbstring = sConfig.GetStringDefault("loginDatabaseInfo", "");
if(dbstring.empty())
{
sLog.outError("Login database not specified in configuration file");
@@ -446,7 +446,7 @@ bool Master::_StartDB()
}
///- Initialise the login database
- if(!LoginDatabase.Initialize(dbstring.c_str()))
+ if(!loginDatabase.Initialize(dbstring.c_str()))
{
sLog.outError("Cannot connect to login database %s",dbstring.c_str());
return false;
@@ -494,7 +494,7 @@ void Master::clearOnlineAccounts()
{
// Cleanup online status for characters hosted at current realm
/// \todo Only accounts with characters logged on *this* realm should have online status reset. Move the online column from 'account' to 'realmcharacters'?
- LoginDatabase.PExecute(
+ loginDatabase.PExecute(
"UPDATE account SET online = 0 WHERE online > 0 "
"AND id IN (SELECT acctid FROM realmcharacters WHERE realmid = '%d')",realmID);
diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp
index b15f4e447d6..d0ee5cc8053 100644
--- a/src/trinitycore/RASocket.cpp
+++ b/src/trinitycore/RASocket.cpp
@@ -152,9 +152,9 @@ void RASocket::OnRead()
AccountMgr::normalizeString(login);
///- Escape the Login to allow quotes in names
- LoginDatabase.escape_string(login);
+ loginDatabase.escape_string(login);
- QueryResult* result = LoginDatabase.PQuery("SELECT gmlevel FROM account WHERE username = '%s'",login.c_str());
+ QueryResult* result = loginDatabase.PQuery("SELECT gmlevel FROM account WHERE username = '%s'",login.c_str());
///- If the user is not found, deny access
if(!result)
@@ -193,10 +193,10 @@ void RASocket::OnRead()
AccountMgr::normalizeString(login);
AccountMgr::normalizeString(pw);
- LoginDatabase.escape_string(login);
- LoginDatabase.escape_string(pw);
+ loginDatabase.escape_string(login);
+ loginDatabase.escape_string(pw);
- QueryResult *check = LoginDatabase.PQuery(
+ QueryResult *check = loginDatabase.PQuery(
"SELECT 1 FROM account WHERE username = '%s' AND sha_pass_hash=SHA1(CONCAT('%s',':','%s'))",
login.c_str(), login.c_str(), pw.c_str());
diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp
index ad0243a36ae..06c0e69fa16 100644
--- a/src/trinitycore/WorldRunnable.cpp
+++ b/src/trinitycore/WorldRunnable.cpp
@@ -50,7 +50,7 @@ void WorldRunnable::run()
///- Init new SQL thread for the world database
WorldDatabase.ThreadStart(); // let thread do safe mySQL requests (one connection call enough)
CharacterDatabase.ThreadStart();
- LoginDatabase.ThreadStart();
+ loginDatabase.ThreadStart();
sWorld.InitResultQueue();
uint32 realCurrTime = 0;
@@ -100,5 +100,5 @@ void WorldRunnable::run()
///- End the database thread
WorldDatabase.ThreadEnd(); // free mySQL thread resources
CharacterDatabase.ThreadStart();
- LoginDatabase.ThreadEnd();
+ loginDatabase.ThreadEnd();
}