mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-10 19:19:02 -04:00
m_mlock Only deny the mlocked mode from being changed instead of denying the entire mode change if it contains a single mlocked mode
Fixes issue #615 reported by @BlacklightShining
This commit is contained in:
parent
7ce26772d9
commit
d0a6b9c6ea
@ -31,7 +31,7 @@ public:
|
||||
|
||||
void init()
|
||||
{
|
||||
ServerInstance->Modules->Attach(I_OnPreMode, this);
|
||||
ServerInstance->Modules->Attach(I_OnRawMode, this);
|
||||
ServerInstance->Modules->AddService(this->mlock);
|
||||
}
|
||||
|
||||
@ -40,12 +40,7 @@ public:
|
||||
return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
|
||||
}
|
||||
|
||||
void Prioritize()
|
||||
{
|
||||
ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
|
||||
}
|
||||
|
||||
ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
|
||||
ModResult OnRawMode(User* source, Channel* channel, const char mode, const std::string& parameter, bool adding, int pcnt)
|
||||
{
|
||||
if (!channel)
|
||||
return MOD_RES_PASSTHRU;
|
||||
@ -57,11 +52,11 @@ public:
|
||||
if (!mlock_str)
|
||||
return MOD_RES_PASSTHRU;
|
||||
|
||||
std::string::size_type p = parameters[1].find_first_of(*mlock_str);
|
||||
std::string::size_type p = mlock_str->find(mode);
|
||||
if (p != std::string::npos)
|
||||
{
|
||||
source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
|
||||
channel->name.c_str(), parameters[1][p], mlock_str->c_str());
|
||||
channel->name.c_str(), mode, mlock_str->c_str());
|
||||
return MOD_RES_DENY;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user