Move destruction logic for User and Spanningtree into cull()

[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 3dc7c627d8d6b9920352ddfc7561b0b7ee4a9245..1300092c7afe7c049b6bbee827942722ed0f4191 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -106,8 +106,8 @@ class CGIResolver : public Resolver
        User* them;
        bool notify;
  public:
-       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) { }
+       CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
+               : Resolver(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)
        {
@@ -146,7 +146,7 @@ class ModuleCgiIRC : public Module
        CommandWebirc cmd;
        bool NotifyOpers;
 public:
-       ModuleCgiIRC(InspIRCd* Me) : Module(Me), cmd(this, NotifyOpers)
+       ModuleCgiIRC() : cmd(this, NotifyOpers)
        {
                OnRehash(NULL);
                ServerInstance->AddCommand(&cmd);
@@ -167,7 +167,7 @@ public:
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                cmd.Hosts.clear();
 
                NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed.
@@ -307,7 +307,7 @@ public:
                                {
 
                                        bool cached;
-                                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
+                                       CGIResolver* r = new CGIResolver(this, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
                                        ServerInstance->AddResolver(r, cached);
                                }
                                catch (...)
@@ -358,7 +358,7 @@ public:
                {
 
                        bool cached;
-                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
+                       CGIResolver* r = new CGIResolver(this, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
                        ServerInstance->AddResolver(r, cached);
                }
                catch (...)
@@ -434,7 +434,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("$Id$",VF_VENDOR,API_VERSION);
+               return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR,API_VERSION);
        }
 
 };