Merge pull request #1238 from SaberUK/master+openssl

[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 23dc90ef89ad1f95277214a4280f964583b64d46..09d6e5fdf50f22af94c121ec4dfdf4ff383f9376 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -74,7 +74,8 @@ class CommandWebirc : public Command
        CGIHostlist Hosts;
        CommandWebirc(Module* Creator)
                : Command(Creator, "WEBIRC", 4),
-                 realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator)
+                 realhost("cgiirc_realhost", ExtensionItem::EXT_USER, Creator)
+                 , realip("cgiirc_realip", ExtensionItem::EXT_USER, Creator)
                {
                        works_before_reg = true;
                        this->syntax = "password client hostname ip";
@@ -104,6 +105,7 @@ class CommandWebirc : public Command
                                                ChangeIP(user, parameters[3]);
                                                // And follow this up by changing their host
                                                user->host = user->dhost = newhost;
+                                               user->InvalidateCache();
 
                                                return CMD_SUCCESS;
                                        }
@@ -224,7 +226,7 @@ class ModuleCgiIRC : public Module
 public:
        ModuleCgiIRC()
                : cmd(this)
-               , waiting("cgiirc-delay", this)
+               , waiting("cgiirc-delay", ExtensionItem::EXT_USER, this)
                , DNS(this, "DNS")
        {
        }
@@ -253,7 +255,7 @@ public:
                        {
                                if (type == "webirc" && password.empty())
                                {
-                                       ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
+                                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Missing password in config: %s", hostmask.c_str());
                                }
                                else
                                {
@@ -269,7 +271,7 @@ public:
                                        else
                                        {
                                                cgitype = PASS;
-                                               ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Invalid <cgihost:type> value in config: %s, setting it to \"pass\"", type.c_str());
+                                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Invalid <cgihost:type> value in config: %s, setting it to \"pass\"", type.c_str());
                                        }
 
                                        cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password));
@@ -277,7 +279,7 @@ public:
                        }
                        else
                        {
-                               ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
                                continue;
                        }
                }