* | 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
/* $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;
{
}
- 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
if(adding && (channel->bans.size() > static_cast<unsigned>(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;
}
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
if(redirects->empty())
{
- DELETE(redirects);
+ delete redirects;
channel->Shrink("banredirects");
}
}
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;
}
}
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);
}
{
if(target_type == TYPE_CHANNEL)
{
- chanrec* chan = static_cast<chanrec*>(item);
+ Channel* chan = static_cast<Channel*>(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<std::string> mode_junk;
+ mode_junk.push_back(chan->name);
for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++)
{
{
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)
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;
}
virtual ~ModuleBanRedirect()
{
ServerInstance->Modes->DelModeWatcher(re);
- DELETE(re);
+ delete re;
}
virtual Version GetVersion()
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)
projects / user / henk / code / inspircd.git / blobdiff