/* Originally written by Om, January 2009
*/
-class BanRedirectEntry : public classbase
+class BanRedirectEntry
{
public:
std::string targetchan;
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;
}
}
OnRehash(NULL);
- Extensible::Register(&re.extItem);
+ ServerInstance->Extensions.Register(&re.extItem);
Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
ServerInstance->Modules->Attach(list, this, 3);
}
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()
{
+ /* 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()