diff options
| -rw-r--r-- | src/userprocess.cpp | 4 | ||||
| -rw-r--r-- | src/xline.cpp | 32 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 96eba0469..df422c721 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -224,7 +224,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME) if ((TIME > curr->timeout) && (curr->registered != REG_ALL)) { curr->muted = true; - GlobalCulls.AddItem(curr,"Registration timeout"); + userrec::QuitUser(this, curr, "Registration timeout"); continue; } else @@ -277,9 +277,9 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME) char message[MAXBUF]; snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : ""); curr->muted = true; - GlobalCulls.AddItem(curr, message); curr->lastping = 1; curr->nping = TIME+curr->pingmax; + userrec::QuitUser(this, curr, message); continue; } curr->Write("PING :%s",this->Config->ServerName); diff --git a/src/xline.cpp b/src/xline.cpp index def9db42b..6ae2aa632 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -723,9 +723,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason); + userrec::QuitUser(ServerInstance, u, "G-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } @@ -737,9 +737,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason); + userrec::QuitUser(ServerInstance, u, "K-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } @@ -751,9 +751,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason); + userrec::QuitUser(ServerInstance, u, "Q-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } @@ -765,9 +765,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason); + userrec::QuitUser(ServerInstance, u, "Z-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } } @@ -799,9 +799,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason); + userrec::QuitUser(ServerInstance, u, "G-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) @@ -812,9 +812,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason); + userrec::QuitUser(ServerInstance, u, "K-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) @@ -825,9 +825,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason); + userrec::QuitUser(ServerInstance, u, "Q-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) @@ -838,9 +838,9 @@ void XLineManager::apply_lines(const int What) if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); if (ServerInstance->Config->HideBans) - ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason); + userrec::QuitUser(ServerInstance, u, "Z-Lined", reason); else - ServerInstance->GlobalCulls.AddItem(u, reason); + userrec::QuitUser(ServerInstance, u, reason); } } } |