All modules which implement simplemodes (no parameters, not a list mode) can now...

[user/henk/code/inspircd.git] / src / modules / m_override.cpp

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index ca0deda470003b60045f9037903c71cac8975468..7dd58d8c29255bc0202fb6614e192020eec835b3 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -17,14 +17,12 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "configreader.h"
 #include "inspircd.h"
+#include "wildcard.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
 
-
-
 typedef std::map<std::string,std::string> override_t;
 
 class ModuleOverride : public Module
@@ -36,15 +34,10 @@ class ModuleOverride : public Module
  
        ModuleOverride(InspIRCd* Me)
                : Module::Module(Me)
-       {
-       
-               // here we initialise our module. Use new to create new instances of the required
-               // classes.
-               
-               
-               
+       {               
                // read our config options (main config file)
                OnRehash("");
+               ServerInstance->SNO->EnableSnomask('O',"OVERRIDE");
        }
        
        virtual void OnRehash(const std::string &parameter)
@@ -96,7 +89,7 @@ class ModuleOverride : public Module
                {
                        if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE))
                        {
-                               ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
                        }
                        /* Returning -1 explicitly allows the kick */
                        return -1;
@@ -120,7 +113,7 @@ class ModuleOverride : public Module
                                                case AC_DEOP:
                                                        if (CanOverride(source,"MODEDEOP"))
                                                        {
-                                                               ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name));
                                                                return ACR_ALLOW;
                                                        }
                                                        else
@@ -131,7 +124,7 @@ class ModuleOverride : public Module
                                                case AC_OP:
                                                        if (CanOverride(source,"MODEOP"))
                                                        {
-                                                               ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name));
                                                                return ACR_ALLOW;
                                                        }
                                                        else
@@ -142,7 +135,7 @@ class ModuleOverride : public Module
                                                case AC_VOICE:
                                                        if (CanOverride(source,"MODEVOICE"))
                                                        {
-                                                               ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name));
                                                                return ACR_ALLOW;
                                                        }
                                                        else
@@ -153,7 +146,7 @@ class ModuleOverride : public Module
                                                case AC_DEVOICE:
                                                        if (CanOverride(source,"MODEDEVOICE"))
                                                        {
-                                                               ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name));
                                                                return ACR_ALLOW;
                                                        }
                                                        else
@@ -164,7 +157,7 @@ class ModuleOverride : public Module
                                                case AC_HALFOP:
                                                        if (CanOverride(source,"MODEHALFOP"))
                                                        {
-                                                               ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name));
                                                                return ACR_ALLOW;
                                                        }
                                                        else
@@ -175,7 +168,7 @@ class ModuleOverride : public Module
                                                case AC_DEHALFOP:
                                                        if (CanOverride(source,"MODEDEHALFOP"))
                                                        {
-                                                               ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name));
+                                                               ServerInstance->SNO->WriteToSnoMask('O',"NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name));
                                                                return ACR_ALLOW;
                                                        }
                                                        else
@@ -216,7 +209,7 @@ class ModuleOverride : public Module
                                                        chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass invite-only", cname, user->nick);
                                                }
                                        }
-                                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
+                                       ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
                                        return -1;
                                }
                                
@@ -224,7 +217,7 @@ class ModuleOverride : public Module
                                {
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel key", cname, user->nick);
-                                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname));
+                                       ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname));
                                        return -1;
                                }
                                        
@@ -232,15 +225,20 @@ class ModuleOverride : public Module
                                {
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel limit", cname, user->nick);
-                                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname));
+                                       ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname));
                                        return -1;
                                }
 
                                if (CanOverride(user,"BANWALK"))
                                {
-                                       // other join
-                                       if (NoisyOverride)
-                                               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel bans", cname, user->nick);
+                                       if (chan->IsBanned(user))
+                                       {
+                                               if (NoisyOverride)
+                                               {
+                                                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel ban", cname, user->nick);
+                                                       ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban", cname, user->nick);
+                                               }
+                                       }
                                        return -1;
                                }
                        }
@@ -250,6 +248,7 @@ class ModuleOverride : public Module
        
        virtual ~ModuleOverride()
        {
+               ServerInstance->SNO->DisableSnomask('O');
        }
        
        virtual Version GetVersion()