X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=eb47e329e479225a8954d42117eb8e9d544a057e;hb=31b232eec07d0b85ce2cc7c4ebc5d5387f781dcb;hp=f719b9e878e3317a0b98c66ef396c60b14ceec01;hpb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index f719b9e87..eb47e329e 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -12,7 +12,6 @@ */ #include "inspircd.h" -#include "wildcard.h" /** Holds a users m_safelist state */ @@ -185,7 +184,7 @@ class ModuleSafeList : public Module if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user))) { - bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); + bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob))); if ((users) && (display)) { int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users); @@ -195,7 +194,7 @@ class ModuleSafeList : public Module } else if ((chan) && ((((!(chan->IsModeSet('p'))) && (!(chan->IsModeSet('s'))))) || (has_user) || IS_OPER(user))) { - bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); + bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob))); if ((users) && (display)) { int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic.c_str());