Fix iteration of oper blocks by SSLINFO

[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 1300092c7afe7c049b6bbee827942722ed0f4191..996ba7199a17ca4204fa7dcb1b613fb496edb9c4 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -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;
@@ -103,16 +103,16 @@ class CGIResolver : public Resolver
 {
        std::string typ;
        int theirfd;
-       User* them;
+       LocalUser* them;
        bool notify;
  public:
-       CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
+       CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, LocalUser* 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)
        {
                /* Check the user still exists */
-               if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+               if ((them) && (&them->eh == ServerInstance->SE->GetRef(theirfd)))
                {
                        if (notify)
                                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());
@@ -129,7 +129,7 @@ class CGIResolver : public Resolver
 
        virtual void OnError(ResolverError e, const std::string &errormessage)
        {
-               if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+               if ((them) && (&them->eh == ServerInstance->SE->GetRef(theirfd)))
                {
                        if (notify)
                                ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str());
@@ -150,13 +150,13 @@ 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_OnCleanup, I_OnSyncUser, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 7);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
 
@@ -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);
@@ -272,12 +272,13 @@ public:
                        cmd.webirc_ip.unset(user);
                        ServerInstance->Users->AddLocalClone(user);
                        ServerInstance->Users->AddGlobalClone(user);
+                       user->SetClass();
                        user->CheckClass();
                        user->CheckLines(true);
                }
        }
 
-       bool CheckPass(User* user)
+       bool CheckPass(LocalUser* user)
        {
                if(IsValidHost(user->password))
                {
@@ -292,6 +293,7 @@ public:
                        valid = user->SetClientIP(user->password.c_str());
                        ServerInstance->Users->AddLocalClone(user);
                        ServerInstance->Users->AddGlobalClone(user);
+                       user->SetClass();
                        user->CheckClass();
 
                        if (valid)
@@ -324,7 +326,7 @@ public:
                return false;
        }
 
-       bool CheckIdent(User* user)
+       bool CheckIdent(LocalUser* user)
        {
                const char* ident;
                int len = user->ident.length();
@@ -350,6 +352,7 @@ public:
                user->SetClientIP(newipstr);
                ServerInstance->Users->AddLocalClone(user);
                ServerInstance->Users->AddGlobalClone(user);
+               user->SetClass();
                user->CheckClass();
                user->host = newipstr;
                user->dhost = newipstr;
@@ -434,7 +437,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);
        }
 
 };