josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Commands: Fixed crashes in .ban info and .ban list

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-09-26 13:00:44 +02:00
parent 9ea9effadd
commit 07fc33a083
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Chat/Commands/Level3.cpp
+11 -11
View File
@@ -5945,7 +5945,7 @@ bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname)
bool permanent = (fields[1].GetUInt64() == (uint64)0); 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, 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()); } while (result->NextRow());
return true; return true;
@@ -5976,8 +5976,8 @@ bool ChatHandler::HandleBanInfoIPCommand(const char *args)
Field *fields = result->Fetch(); Field *fields = result->Fetch();
bool permanent = !fields[6].GetUInt64(); bool permanent = !fields[6].GetUInt64();
PSendSysMessage(LANG_BANINFO_IPENTRY, PSendSysMessage(LANG_BANINFO_IPENTRY,
fields[0].GetString(), fields[1].GetString(), permanent ? GetTrinityString(LANG_BANINFO_NEVER):fields[2].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].GetString(), fields[5].GetString()); permanent ? GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), true).c_str(), fields[4].GetCString(), fields[5].GetCString());
return true; return true;
} }
@@ -6115,7 +6115,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult result)
if (banresult) if (banresult)
{ {
Field* fields2 = banresult->Fetch(); Field* fields2 = banresult->Fetch();
PSendSysMessage("%s",fields2[0].GetString()); PSendSysMessage("%s", fields2[0].GetCString());
} }
} while (result->NextRow()); } while (result->NextRow());
} }
@@ -6154,7 +6154,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult result)
{ {
PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|", 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, 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()); fields2[2].GetCString(), fields2[3].GetCString());
} }
else else
{ {
@@ -6163,7 +6163,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult result)
PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|", 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, 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, 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());
} }
@@ -6209,7 +6209,7 @@ bool ChatHandler::HandleBanListIPCommand(const char *args)
do do
{ {
Field* fields = result->Fetch(); Field* fields = result->Fetch();
PSendSysMessage("%s",fields[0].GetString()); PSendSysMessage("%s", fields[0].GetCString());
} while (result->NextRow()); } while (result->NextRow());
} }
// Console wide output // Console wide output
@@ -6227,17 +6227,17 @@ bool ChatHandler::HandleBanListIPCommand(const char *args)
if (fields[1].GetUInt64() == fields[2].GetUInt64()) if (fields[1].GetUInt64() == fields[2].GetUInt64())
{ {
PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|", 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[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].GetString(), fields[4].GetString()); fields[3].GetCString(), fields[4].GetCString());
} }
else else
{ {
time_t t_unban = fields[2].GetUInt64(); time_t t_unban = fields[2].GetUInt64();
tm* aTm_unban = localtime(&t_unban); tm* aTm_unban = localtime(&t_unban);
PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|", 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, 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()); }while (result->NextRow());
SendSysMessage(" ==============================================================================="); SendSysMessage(" ===============================================================================");