void CullList::AddItem(User* user)
{
if (user->quitting)
+ {
+ ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
return;
+ }
+ user->quitting = true;
list.push_back(user);
}
std::vector<User *>::iterator a = list.begin();
User *u = (*a);
- user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
+ user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
const char* preset_reason = u->GetOperQuit();
- std::string reason = u->operquitmsg;
+ std::string reason = u->quitmsg;
std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
if (reason.length() > MAXQUIT - 1)
oper_reason.resize(MAXQUIT - 1);
if (u->registered != REG_ALL)
- if (ServerInstance->unregistered_count)
- ServerInstance->unregistered_count--;
+ if (ServerInstance->Users->unregistered_count)
+ ServerInstance->Users->unregistered_count--;
if (IS_LOCAL(u))
{
if (IS_LOCAL(u))
{
- if (ServerInstance->Config->GetIOHook(u->GetPort()))
+ if (u->io)
{
try
{
- ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
+ u->io->OnRawSocketClose(u->GetFd());
}
catch (CoreException& modexcept)
{
- ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
}
u->AddToWhoWas();
}
- if (iter != ServerInstance->clientlist->end())
+ if (iter != ServerInstance->Users->clientlist->end())
{
if (IS_LOCAL(u))
{
- std::vector<User*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),u);
- if (x != ServerInstance->local_users.end())
- ServerInstance->local_users.erase(x);
+ std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
+ if (x != ServerInstance->Users->local_users.end())
+ ServerInstance->Users->local_users.erase(x);
}
- ServerInstance->clientlist->erase(iter);
+ ServerInstance->Users->clientlist->erase(iter);
}
delete u;