summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-10-08 12:18:48 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-10-08 12:18:48 +0000
commit1d72f2227e71cb129f8a3af50bebe308c77c53e8 (patch)
tree5dd7b0f3a1bac5621b9b97361773d58f06208f0e /src/modules
parenta5dd6bbd4b82ee4ffa7b790b353975a304ced6bb (diff)
Apply patch from jmb, for bug #593. Snotices on override are now sent regardless of noisy setting. Done in preparation for b2 sometime soon.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10633 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_override.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 859b7e7b7..56e7dae7c 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -63,7 +63,7 @@ class ModuleOverride : public Module
virtual void OnPostCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, CmdResult result, const std::string &original_line)
{
- if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
+ if ((OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
{
int Total = OverOps + OverDeops + OverVoices + OverDevoices + OverHalfops + OverDehalfops;
@@ -147,7 +147,6 @@ class ModuleOverride : public Module
case AC_DEOP:
if (CanOverride(source,"MODEDEOP"))
{
- if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_OP))
OverDeops++;
return ACR_ALLOW;
@@ -160,7 +159,6 @@ class ModuleOverride : public Module
case AC_OP:
if (CanOverride(source,"MODEOP"))
{
- if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_OP))
OverOps++;
return ACR_ALLOW;
@@ -173,7 +171,6 @@ class ModuleOverride : public Module
case AC_VOICE:
if (CanOverride(source,"MODEVOICE"))
{
- if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
OverVoices++;
return ACR_ALLOW;
@@ -186,7 +183,6 @@ class ModuleOverride : public Module
case AC_DEVOICE:
if (CanOverride(source,"MODEDEVOICE"))
{
- if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_HOP))
OverDevoices++;
return ACR_ALLOW;
@@ -199,7 +195,6 @@ class ModuleOverride : public Module
case AC_HALFOP:
if (CanOverride(source,"MODEHALFOP"))
{
- if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_OP))
OverHalfops++;
return ACR_ALLOW;
@@ -212,7 +207,6 @@ class ModuleOverride : public Module
case AC_DEHALFOP:
if (CanOverride(source,"MODEDEHALFOP"))
{
- if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_OP))
OverDehalfops++;
return ACR_ALLOW;
@@ -226,7 +220,6 @@ class ModuleOverride : public Module
if (CanOverride(source,"OTHERMODE"))
{
- if (NoisyOverride)
if ((!channel->HasUser(source)) || (mode < STATUS_OP))
{
OverriddenMode = true;