diff options
author | Shauren <none@none> | 2010-09-26 13:00:44 +0200 |
---|---|---|
committer | Shauren <none@none> | 2010-09-26 13:00:44 +0200 |
commit | 07fc33a083f84c758002ef1187335416ce695a99 (patch) | |
tree | ceccdecc2a83ef622bf395c2fa1d86c5fd38a4bc | |
parent | 9ea9effadd1859c8c3edcce888b3cdae43e98561 (diff) |
Core/Commands: Fixed crashes in .ban info and .ban list
--HG--
branch : trunk
-rw-r--r-- | src/server/game/Chat/Commands/Level3.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 626ef5680bc..51dca819481 100644 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -5943,9 +5943,9 @@ bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname) if (fields[2].GetBool() && (fields[1].GetUInt64() == (uint64)0 ||unbandate >= time(NULL))) active = true; bool permanent = (fields[1].GetUInt64() == (uint64)0); - std::string bantime = permanent?GetTrinityString(LANG_BANINFO_INFINITE):secsToTimeString(fields[1].GetUInt64(), true); + std::string bantime = permanent ? GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true); PSendSysMessage(LANG_BANINFO_HISTORYENTRY, - fields[0].GetString(), bantime.c_str(), active ? GetTrinityString(LANG_BANINFO_YES):GetTrinityString(LANG_BANINFO_NO), fields[4].GetString(), fields[5].GetString()); + fields[0].GetCString(), bantime.c_str(), active ? GetTrinityString(LANG_BANINFO_YES) : GetTrinityString(LANG_BANINFO_NO), fields[4].GetCString(), fields[5].GetCString()); } while (result->NextRow()); return true; @@ -5976,8 +5976,8 @@ bool ChatHandler::HandleBanInfoIPCommand(const char *args) Field *fields = result->Fetch(); bool permanent = !fields[6].GetUInt64(); PSendSysMessage(LANG_BANINFO_IPENTRY, - fields[0].GetString(), fields[1].GetString(), permanent ? GetTrinityString(LANG_BANINFO_NEVER):fields[2].GetString(), - permanent ? GetTrinityString(LANG_BANINFO_INFINITE):secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetString(), fields[5].GetString()); + fields[0].GetCString(), fields[1].GetCString(), permanent ? GetTrinityString(LANG_BANINFO_NEVER) : fields[2].GetCString(), + permanent ? GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetCString(), fields[5].GetCString()); return true; } @@ -6115,7 +6115,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult result) if (banresult) { Field* fields2 = banresult->Fetch(); - PSendSysMessage("%s",fields2[0].GetString()); + PSendSysMessage("%s", fields2[0].GetCString()); } } while (result->NextRow()); } @@ -6153,8 +6153,8 @@ bool ChatHandler::HandleBanListHelper(QueryResult result) if (fields2[0].GetUInt64() == fields2[1].GetUInt64()) { PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|", - account_name.c_str(),aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, - fields2[2].GetString(),fields2[3].GetString()); + account_name.c_str(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, + fields2[2].GetCString(), fields2[3].GetCString()); } else { @@ -6163,9 +6163,9 @@ bool ChatHandler::HandleBanListHelper(QueryResult result) PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|", account_name.c_str(),aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, aTm_unban->tm_year%100, aTm_unban->tm_mon+1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min, - fields2[2].GetString(),fields2[3].GetString()); + fields2[2].GetCString(), fields2[3].GetCString()); } - }while (banInfo->NextRow()); + } while (banInfo->NextRow()); } }while (result->NextRow()); SendSysMessage(" ==============================================================================="); @@ -6209,7 +6209,7 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) do { Field* fields = result->Fetch(); - PSendSysMessage("%s",fields[0].GetString()); + PSendSysMessage("%s", fields[0].GetCString()); } while (result->NextRow()); } // Console wide output @@ -6227,17 +6227,17 @@ bool ChatHandler::HandleBanListIPCommand(const char *args) if (fields[1].GetUInt64() == fields[2].GetUInt64()) { PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|", - fields[0].GetString(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, - fields[3].GetString(), fields[4].GetString()); + fields[0].GetCString(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, + fields[3].GetCString(), fields[4].GetCString()); } else { time_t t_unban = fields[2].GetUInt64(); tm* aTm_unban = localtime(&t_unban); PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|", - fields[0].GetString(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, + fields[0].GetCString(), aTm_ban->tm_year%100, aTm_ban->tm_mon+1, aTm_ban->tm_mday, aTm_ban->tm_hour, aTm_ban->tm_min, aTm_unban->tm_year%100, aTm_unban->tm_mon+1, aTm_unban->tm_mday, aTm_unban->tm_hour, aTm_unban->tm_min, - fields[3].GetString(), fields[4].GetString()); + fields[3].GetCString(), fields[4].GetCString()); } }while (result->NextRow()); SendSysMessage(" ==============================================================================="); |