Move IRCConnectEnabled to each network instead of a global user setting

This commit is contained in:
Kyle Fuller
2012-01-11 14:06:11 +00:00
parent 4abf3feae4
commit 3d7d1793aa
11 changed files with 60 additions and 44 deletions

View File

@@ -559,7 +559,6 @@ class CAdminMod : public CModule {
PutModule("Error: Cloning failed! [" + sError + "]");
return;
}
pNewUser->SetIRCConnectEnabled(false);
if (!CZNC::Get().AddUser(pNewUser, sError)) {
delete pNewUser;
@@ -730,8 +729,7 @@ class CAdminMod : public CModule {
}
// then reconnect
pUser->SetIRCConnectEnabled(true);
pNetwork->CheckIRCConnect();
pNetwork->SetIRCConnectEnabled(true);
PutModule("Queued user for a reconnect.");
}
@@ -757,14 +755,7 @@ class CAdminMod : public CModule {
return;
}
CIRCSock *pIRCSock = pNetwork->GetIRCSock();
if (pIRCSock && !pIRCSock->IsConnected())
pIRCSock->Close();
else if(pIRCSock)
pIRCSock->Quit();
pUser->SetIRCConnectEnabled(false);
pNetwork->SetIRCConnectEnabled(false);
PutModule("Closed user's IRC connection.");
}