Remove bad check for channel op in m_auditorium, fixes bug #886

[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 a1e78812d8906b6603a67800f0178a4ee6004957..f545865b534d6200633992ece8be43b4950ee444 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -33,7 +33,7 @@ class ModuleOverride : public Module
                : Module(Me)
        {
                // read our config options (main config file)
-               OnRehash(NULL,"");
+               OnRehash(NULL);
                ServerInstance->SNO->EnableSnomask('G', "GODMODE");
                if (!ServerInstance->Modules->PublishFeature("Override", this))
                {
@@ -45,25 +45,23 @@ class ModuleOverride : public Module
                ServerInstance->Modules->Attach(eventlist, this, 8);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                // on a rehash we delete our classes for good measure and create them again.
-               ConfigReader* Conf = new ConfigReader(ServerInstance);
+               ConfigReader Conf(ServerInstance);
 
                // re-read our config options on a rehash
-               NoisyOverride = Conf->ReadFlag("override", "noisy", 0);
-               RequireKey = Conf->ReadFlag("override", "requirekey", 0);
+               NoisyOverride = Conf.ReadFlag("override", "noisy", 0);
+               RequireKey = Conf.ReadFlag("override", "requirekey", 0);
 
                overrides.clear();
 
-               for (int j =0; j < Conf->Enumerate("type"); j++)
+               for (int j =0; j < Conf.Enumerate("type"); j++)
                {
-                       std::string typen = Conf->ReadValue("type","name",j);
-                       std::string tokenlist = Conf->ReadValue("type","override",j);
+                       std::string typen = Conf.ReadValue("type","name",j);
+                       std::string tokenlist = Conf.ReadValue("type","override",j);
                        overrides[typen] = tokenlist;
                }
-
-               delete Conf;
        }
 
 
@@ -89,7 +87,7 @@ class ModuleOverride : public Module
                                if (OverOther)
                                        msg += "others, ";
                                msg.replace(msg.length()-2, 2, 1, ']');
-                               ServerInstance->SNO->WriteToSnoMask('G',msg);
+                               ServerInstance->SNO->WriteGlobalSno('G',msg);
                        }
 
                        OverriddenMode = OverOther = false;
@@ -124,7 +122,7 @@ class ModuleOverride : public Module
                {
                        if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
+                               ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
                        }
 
                        // Explicit allow
@@ -141,7 +139,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 ((chan->GetStatus(source) < chan->GetStatus(user))                   || (chan->GetStatus(source) <= STATUS_VOICE))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+                               ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
                        }
                        /* Returning -1 explicitly allows the kick */
                        return -1;
@@ -251,7 +249,7 @@ class ModuleOverride : public Module
 
                                                if (NoisyOverride)
                                                        chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
-                                               ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
+                                               ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
                                        }
                                        return -1;
                                }
@@ -267,7 +265,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.c_str());
-                                       ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
+                                       ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
                                        return -1;
                                }
 
@@ -282,7 +280,7 @@ 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.c_str());
-                                       ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
+                                       ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
                                        return -1;
                                }
 
@@ -297,7 +295,7 @@ class ModuleOverride : public Module
 
                                        if (NoisyOverride)
                                                chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
-                                       ServerInstance->SNO->WriteToSnoMask('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
+                                       ServerInstance->SNO->WriteGlobalSno('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
                                        return -1;
                                }
                        }