X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=f786d48ee692b92c6b0b48b562c8474a78fec581;hb=7d7250484c352c13830e63ae41ee8faae40a9bd5;hp=9fa36b5169b045572bb69d8e98505180e05fc0aa;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 9fa36b516..f786d48ee 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 @@ -16,10 +16,10 @@ /* $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 +class BanRedirectEntry : public classbase { public: std::string targetchan; @@ -44,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, bool) { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan @@ -64,7 +64,7 @@ class BanRedirect : public ModeWatcher 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); + source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans); return false; } @@ -114,11 +114,11 @@ class BanRedirect : public ModeWatcher if(mask[CHAN].length()) { - if(Srv->IsChannel(mask[CHAN].c_str())) + if(!IS_LOCAL(source) || Srv->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax)) { - if(irc::string(channel->name) == irc::string(mask[CHAN].c_str())) + if (assign(channel->name) == mask[CHAN]) { - source->WriteServ("690 %s %s :You cannot set a ban redirection to the channel the ban is on", source->nick, channel->name); + source->WriteNumeric(690, "%s %s :You cannot set a ban redirection to the channel the ban is on", source->nick.c_str(), channel->name.c_str()); return false; } else @@ -154,7 +154,7 @@ class BanRedirect : public ModeWatcher if(redirects->empty()) { - DELETE(redirects); + delete redirects; channel->Shrink("banredirects"); } @@ -170,7 +170,7 @@ class BanRedirect : public ModeWatcher } else { - source->WriteServ("403 %s %s :Invalid channel name in redirection (%s)", source->nick, channel->name, mask[CHAN].c_str()); + source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick.c_str(), channel->name.c_str(), mask[CHAN].c_str()); return false; } } @@ -193,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, 4); + } - 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); } @@ -213,18 +215,15 @@ 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)) { 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; + std::vector mode_junk; + mode_junk.push_back(chan->name); for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++) { @@ -241,25 +240,24 @@ class ModuleBanRedirect : public Module { for(StringDeque::size_type i = 0; i < stackresult.size(); i++) { - mode_junk[i+1] = stackresult[i].c_str(); + mode_junk.push_back(stackresult[i]); } - ServerInstance->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser); + ServerInstance->SendMode(mode_junk, 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, const std::string &keygiven) { /* This prevents recursion when a user sets multiple ban redirects in a chain * (thanks Potter) @@ -296,19 +294,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); + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); return 1; } else { - 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()); + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); + user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick.c_str(), 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()); nofollow = false; return 1; } @@ -322,7 +320,7 @@ class ModuleBanRedirect : public Module virtual ~ModuleBanRedirect() { ServerInstance->Modes->DelModeWatcher(re); - DELETE(re); + delete re; } virtual Version GetVersion() @@ -330,11 +328,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)