Merge pull request #1018 from SaberUK/insp20+hidekills

[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 f6ad5992a78df10e66c3e3353fa1f599892e0dcb..cce2e785531ad3c38b6fd3283fdeb173a8712aa0 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -89,11 +89,15 @@ class CommandWebirc : public Command
                                        {
                                                realhost.set(user, user->host);
                                                realip.set(user, user->GetIPString());
+
+                                               bool host_ok = (parameters[2].length() < 64);
+                                               const std::string& newhost = (host_ok ? parameters[2] : parameters[3]);
+
                                                if (notify)
-                                                       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());
+                                                       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(), newhost.c_str(), user->host.c_str());
 
                                                // Check if we're happy with the provided hostname. If it's problematic then make sure we won't set a host later, just the IP
-                                               if (parameters[2].length() < 64)
+                                               if (host_ok)
                                                        webirc_hostname.set(user, parameters[2]);
                                                else
                                                        webirc_hostname.unset(user);
@@ -172,9 +176,9 @@ class ModuleCgiIRC : public Module
        CommandWebirc cmd;
        LocalIntExt waiting;
 
-       static void RecheckElineAndClass(LocalUser* user)
+       static void RecheckClass(LocalUser* user)
        {
-               user->exempt = (ServerInstance->XLines->MatchesLine("E", user) != NULL);
+               user->MyClass = NULL;
                user->SetClass();
                user->CheckClass();
        }
@@ -194,7 +198,7 @@ class ModuleCgiIRC : public Module
                ChangeIP(user, newip);
                user->host = user->dhost = user->GetIPString();
                user->InvalidateCache();
-               RecheckElineAndClass(user);
+               RecheckClass(user);
                // Don't create the resolver if the core couldn't put the user in a connect class or when dns is disabled
                if (user->quitting || ServerInstance->Config->NoUserDns)
                        return;
@@ -203,8 +207,8 @@ class ModuleCgiIRC : public Module
                {
                        bool cached;
                        CGIResolver* r = new CGIResolver(this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), cached, waiting);
-                       ServerInstance->AddResolver(r, cached);
                        waiting.set(user, waiting.get(user) + 1);
+                       ServerInstance->AddResolver(r, cached);
                }
                catch (...)
                {
@@ -221,15 +225,11 @@ public:
        void init()
        {
                OnRehash(NULL);
-               ServerInstance->AddCommand(&cmd);
-               ServerInstance->Extensions.Register(&cmd.realhost);
-               ServerInstance->Extensions.Register(&cmd.realip);
-               ServerInstance->Extensions.Register(&cmd.webirc_hostname);
-               ServerInstance->Extensions.Register(&cmd.webirc_ip);
-               ServerInstance->Extensions.Register(&waiting);
+               ServiceProvider* providerlist[] = { &cmd, &cmd.realhost, &cmd.realip, &cmd.webirc_hostname, &cmd.webirc_ip, &waiting };
+               ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
 
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void OnRehash(User* user)
@@ -294,8 +294,9 @@ public:
 
                std::string* webirc_hostname = cmd.webirc_hostname.get(user);
                user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
+               user->InvalidateCache();
 
-               RecheckElineAndClass(user);
+               RecheckClass(user);
                if (user->quitting)
                        return MOD_RES_DENY;