#include "inspircd.h"
#include "u_listmode.h"
-#include "wildcard.h"
/* $ModDesc: Provides support for the +e channel mode */
/* $ModDep: ../../include/u_listmode.h */
std::string maskptr = it->mask.substr(2);
- if (match(user->GetFullRealHost(), maskptr) || match(user->GetFullHost(), maskptr) || (match(mask, maskptr, true)))
+ if (InspIRCd::Match(user->GetFullRealHost(), maskptr) || InspIRCd::Match(user->GetFullHost(), maskptr) || (InspIRCd::MatchCIDR(mask, maskptr)))
{
// They match an entry on the list, so let them pass this.
return 1;
continue;
std::string maskptr = it->mask.substr(2);
- if (match(maskptr, str))
+ if (InspIRCd::Match(str, maskptr))
return 1; // matches
}
}
std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
for (modelist::iterator it = list->begin(); it != list->end(); it++)
{
- if (match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
+ if (InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
{
// They match an entry on the list, so let them in.
return 1;
virtual const char* OnRequest(Request* request)
{
- ListModeRequest* LM = (ListModeRequest*)request;
- if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
- {
- modelist* list;
- LM->chan->GetExt(be->GetInfoKey(), list);
- if (list)
- {
- std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
- for (modelist::iterator it = list->begin(); it != list->end(); it++)
- {
- if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
- {
- // They match an entry
- return (char*)it->mask.c_str();
- }
- }
- return NULL;
- }
- }
- return NULL;
+ return be->DoOnRequest(request);
}
virtual Version GetVersion()
{
- return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
virtual ~ModuleBanException()