Merge pull request #215 from attilamolnar/insp20+modfixes

[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 c443a88d850674636ddef84f62a7289d023cc2ae..1e875a3d67456d656df3c0db9e32a61827611a8d 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -1,16 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
+ *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2008 Geoff Bricker <geoff.bricker@gmail.com>
+ *   Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
@@ -26,7 +39,7 @@ class ModuleOverride : public Module
                        {
                // read our config options (main config file)
                OnRehash(NULL);
-               ServerInstance->SNO->EnableSnomask('G', "GODMODE");
+               ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
                Implementation eventlist[] = { I_OnRehash, I_OnPreMode, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPreTopicChange };
                ServerInstance->Modules->Attach(eventlist, this, 6);
        }
@@ -61,7 +74,7 @@ class ModuleOverride : public Module
                {
                        if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE))
                        {
-                               ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
+                               ServerInstance->SNO->WriteGlobalSno('v',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
                        }
 
                        // Explicit allow
@@ -78,7 +91,7 @@ class ModuleOverride : public Module
                        // If the kicker's status is less than the target's,                    or      the kicker's status is less than or equal to voice
                        if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE))
                        {
-                               ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+std::string(memb->user->nick)+" on "+std::string(memb->chan->name)+" ("+reason+")");
+                               ServerInstance->SNO->WriteGlobalSno('v',std::string(source->nick)+" used oper override to kick "+std::string(memb->user->nick)+" on "+std::string(memb->chan->name)+" ("+reason+")");
                                return MOD_RES_ALLOW;
                        }
                }
@@ -99,7 +112,7 @@ class ModuleOverride : public Module
                        std::string msg = std::string(source->nick)+" overriding modes:";
                        for(unsigned int i=0; i < parameters.size(); i++)
                                msg += " " + parameters[i];
-                       ServerInstance->SNO->WriteGlobalSno('G',msg);
+                       ServerInstance->SNO->WriteGlobalSno('v',msg);
                        return MOD_RES_ALLOW;
                }
                return MOD_RES_PASSTHRU;
@@ -125,7 +138,7 @@ class ModuleOverride : public Module
 
                                                if (NoisyOverride)
                                                        chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
-                                               ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
+                                               ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +i on "+std::string(cname));
                                        }
                                        return MOD_RES_ALLOW;
                                }
@@ -141,7 +154,7 @@ class ModuleOverride : public Module
 
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
-                                       ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
+                                       ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +k on "+std::string(cname));
                                        return MOD_RES_ALLOW;
                                }
 
@@ -156,7 +169,7 @@ class ModuleOverride : public Module
 
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
-                                       ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
+                                       ServerInstance->SNO->WriteGlobalSno('v', user->nick+" used oper override to bypass +l on "+std::string(cname));
                                        return MOD_RES_ALLOW;
                                }
 
@@ -171,7 +184,7 @@ class ModuleOverride : public Module
 
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
-                                       ServerInstance->SNO->WriteGlobalSno('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
+                                       ServerInstance->SNO->WriteGlobalSno('v',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
                                        return MOD_RES_ALLOW;
                                }
                        }
@@ -179,11 +192,6 @@ class ModuleOverride : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ~ModuleOverride()
-       {
-               ServerInstance->SNO->DisableSnomask('G');
-       }
-
        Version GetVersion()
        {
                return Version("Provides support for unreal-style oper-override",VF_VENDOR);