diff --git a/include/znc/Chan.h b/include/znc/Chan.h index b623a2ea..7794b130 100644 --- a/include/znc/Chan.h +++ b/include/znc/Chan.h @@ -120,8 +120,6 @@ public: void SetDefaultModes(const CString& s) { m_sDefaultModes = s; } void SetAutoClearChanBuffer(bool b); void InheritAutoClearChanBuffer(bool b); - void SetStripControls(bool b); - void InheritStripControls(bool b); void SetDetached(bool b = true) { m_bDetached = b; } void SetInConfig(bool b); void SetCreationDate(unsigned long u) { m_ulCreationDate = u; } @@ -149,14 +147,12 @@ public: size_t GetNickCount() const { return m_msNicks.size(); } bool AutoClearChanBuffer() const { return m_bAutoClearChanBuffer; } bool IsDetached() const { return m_bDetached; } - bool StripControls() const { return m_bStripControls; } bool InConfig() const { return m_bInConfig; } unsigned long GetCreationDate() const { return m_ulCreationDate; } bool IsDisabled() const { return m_bDisabled; } unsigned int GetJoinTries() const { return m_uJoinTries; } bool HasBufferCountSet() const { return m_bHasBufferCountSet; } bool HasAutoClearChanBufferSet() const { return m_bHasAutoClearChanBufferSet; } - bool HasStripControlsSet() const { return m_bHasStripControlsSet; } // !Getters private: protected: @@ -167,8 +163,6 @@ protected: bool m_bDisabled; bool m_bHasBufferCountSet; bool m_bHasAutoClearChanBufferSet; - bool m_bStripControls; - bool m_bHasStripControlsSet; CString m_sName; CString m_sKey; CString m_sTopic; diff --git a/include/znc/IRCNetwork.h b/include/znc/IRCNetwork.h index 975b8524..992b3121 100644 --- a/include/znc/IRCNetwork.h +++ b/include/znc/IRCNetwork.h @@ -131,9 +131,6 @@ public: void SetIRCConnectEnabled(bool b); bool GetIRCConnectEnabled() const { return m_bIRCConnectEnabled; } - void SetStripControls(bool b); - bool StripControls() const { return m_bStripControls; } - CIRCSock* GetIRCSock() { return m_pIRCSock; } const CIRCSock* GetIRCSock() const { return m_pIRCSock; } const CString& GetIRCServer() const; @@ -227,7 +224,6 @@ protected: CString m_sChanPrefixes; bool m_bIRCConnectEnabled; - bool m_bStripControls; CString m_sIRCServer; std::vector m_vServers; size_t m_uServerIdx; ///< Index in m_vServers of our current server + 1 diff --git a/modules/controlpanel.cpp b/modules/controlpanel.cpp index 6442bd0e..e27b3dcb 100644 --- a/modules/controlpanel.cpp +++ b/modules/controlpanel.cpp @@ -121,7 +121,6 @@ class CAdminMod : public CModule { {"Encoding", str}, #endif {"QuitMsg", str}, - {"StripControls", boolean}, }; PrintVarsHelp(sVarFilter, nvars, ARRAY_SIZE(nvars), "The following variables are available when using the SetNetwork/GetNetwork commands:"); } @@ -133,8 +132,7 @@ class CAdminMod : public CModule { {"Buffer", integer}, {"InConfig", boolean}, {"AutoClearChanBuffer", boolean}, - {"Detached", boolean}, - {"StripControls", boolean}, + {"Detached", boolean} }; PrintVarsHelp(sVarFilter, cvars, ARRAY_SIZE(cvars), "The following variables are available when using the SetChan/GetChan commands:"); } @@ -498,8 +496,6 @@ class CAdminMod : public CModule { #endif } else if (sVar.Equals("quitmsg")) { PutModule("QuitMsg = " + pNetwork->GetQuitMsg()); - } else if (sVar.Equals("stripcontrols")) { - PutModule("StripControls = " + CString(pNetwork->StripControls())); } else { PutModule("Error: Unknown variable"); } @@ -593,10 +589,6 @@ class CAdminMod : public CModule { } else if (sVar.Equals("quitmsg")) { pNetwork->SetQuitMsg(sValue); PutModule("QuitMsg = " + pNetwork->GetQuitMsg()); - } else if (sVar == "stripcontrols") { - bool b = sValue.ToBool(); - pNetwork->SetStripControls(b); - PutModule("StripControls = " + CString(b)); } else { PutModule("Error: Unknown variable"); } @@ -716,12 +708,6 @@ class CAdminMod : public CModule { PutModule(pChan->GetName() + ": AutoClearChanBuffer = " + sValue); } else if (sVar == "detached") { PutModule(pChan->GetName() + ": Detached = " + CString(pChan->IsDetached())); - } else if (sVar == "stripcontrols") { - CString sValue(pChan->StripControls()); - if (!pChan->HasStripControlsSet()) { - sValue += " (default)"; - } - PutModule(pChan->GetName() + ": StripControls = " + sValue); } else if (sVar == "key") { PutModule(pChan->GetName() + ": Key = " + pChan->GetKey()); } else { @@ -793,10 +779,6 @@ class CAdminMod : public CModule { pChan->AttachUser(); } PutModule(pChan->GetName() + ": Detached = " + CString(b)); - } else if (sVar == "stripcontrols") { - bool b = sValue.ToBool(); - pChan->SetStripControls(b); - PutModule(pChan->GetName() + ": StripControls = " + CString(b)); } else if (sVar == "key") { pChan->SetKey(sValue); PutModule(pChan->GetName() + ": Key = " + sValue); diff --git a/modules/data/webadmin/tmpl/add_edit_network.tmpl b/modules/data/webadmin/tmpl/add_edit_network.tmpl index fa392921..9d7eded8 100644 --- a/modules/data/webadmin/tmpl/add_edit_network.tmpl +++ b/modules/data/webadmin/tmpl/add_edit_network.tmpl @@ -129,16 +129,6 @@ -
-
Strip Controls:
-
- checked="checked" /> - -
-
-
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index 0de853a6..a3a009aa 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -666,11 +666,6 @@ public: o4["DisplayName"] = "Disabled"; if (pChan && pChan->IsDisabled()) { o4["Checked"] = "true"; } - CTemplate& o5 = Tmpl.AddRow("OptionLoop"); - o5["Name"] = "stripcontrols"; - o5["DisplayName"] = "Strip Controls"; - if (pChan && pChan->StripControls()) { o5["Checked"] = "true"; } - FOR_EACH_MODULE(i, pNetwork) { CTemplate& mod = Tmpl.AddRow("EmbeddedModuleLoop"); mod.insert(Tmpl.begin(), Tmpl.end()); @@ -734,11 +729,6 @@ public: else pChan->Enable(); - bool bStripControls = WebSock.GetParam("stripcontrols").ToBool(); - if (pChan->StripControls() != bStripControls) { - pChan->SetStripControls(bStripControls); - } - CTemplate TmplMod; TmplMod["User"] = pUser->GetUserName(); TmplMod["ChanName"] = pChan->GetName(); @@ -845,7 +835,6 @@ public: Tmpl["QuitMsg"] = pNetwork->GetQuitMsg(); - Tmpl["StripControls"] = CString(pNetwork->StripControls()); Tmpl["FloodProtection"] = CString(CIRCSock::IsFloodProtected(pNetwork->GetFloodRate())); Tmpl["FloodRate"] = CString(pNetwork->GetFloodRate()); Tmpl["FloodBurst"] = CString(pNetwork->GetFloodBurst()); @@ -1007,11 +996,6 @@ public: pNetwork->SetJoinDelay(WebSock.GetParam("joindelay").ToUShort()); - bool bStripControls = WebSock.GetParam("stripcontrols").ToBool(); - if (pNetwork->StripControls() != bStripControls) { - pNetwork->SetStripControls(bStripControls); - } - #ifdef HAVE_ICU CString sEncodingUtf = WebSock.GetParam("encoding_utf"); if (sEncodingUtf == "legacy") { diff --git a/src/Chan.cpp b/src/Chan.cpp index bc6e53c7..a6142839 100644 --- a/src/Chan.cpp +++ b/src/Chan.cpp @@ -33,8 +33,6 @@ CChan::CChan(const CString& sName, CIRCNetwork* pNetwork, bool bInConfig, CConfi m_bDisabled(false), m_bHasBufferCountSet(false), m_bHasAutoClearChanBufferSet(false), - m_bStripControls(false), - m_bHasStripControlsSet(false), m_sName(sName.Token(0)), m_sKey(sName.Token(1)), m_sTopic(""), @@ -70,8 +68,6 @@ CChan::CChan(const CString& sName, CIRCNetwork* pNetwork, bool bInConfig, CConfi if (pConfig->FindStringEntry("disabled", sValue)) if (sValue.ToBool()) Disable(); - if (pConfig->FindStringEntry("stripcontrols", sValue)) - SetStripControls(sValue.ToBool()); if (pConfig->FindStringEntry("autocycle", sValue)) if (sValue.Equals("true")) CUtils::PrintError("WARNING: AutoCycle has been removed, instead try -> LoadModule = autocycle " + sName); @@ -110,8 +106,6 @@ CConfig CChan::ToConfig() const { config.AddKeyValuePair("Detached", "true"); if (IsDisabled()) config.AddKeyValuePair("Disabled", "true"); - if (m_bHasStripControlsSet) - config.AddKeyValuePair("StripControls", CString(StripControls())); if (!GetKey().empty()) config.AddKeyValuePair("Key", GetKey()); if (!GetDefaultModes().empty()) @@ -124,7 +118,6 @@ void CChan::Clone(CChan& chan) { // We assume that m_sName and m_pNetwork are equal SetBufferCount(chan.GetBufferCount(), true); SetAutoClearChanBuffer(chan.AutoClearChanBuffer()); - SetStripControls(chan.StripControls()); SetKey(chan.GetKey()); SetDefaultModes(chan.GetDefaultModes()); @@ -269,17 +262,6 @@ void CChan::InheritAutoClearChanBuffer(bool b) { } } -void CChan::SetStripControls(bool b) { - m_bHasStripControlsSet = true; - m_bStripControls = b; -} - -void CChan::InheritStripControls(bool b) { - if (!m_bHasStripControlsSet) { - m_bStripControls = b; - } -} - void CChan::OnWho(const CString& sNick, const CString& sIdent, const CString& sHost) { CNick* pNick = FindNick(sNick); @@ -414,14 +396,6 @@ CString CChan::GetOptions() const { } } - if (StripControls()) { - if (HasStripControlsSet()) { - vsRet.push_back("StripControls"); - } else { - vsRet.push_back("StripControls (default)"); - } - } - return CString(", ").Join(vsRet.begin(), vsRet.end()); } diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp index 887cf900..98ee955d 100644 --- a/src/IRCNetwork.cpp +++ b/src/IRCNetwork.cpp @@ -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 BoolOptions[] = { { "ircconnectenabled", &CIRCNetwork::SetIRCConnectEnabled }, - { "stripcontrols", &CIRCNetwork::SetStripControls }, }; TOption 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(); diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp index f33bbf1b..b1603a2e 100644 --- a/src/IRCSock.cpp +++ b/src/IRCSock.cpp @@ -687,10 +687,6 @@ void CIRCSock::ReadLine(const CString& sData) { sMsg.RightChomp(); if (sTarget.Equals(GetNick())) { - if (m_pNetwork->StripControls()) { - sMsg.StripControls(); - } - if (OnCTCPReply(Nick, sMsg)) { return; } @@ -700,19 +696,10 @@ void CIRCSock::ReadLine(const CString& sData) { return; } else { if (sTarget.Equals(GetNick())) { - if (m_pNetwork->StripControls()) { - sMsg.StripControls(); - } - if (OnPrivNotice(Nick, sMsg)) { return; } } else { - CChan* pChan = m_pNetwork->FindChan(sTarget); - if (pChan && pChan->StripControls()) { - sMsg.StripControls(); - } - if (OnChanNotice(Nick, sTarget, sMsg)) { return; } @@ -757,19 +744,10 @@ void CIRCSock::ReadLine(const CString& sData) { sMsg.RightChomp(); if (sTarget.Equals(GetNick())) { - if (m_pNetwork->StripControls()) { - sMsg.StripControls(); - } - if (OnPrivCTCP(Nick, sMsg)) { return; } } else { - CChan* pChan = m_pNetwork->FindChan(sTarget); - if (pChan && pChan->StripControls()) { - sMsg.StripControls(); - } - if (OnChanCTCP(Nick, sTarget, sMsg)) { return; } @@ -779,19 +757,10 @@ void CIRCSock::ReadLine(const CString& sData) { return; } else { if (sTarget.Equals(GetNick())) { - if (m_pNetwork->StripControls()) { - sMsg.StripControls(); - } - if (OnPrivMsg(Nick, sMsg)) { return; } } else { - CChan* pChan = m_pNetwork->FindChan(sTarget); - if (pChan && pChan->StripControls()) { - sMsg.StripControls(); - } - if (OnChanMsg(Nick, sTarget, sMsg)) { return; }