X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=b71992c053db8e226e2e8e8cbfa41334a57882aa;hb=9336468f5bfa60318cb57db5126047147b7a21cb;hp=58c02dcd200f1fd1a2a6ec4a6299b57f3adefeb8;hpb=e853ec6473b874506b2036de2f76d6ae7cd34325;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 58c02dcd2..b71992c05 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -27,95 +27,83 @@ * Now supports CIDR and IP addresses -- Brain */ -class InspIRCd* ServerInstance; - /** Handles channel mode +I */ class InviteException : public ListModeBase { public: - InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", 346, 347, true) { } + InviteException(Module* Creator) : ListModeBase(Creator, 'I', "End of Channel Invite Exception List", 346, 347, true) { } }; class ModuleInviteException : public Module { - InviteException* ie; + InviteException ie; public: - ModuleInviteException(InspIRCd* Me) : Module(Me) + ModuleInviteException() : ie(this) { - ie = new InviteException(ServerInstance); - if (!ServerInstance->Modes->AddMode(ie)) + if (!ServerInstance->Modes->AddMode(&ie)) throw ModuleException("Could not add new modes!"); ServerInstance->Modules->PublishInterface("ChannelBanList", this); - ie->DoImplements(this); + ie.DoImplements(this); Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite }; ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::string &output) { output.append(" INVEX=I"); } - virtual int OnCheckInvite(User* user, Channel* chan) + ModResult OnCheckInvite(User* user, Channel* chan) { if(chan != NULL) { - modelist* list; - chan->GetExt(ie->GetInfoKey(), list); + modelist* list = ie.extItem.get(chan); if (list) { 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(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask))) + if (chan->CheckBan(user, it->mask)) { - // They match an entry on the list, so let them in. - return 1; + return MOD_RES_ALLOW; } } } // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything. } - return 0; - } - - virtual const char* OnRequest(Request* request) - { - return ie->DoOnRequest(request); + return MOD_RES_PASSTHRU; } - virtual void OnCleanup(int target_type, void* item) + const char* OnRequest(Request* request) { - ie->DoCleanup(target_type, item); + return ie.DoOnRequest(request); } - virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) + void OnCleanup(int target_type, void* item) { - ie->DoSyncChannel(chan, proto, opaque); + ie.DoCleanup(target_type, item); } - virtual void OnChannelDelete(Channel* chan) + void OnSyncChannel(Channel* chan, Module* proto, void* opaque) { - ie->DoChannelDelete(chan); + ie.DoSyncChannel(chan, proto, opaque); } - virtual void OnRehash(User* user, const std::string ¶m) + void OnRehash(User* user) { - ie->DoRehash(); + ie.DoRehash(); } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION); + return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON, API_VERSION); } ~ModuleInviteException() { - ServerInstance->Modes->DelMode(ie); - delete ie; ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); } };