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