* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class BanException : public ListModeBase
{
public:
- BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { }
+ BanException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'e', "End of Channel Exception List", 348, 349, true) { }
};
class ModuleBanException : public Module
{
- BanException* be;
-
+ BanException be;
public:
- ModuleBanException(InspIRCd* Me) : Module(Me)
+ ModuleBanException(InspIRCd* Me) : Module(Me), be(Me, this)
{
- be = new BanException(ServerInstance);
- if (!ServerInstance->Modes->AddMode(be))
+ if (!ServerInstance->Modes->AddMode(&be))
throw ModuleException("Could not add new modes!");
ServerInstance->Modules->PublishInterface("ChannelBanList", this);
- be->DoImplements(this);
+ be.DoImplements(this);
Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan };
Me->Modules->Attach(list, this, 6);
output.append(" EXCEPTS=e");
}
- virtual int OnCheckExtBan(User *user, Channel *chan, char type)
+ virtual ModResult OnCheckExtBan(User *user, Channel *chan, char type)
{
if (chan != NULL)
{
modelist *list;
- chan->GetExt(be->GetInfoKey(), list);
+ chan->GetExt(be.GetInfoKey(), list);
if (!list)
- return 0;
+ return MOD_RES_PASSTHRU;
std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
for (modelist::iterator it = list->begin(); it != list->end(); it++)
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;
+ return MOD_RES_ALLOW;
}
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
+ virtual ModResult OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
{
if (chan != NULL)
{
modelist *list;
- chan->GetExt(be->GetInfoKey(), list);
+ chan->GetExt(be.GetInfoKey(), list);
if (!list)
- return 0;
+ return MOD_RES_PASSTHRU;
for (modelist::iterator it = list->begin(); it != list->end(); it++)
{
if (it->mask[0] != type || it->mask[1] != ':')
std::string maskptr = it->mask.substr(2);
if (InspIRCd::Match(str, maskptr))
- return 1; // matches
+ // They match an entry on the list, so let them in.
+ return MOD_RES_ALLOW;
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnCheckBan(User* user, Channel* chan)
+ virtual ModResult OnCheckBan(User* user, Channel* chan)
{
if (chan != NULL)
{
modelist* list;
- chan->GetExt(be->GetInfoKey(), list);
+ chan->GetExt(be.GetInfoKey(), list);
if (!list)
{
// No list, proceed normally
- return 0;
+ return MOD_RES_PASSTHRU;
}
std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
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;
+ return MOD_RES_ALLOW;
}
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
virtual void OnCleanup(int target_type, void* item)
{
- be->DoCleanup(target_type, item);
+ be.DoCleanup(target_type, item);
}
virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
{
- be->DoSyncChannel(chan, proto, opaque);
+ be.DoSyncChannel(chan, proto, opaque);
}
virtual void OnChannelDelete(Channel* chan)
{
- be->DoChannelDelete(chan);
+ be.DoChannelDelete(chan);
}
- virtual void OnRehash(User* user, const std::string ¶m)
+ virtual void OnRehash(User* user)
{
- be->DoRehash();
+ be.DoRehash();
}
virtual const char* OnRequest(Request* request)
{
- return be->DoOnRequest(request);
+ return be.DoOnRequest(request);
}
virtual Version GetVersion()
virtual ~ModuleBanException()
{
- ServerInstance->Modes->DelMode(be);
- delete be;
+ ServerInstance->Modes->DelMode(&be);
ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
}
};