adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 17:03:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move user deletion to CUser::HandleUserDeletion()

Browse Source 
This does not include any behaviour change.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@934 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-01-20 16:24:20 +00:00
parent 8f59ef93f3
commit 45dae8a109
2 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
+44 -34
View File
@@ -130,45 +130,55 @@ bool CZNC::ConnectUser(CUser *pUser) {
return true;
}
bool CZNC::HandleUserDeletion()
{
map<CString, CUser*>::iterator it;
map<CString, CUser*>::iterator end;
if (m_msDelUsers.size() == 0)
return false;
end = m_msDelUsers.end();
for (it = m_msDelUsers.begin(); it != end; it++) {
CUser* pUser = it->second;
pUser->SetBeingDeleted(true);
#ifdef _MODULES
if (GetModules().OnDeleteUser(*pUser)) {
pUser->SetBeingDeleted(false);
continue;
}
#endif
m_msUsers.erase(pUser->GetUserName());
CIRCSock* pIRCSock = pUser->GetIRCSock();
if (pIRCSock) {
m_Manager.DelSockByAddr(pIRCSock);
}
pUser->DelClients();
#ifdef _MODULES
pUser->DelModules();
#endif
AddBytesRead(pUser->BytesRead());
AddBytesWritten(pUser->BytesWritten());
delete pUser;
}
m_msDelUsers.clear();
RestartConnectUser();
return true;
}
int CZNC::Loop() {
EnableConnectUser();
while (true) {
// Check for users that need to be deleted
map<CString, CUser*>::iterator it;
map<CString, CUser*>::iterator end;
if (m_msDelUsers.size()) {
end = m_msDelUsers.end();
for (it = m_msDelUsers.begin(); it != end; it++) {
CUser* pUser = it->second;
pUser->SetBeingDeleted(true);
#ifdef _MODULES
if (GetModules().OnDeleteUser(*pUser)) {
pUser->SetBeingDeleted(false);
continue;
}
#endif
m_msUsers.erase(pUser->GetUserName());
CIRCSock* pIRCSock = pUser->GetIRCSock();
if (pIRCSock) {
m_Manager.DelSockByAddr(pIRCSock);
}
pUser->DelClients();
#ifdef _MODULES
pUser->DelModules();
#endif
AddBytesRead(pUser->BytesRead());
AddBytesWritten(pUser->BytesWritten());
delete pUser;
}
m_msDelUsers.clear();
RestartConnectUser();
if (HandleUserDeletion()) {
// Also remove those user(s) from the config file
WriteConfig();
}