araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-17 21:50:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.x and some warning fixes

Browse Source
This commit is contained in:
Spp
2011-12-27 10:05:49 +01:00
parent 8323027e0c 3176289024
commit fa9daaf95b
148 changed files with 2881 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/WorldSocket.cpp
+19 -8
View File
@@ -922,7 +922,19 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
K.SetHexStr (fields[1].GetCString());
time_t mutetime = time_t (fields[7].GetUInt64());
int64 mutetime = fields[7].GetInt64();
//! Negative mutetime indicates amount of seconds to be muted effective on next login - which is now.
if (mutetime < 0)
{
mutetime = time(NULL) + llabs(mutetime);
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPDATE_MUTE_TIME);
stmt->setInt64(0, mutetime);
stmt->setUInt32(1, id);
LoginDatabase.Execute(stmt);
}
locale = LocaleConstant (fields[8].GetUInt8());
if (locale >= TOTAL_LOCALES)
@@ -1005,14 +1017,13 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
isRecruiter = true;
// Update the last_ip in the database
// No SQL injection, username escaped.
LoginDatabase.EscapeString (address);
LoginDatabase.PExecute ("UPDATE account "
"SET last_ip = '%s' "
"WHERE username = '%s'",
address.c_str(),
safe_account.c_str());
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(LOGIN_UPDATE_LAST_IP);
stmt->setString(0, address);
stmt->setString(1, account);
CharacterDatabase.Execute(stmt);
// NOTE ATM the socket is single-threaded, have this in mind ...
ACE_NEW_RETURN (m_Session, WorldSession (id, this, AccountTypes(security), expansion, mutetime, locale, recruiter, isRecruiter), -1);