iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-06 05:22:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert StripControls implementation (#850)

Browse Source 
This reverts commits 27d78795a7 and
f27109f1b4. It was decided that the
functionality is provided by a separate module instead, to avoid
unnecessarily bloating the core.
This commit is contained in:
J-P Nurmi
2015-03-04 09:41:52 +01:00
parent a67f929b7d
commit a5b4a29c00
8 changed files with 1 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/IRCNetwork.cpp
View File

@@ -124,7 +124,6 @@ CIRCNetwork::CIRCNetwork(CUser *pUser, const CString& sName)
m_vQueries(),
m_sChanPrefixes(""),
m_bIRCConnectEnabled(true),
m_bStripControls(false),
m_sIRCServer(""),
m_vServers(),
m_uServerIdx(0),
@@ -174,7 +173,6 @@ void CIRCNetwork::Clone(const CIRCNetwork& Network, bool bCloneName) {
SetBindHost(Network.GetBindHost());
SetEncoding(Network.GetEncoding());
SetQuitMsg(Network.GetQuitMsg());
SetStripControls(Network.StripControls());
m_ssTrustedFingerprints = Network.m_ssTrustedFingerprints;
// Servers
@@ -343,7 +341,6 @@ bool CIRCNetwork::ParseConfig(CConfig *pConfig, CString& sError, bool bUpgrade)
};
TOption<bool> BoolOptions[] = {
{ "ircconnectenabled", &CIRCNetwork::SetIRCConnectEnabled },
{ "stripcontrols", &CIRCNetwork::SetStripControls },
};
TOption<double> DoubleOptions[] = {
{ "floodrate", &CIRCNetwork::SetFloodRate },
@@ -498,7 +495,6 @@ CConfig CIRCNetwork::ToConfig() const {
config.AddKeyValuePair("FloodBurst", CString(GetFloodBurst()));
config.AddKeyValuePair("JoinDelay", CString(GetJoinDelay()));
config.AddKeyValuePair("Encoding", m_sEncoding);
config.AddKeyValuePair("StripControls", CString(StripControls()));
if (!m_sQuitMsg.empty()) {
config.AddKeyValuePair("QuitMsg", m_sQuitMsg);
@@ -1258,14 +1254,6 @@ void CIRCNetwork::CheckIRCConnect() {
CZNC::Get().AddNetworkToQueue(this);
}
void CIRCNetwork::SetStripControls(bool b) {
for (CChan* pChan : GetChans()) {
pChan->InheritStripControls(b);
}
m_bStripControls = b;
}
bool CIRCNetwork::PutIRC(const CString& sLine) {
CIRCSock* pIRCSock = GetIRCSock();