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

remove pModule from Ismatch

Browse Source
This commit is contained in:
Daniel Wallace
2012-11-23 08:17:52 -05:00
parent 77e4ae5408
commit f941ee5870
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/autoattach.cpp
View File

@@ -30,7 +30,7 @@ public:
m_sHostmaskWildcard = "*!*@*";
}
bool IsMatch(const CString& sChan, const CString& sHost, const CString& sMessage, const CModule *pModule) const {
bool IsMatch(const CString& sChan, const CString& sHost, const CString& sMessage) const {
if (!sHost.WildCmp(m_sHostmaskWildcard))
return false;
if (!sChan.WildCmp(m_sChannelWildcard))
@@ -190,7 +190,6 @@ public:
const CString& sChan = Channel.GetName();
const CString& sHost = Nick.GetHostMask();
const CString& sMessage = Message;
const CModule* pModule = this;
VAttachIter it;
if (!Channel.IsDetached())
@@ -198,13 +197,13 @@ public:
// Any negated match?
for (it = m_vMatches.begin(); it != m_vMatches.end(); ++it) {
if (it->IsNegated() && it->IsMatch(sChan, sHost, sMessage, pModule))
if (it->IsNegated() && it->IsMatch(sChan, sHost, sMessage))
return;
}
// Now check for a positive match
for (it = m_vMatches.begin(); it != m_vMatches.end(); ++it) {
if (!it->IsNegated() && it->IsMatch(sChan, sHost, sMessage, pModule)) {
if (!it->IsNegated() && it->IsMatch(sChan, sHost, sMessage)) {
Channel.JoinUser();
return;
}