iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01: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

16
modules/webadmin.cpp
View File

@@ -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") {