From 8662f747e716f5c2a0e724f2a1ba54b060ae1f97 Mon Sep 17 00:00:00 2001 From: brain Date: Sat, 4 Oct 2008 15:06:00 +0000 Subject: Fix for bug #613 reported by Casey, m_regex_glob's parameters were back to front! git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10620 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_filter.cpp | 4 +++- src/modules/m_regex_glob.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index a44785b14..1c9231738 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -563,12 +563,13 @@ class ModuleFilter : public FilterBase for (std::vector::iterator index = filters.begin(); index != filters.end(); index++) { /* Skip ones that dont apply to us */ - if (!FilterBase::AppliesToMe(user, dynamic_cast(&(*index)), flgs)) continue; + //ServerInstance->Logs->Log("m_filter", DEBUG, "Match '%s' against '%s'", text.c_str(), index->freeform.c_str()); if (index->regex->Matches(text)) { + //ServerInstance->Logs->Log("m_filter", DEBUG, "MATCH"); fr = *index; if (index != filters.begin()) { @@ -578,6 +579,7 @@ class ModuleFilter : public FilterBase } return &fr; } + //ServerInstance->Logs->Log("m_filter", DEBUG, "NO MATCH"); } return NULL; } diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp index 8990995cf..d72d49896 100644 --- a/src/modules/m_regex_glob.cpp +++ b/src/modules/m_regex_glob.cpp @@ -30,7 +30,7 @@ public: virtual bool Matches(const std::string& text) { - return InspIRCd::Match(this->regex_string, text); + return InspIRCd::Match(text, this->regex_string); } }; -- cgit v1.2.3