Fix memory leaks on reloadmodule and spanningtree unload while connecting servers

[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 d36a1d92a471df30acc368e7fcf148d177430aa1..5f8cfeca7414871d135cd6caf13c0d5ebb0666af 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -26,7 +26,7 @@ enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
 
 /** Holds a CGI site's details
  */
-class CGIhost : public classbase
+class CGIhost
 {
 public:
        std::string hostmask;
@@ -150,10 +150,10 @@ public:
        {
                OnRehash(NULL);
                ServerInstance->AddCommand(&cmd);
-               Extensible::Register(&cmd.realhost);
-               Extensible::Register(&cmd.realip);
-               Extensible::Register(&cmd.webirc_hostname);
-               Extensible::Register(&cmd.webirc_ip);
+               ServerInstance->Extensions.Register(&cmd.realhost);
+               ServerInstance->Extensions.Register(&cmd.realip);
+               ServerInstance->Extensions.Register(&cmd.webirc_hostname);
+               ServerInstance->Extensions.Register(&cmd.webirc_ip);
 
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnSyncUser, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
                ServerInstance->Modules->Attach(eventlist, this, 6);
@@ -214,7 +214,7 @@ public:
                }
        }
 
-       virtual ModResult OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
                for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++)
                {
@@ -253,7 +253,7 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnUserConnect(User* user)
+       virtual void OnUserConnect(LocalUser* user)
        {
                std::string *webirc_hostname = cmd.webirc_hostname.get(user);
                std::string *webirc_ip = cmd.webirc_ip.get(user);
@@ -277,7 +277,7 @@ public:
                }
        }
 
-       bool CheckPass(User* user)
+       bool CheckPass(LocalUser* user)
        {
                if(IsValidHost(user->password))
                {
@@ -324,7 +324,7 @@ public:
                return false;
        }
 
-       bool CheckIdent(User* user)
+       bool CheckIdent(LocalUser* user)
        {
                const char* ident;
                int len = user->ident.length();
@@ -434,7 +434,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR,API_VERSION);
+               return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
        }
 
 };