Remove m_testcommand too

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index a014e646174eb1fa5232eedf6894918dc1e451f7..39680d8b90fb1e56db5595d5899f52006565dbd6 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -75,7 +75,7 @@ class CommandWebirc : public Command
                                                user->Extend("cgiirc_realhost", new std::string(user->host));
                                                user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
                                                if (notify)
-                                                       ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str());
+                                                       ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str());
                                                user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
                                                user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
                                                return CMD_LOCALONLY;
@@ -83,7 +83,7 @@ class CommandWebirc : public Command
                                }
                        }
 
-                       ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
                        return CMD_FAILURE;
                }
 };
@@ -101,16 +101,13 @@ class CGIResolver : public Resolver
        CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
                : Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
-       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
        {
-               if (resultnum)
-                       return;
-
                /* Check the user still exists */
                if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
                {
                        if (notify)
-                               ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str());
 
                        them->host.assign(result,0, 64);
                        them->dhost.assign(result, 0, 64);
@@ -145,7 +142,7 @@ public:
        ModuleCgiIRC(InspIRCd* Me) : Module(Me)
        {
 
-               OnRehash(NULL,"");
+               OnRehash(NULL);
                mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
                ServerInstance->AddCommand(mycommand);
 
@@ -159,7 +156,7 @@ public:
                ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ConfigReader Conf(ServerInstance);
                Hosts.clear();
@@ -355,7 +352,7 @@ public:
                        {
                                /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */
                                if(NotifyOpers)
-                                       ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host.c_str(), user->password.c_str());
+                                       ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host.c_str(), user->password.c_str());
                        }
                        else
                        {