X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=6517da0a2e8438be0db872a93c01f06545d0b3e7;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=1764e6f56689b7f4dfb74af3804c6a2a9aa24aa1;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 1764e6f56..6517da0a2 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,15 +12,11 @@ */ #include "inspircd.h" -#include "mode.h" -#include "users.h" -#include "channels.h" -#include "modules.h" #include "u_listmode.h" /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */ -/* Originally written by Om, January 2007 +/* Originally written by Om, January 2008 */ class BanRedirectEntry @@ -48,7 +44,7 @@ class BanRedirect : public ModeWatcher { } - bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶m, bool adding, ModeType type) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type) { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan @@ -66,7 +62,7 @@ class BanRedirect : public ModeWatcher std::string::iterator start_pos = param.begin(); long maxbans = channel->GetMaxBans(); - if(channel->bans.size() > static_cast(maxbans)) + if(adding && (channel->bans.size() > static_cast(maxbans))) { source->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)", source->nick, channel->name, channel->name, maxbans); return false; @@ -158,7 +154,7 @@ class BanRedirect : public ModeWatcher if(redirects->empty()) { - DELETE(redirects); + delete redirects; channel->Shrink("banredirects"); } @@ -197,18 +193,20 @@ class ModuleBanRedirect : public Module re = new BanRedirect(Me); nofollow = false; - if(!ServerInstance->AddModeWatcher(re)) + if(!ServerInstance->Modes->AddModeWatcher(re)) + { + delete re; throw ModuleException("Could not add mode watcher"); + } OnRehash(NULL, ""); + + Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup }; + Me->Modules->Attach(list, this, sizeof(*list)); + } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1; - } - - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { OnCleanup(TYPE_CHANNEL, chan); } @@ -217,7 +215,7 @@ class ModuleBanRedirect : public Module { if(target_type == TYPE_CHANNEL) { - chanrec* chan = static_cast(item); + Channel* chan = static_cast(item); BanRedirectList* redirects; if(chan->GetExt("banredirects", redirects)) @@ -225,8 +223,6 @@ class ModuleBanRedirect : public Module irc::modestacker modestack(false); StringDeque stackresult; const char* mode_junk[MAXMODES+2]; - userrec* myhorriblefakeuser = new userrec(ServerInstance); - myhorriblefakeuser->SetFd(FD_MAGIC_NUMBER); mode_junk[0] = chan->name; @@ -248,22 +244,21 @@ class ModuleBanRedirect : public Module mode_junk[i+1] = stackresult[i].c_str(); } - ServerInstance->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser); + ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient); } - DELETE(myhorriblefakeuser); - DELETE(redirects); + delete redirects; chan->Shrink("banredirects"); } } } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { - ExceptionModule = ServerInstance->FindModule("m_banexception.so"); + ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, bool synching = false) { /* This prevents recursion when a user sets multiple ban redirects in a chain * (thanks Potter) @@ -300,18 +295,19 @@ class ModuleBanRedirect : public Module if(ServerInstance->MatchText(user->GetFullRealHost(), redir->banmask) || ServerInstance->MatchText(user->GetFullHost(), redir->banmask) || ServerInstance->MatchText(ipmask, redir->banmask)) { /* tell them they're banned and are being transferred */ - chanrec* destchan = ServerInstance->FindChan(redir->targetchan); + Channel* destchan = ServerInstance->FindChan(redir->targetchan); - if(destchan && ServerInstance->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) + if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) { user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name); return 1; } else { - user->WriteServ("470 %s :You are banned from %s. You are being automatically redirected to %s", user->nick, chan->name, redir->targetchan.c_str()); + user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name); + user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str()); nofollow = true; - chanrec::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true)); + Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time(true)); nofollow = false; return 1; } @@ -325,7 +321,7 @@ class ModuleBanRedirect : public Module virtual ~ModuleBanRedirect() { ServerInstance->Modes->DelModeWatcher(re); - DELETE(re); + delete re; } virtual Version GetVersion() @@ -333,11 +329,11 @@ class ModuleBanRedirect : public Module return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - Priority Prioritize() + void Prioritize() { - return (Priority)ServerInstance->PriorityBefore("m_banexception.so"); + Module* banex = ServerInstance->Modules->Find("m_banexception.so"); + ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIO_BEFORE, &banex); } }; - MODULE_INIT(ModuleBanRedirect)