Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / snomasks.cpp

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index e12f95d6b4eb754b72639490cc5fd575ce7e3e80..742214a6d60888c24646689105bcaa580e21b6e7 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include "snomasks.h"
 
-SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
+SnomaskManager::SnomaskManager()
 {
        SnoMasks.clear();
        this->SetupDefaults();
@@ -44,7 +44,7 @@ bool SnomaskManager::EnableSnomask(char letter, const std::string &type)
 {
        if (SnoMasks.find(letter) == SnoMasks.end())
        {
-               Snomask *s = new Snomask(ServerInstance, letter, type);
+               Snomask *s = new Snomask(letter, type);
                SnoMasks[letter] = s;
                return true;
        }
@@ -125,6 +125,7 @@ void SnomaskManager::SetupDefaults()
        this->EnableSnomask('A',"REMOTEANNOUNCEMENT");  /* formerly WriteOpers() - generic notices to all opers */
        this->EnableSnomask('d',"DEBUG");                       /* Debug notices */
        this->EnableSnomask('x',"XLINE");                       /* Xline notice (g/z/q/k/e) */
+       this->EnableSnomask('X',"REMOTEXLINE");                 /* Remove Xline notice (g/z/q/k/e) */
        this->EnableSnomask('t',"STATS");                       /* Local or remote stats request */
        this->EnableSnomask('f',"FLOOD");                       /* Flooding notices */
 }
@@ -139,13 +140,13 @@ void Snomask::SendMessage(const std::string &message)
                LastMessage = message;
 
                std::string desc = this->Description;
-               int MOD_RESULT = 0;
+               ModResult MOD_RESULT;
                char mysnomask = MySnomask;
                ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
 
-               FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, message));
+               FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
 
-               LastBlocked = (MOD_RESULT == 1); // 1 blocks the message
+               LastBlocked = (MOD_RESULT == MOD_RES_DENY);
 
                if (!LastBlocked)
                {