From 0adf4e5af30d0b9cf3d53bd58e95d94f0c462c15 Mon Sep 17 00:00:00 2001 From: psychon Date: Thu, 7 Feb 2008 22:25:58 +0000 Subject: [PATCH] Remove OnConfigLine() module call git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@945 726aef4b-f618-498e-8847-2d620e286838 --- Modules.cpp | 5 ----- Modules.h | 2 -- znc.cpp | 6 ------ 3 files changed, 13 deletions(-) diff --git a/Modules.cpp b/Modules.cpp index 478601cb..ae7bf853 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -548,7 +548,6 @@ bool CModule::PutModNotice(const CString& sLine, const CString& sIdent, const CS /////////////////// // CGlobalModule // /////////////////// -CModule::EModRet CGlobalModule::OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan) { return CONTINUE; } CModule::EModRet CGlobalModule::OnDeleteUser(CUser& User) { return CONTINUE; } CModule::EModRet CGlobalModule::OnLoginAttempt(CSmartPtr Auth) { return CONTINUE; } void CGlobalModule::OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) {} @@ -631,10 +630,6 @@ bool CModules::OnModCTCP(const CString& sMessage) { MODUNLOADCHK(OnModCTCP(sMess //////////////////// // CGlobalModules // //////////////////// -bool CGlobalModules::OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan) { - GLOBALMODHALTCHK(OnConfigLine(sName, sValue, pUser, pChan)); -} - bool CGlobalModules::OnDeleteUser(CUser& User) { GLOBALMODHALTCHK(OnDeleteUser(User)); } diff --git a/Modules.h b/Modules.h index 2f5a315e..b2e0a527 100644 --- a/Modules.h +++ b/Modules.h @@ -426,7 +426,6 @@ public: const CString &sDataDir) : CModule(pDLL, sModName, sDataDir) {} virtual ~CGlobalModule() {} - virtual EModRet OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan); virtual EModRet OnDeleteUser(CUser& User); virtual EModRet OnLoginAttempt(CSmartPtr Auth); virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP); @@ -438,7 +437,6 @@ public: CGlobalModules() : CModules() {} virtual ~CGlobalModules() {} - virtual bool OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan); virtual bool OnDeleteUser(CUser& User); virtual bool OnLoginAttempt(CSmartPtr Auth); virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP); diff --git a/znc.cpp b/znc.cpp index 45dd5cd8..d186568a 100644 --- a/znc.cpp +++ b/znc.cpp @@ -919,12 +919,6 @@ bool CZNC::ParseConfig(const CString& sConfig) { sName.Trim(); sValue.Trim(); -#ifdef _MODULES - if (GetModules().OnConfigLine(sName, sValue, pUser, pChan)) { - continue; - } -#endif - if ((!sName.empty()) && (!sValue.empty())) { if (pUser) { if (pChan) {