* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
#include "u_listmode.h"
/* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
-/* $ModDep: ../../include/u_listmode.h */
/* Originally written by Om, January 2009
*/
-class BanRedirectEntry : public classbase
+class BanRedirectEntry
{
public:
std::string targetchan;
{
public:
SimpleExtItem<BanRedirectList> extItem;
- BanRedirect(Module* parent) : ModeWatcher('b', MODETYPE_CHANNEL),
+ BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL),
extItem("banredirect", parent)
{
}
start_pos = curr+1;
break;
case '#':
- mask[current].assign(start_pos, curr);
- current = CHAN;
- start_pos = curr;
+ /* bug #921: don't barf when redirecting to ## channels */
+ if (current != CHAN)
+ {
+ mask[current].assign(start_pos, curr);
+ current = CHAN;
+ start_pos = curr;
+ }
break;
}
}
if(mask[CHAN].length())
{
- if (IS_LOCAL(source))
+ if (adding && IS_LOCAL(source))
{
if (!ServerInstance->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax))
{
source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),mask[CHAN].c_str());
return false;
}
- else if (c->GetPrefixValue(source) < OP_VALUE)
+ else if (adding && c->GetPrefixValue(source) < OP_VALUE)
{
source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(), mask[CHAN].c_str());
return false;
{
BanRedirect re;
bool nofollow;
- Module* ExceptionModule;
public:
ModuleBanRedirect()
: re(this)
{
nofollow = false;
+ }
+
+ void init()
+ {
if(!ServerInstance->Modes->AddModeWatcher(&re))
throw ModuleException("Could not add mode watcher");
OnRehash(NULL);
- Extensible::Register(&re.extItem);
- Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
- ServerInstance->Modules->Attach(list, this, 4);
+ ServerInstance->Extensions.Register(&re.extItem);
+ Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
+ ServerInstance->Modules->Attach(list, this, 3);
}
virtual void OnChannelDelete(Channel* chan)
virtual void OnRehash(User* user)
{
- ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
}
virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
* Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost?
*/
- if (ExceptionModule)
+ ModResult result;
+ FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, chan));
+ if (result == MOD_RES_ALLOW)
{
- ListModeRequest n(this, ExceptionModule, user, chan);
- /* Users with ban exceptions are allowed to join without being redirected */
- if (n.Send())
- return MOD_RES_PASSTHRU;
+ // they have a ban exception
+ return MOD_RES_PASSTHRU;
}
std::string ipmask(user->nick);
if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str())))
{
user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str());
- return MOD_RES_ALLOW;
+ return MOD_RES_DENY;
}
else
{
nofollow = true;
Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
nofollow = false;
- return MOD_RES_ALLOW;
+ return MOD_RES_DENY;
}
}
}
virtual ~ModuleBanRedirect()
{
- ServerInstance->Modes->DelModeWatcher(&re);
+ /* XXX is this the best place to do this? */
+ if (!ServerInstance->Modes->DelModeWatcher(&re))
+ ServerInstance->Logs->Log("m_banredirect.so", DEBUG, "Failed to delete modewatcher!");
}
virtual Version GetVersion()
{
- return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR, API_VERSION);
+ return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
}
void Prioritize()