X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=1ecec735e0ac69ef00fd1556940f1692774253c3;hb=553a8da754c8cd308bad2008018849714e70f9b7;hp=1810f82971ba8b650d87cc028b3681be66f87f72;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 1810f8297..1ecec735e 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -1,16 +1,26 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006 Oliver Lupton * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * --------------------------------------------------- + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "u_listmode.h" @@ -27,119 +37,78 @@ * 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, "invex", '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->AddMode(ie, 'I')) + if (!ServerInstance->Modes->AddMode(&ie)) throw ModuleException("Could not add new modes!"); - ServerInstance->PublishInterface("ChannelBanList", this); - } - virtual void Implements(char* List) - { - ie->DoImplements(List); - List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckInvite] = 1; + ie.DoImplements(this); + Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - - virtual void On005Numeric(std::string &output) + + void On005Numeric(std::string &output) { output.append(" INVEX=I"); } - - virtual int OnCheckInvite(userrec* user, chanrec* 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) { - char mask[MAXBUF]; - snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString()); for (modelist::iterator it = list->begin(); it != list->end(); it++) { - if(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true))) + 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; + return MOD_RES_PASSTHRU; } - virtual char* OnRequest(Request* request) + ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) { - ListModeRequest* LM = (ListModeRequest*)request; - if (strcmp("LM_CHECKLIST", request->GetId()) == 0) - { - modelist* list; - LM->chan->GetExt(ie->GetInfoKey(), list); - if (list) - { - char mask[MAXBUF]; - snprintf(mask, MAXBUF, "%s!%s@%s", 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.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true))) - { - // They match an entry - return (char*)it->mask.c_str(); - } - } - return NULL; - } - } - return NULL; + if (ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true)) + return OnCheckInvite(user, chan); + return MOD_RES_PASSTHRU; } - virtual void OnCleanup(int target_type, void* item) + void OnCleanup(int target_type, void* item) { - ie->DoCleanup(target_type, item); + ie.DoCleanup(target_type, item); } - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) + void OnSyncChannel(Channel* chan, Module* proto, void* opaque) { - ie->DoSyncChannel(chan, proto, opaque); + ie.DoSyncChannel(chan, proto, opaque); } - virtual void OnChannelDelete(chanrec* chan) - { - ie->DoChannelDelete(chan); - } - - virtual void OnRehash(userrec* user, const std::string ¶m) - { - ie->DoRehash(); - } - - virtual Version GetVersion() + void OnRehash(User* user) { - return Version(1, 1, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION); + ie.DoRehash(); } - ~ModuleInviteException() + Version GetVersion() { - ServerInstance->Modes->DelMode(ie); - DELETE(ie); - ServerInstance->UnpublishInterface("ChannelBanList", this); + return Version("Provides support for the +I channel mode", VF_VENDOR); } };