* | 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(User* source, User* dest, Channel* 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, channel->name, channel->name, maxbans);
return false;
}
{
if(irc::string(channel->name) == irc::string(mask[CHAN].c_str()))
{
- 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, channel->name);
return false;
}
else
}
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, channel->name, 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, sizeof(list));
+ Me->Modules->Attach(list, this, 4);
}
ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
}
- virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, bool synching = false)
+ virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
{
/* This prevents recursion when a user sets multiple ban redirects in a chain
* (thanks Potter)
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, chan->name);
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, chan->name);
+ user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str());
nofollow = true;
- Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time(true));
+ Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
nofollow = false;
return 1;
}