Permalink
Browse files

Rename control back to controlpanel...

I shouldn't do this during beta.
  • Loading branch information...
1 parent b0a2a58 commit a0e9977264386ccba9be34a3875b9d4d8f8ca640 @DarthGandalf DarthGandalf committed Oct 19, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 modules/{control.cpp → controlpanel.cpp}
  2. +3 −3 src/User.cpp
  3. +2 −2 src/znc.cpp
@@ -1133,7 +1133,7 @@ class CAdminMod : public CModule {
};
template<> void TModInfo<CAdminMod>(CModInfo& Info) {
- Info.SetWikiPage("control");
+ Info.SetWikiPage("controlpanel");
}
USERMODULEDEFS(CAdminMod, "Dynamic configuration through IRC. Allows editing only yourself if you're not ZNC admin.")
View
@@ -376,9 +376,9 @@ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
}
// XXX Legacy crap, added in ZNC 0.207
- if (sModName == "admin" || sModName == "controlpanel") {
- CUtils::PrintMessage("NOTICE: [admin] module was renamed, loading [control] instead");
- sModName = "control";
+ if (sModName == "admin") {
+ CUtils::PrintMessage("NOTICE: [admin] module was renamed, loading [controlpanel] instead");
+ sModName = "controlpanel";
}
CUtils::PrintAction("Loading user module [" + sModName + "]");
View
@@ -524,7 +524,7 @@ CString CZNC::MakeConfigHeader() {
"// WARNING\n"
"//\n"
"// Do NOT edit this file while ZNC is running!\n"
- "// Use webadmin or *control instead.\n"
+ "// Use webadmin or *controlpanel instead.\n"
"//\n"
"// Buf if you feel risky, you might want to read help on /znc saveconfig and /znc rehash.\n"
"// Also check http://en.znc.in/wiki/Configuration\n";
@@ -956,7 +956,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
}
size_t CZNC::FilterUncommonModules(set<CModInfo>& ssModules) {
- const char* ns[] = { "webadmin", "control",
+ const char* ns[] = { "webadmin", "controlpanel",
"chansaver", "keepnick", "simple_away", "partyline",
"kickrejoin", "nickserv", "perform" };
const set<CString> ssNames(ns, ns + sizeof(ns) / sizeof(ns[0]));

0 comments on commit a0e9977

Please sign in to comment.