Clarify handshake failure messages

[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 6cdad0958e7debb7d8b688185b5da777b59d55a4..cc1e343686034f0b2efe7b57942adc65ab5cae92 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;
@@ -103,11 +103,11 @@ class CGIResolver : public Resolver
 {
        std::string typ;
        int theirfd;
-       User* them;
+       LocalUser* 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, 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)
        {
@@ -146,17 +146,17 @@ 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);
-               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_OnSyncUser, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
        }
 
 
@@ -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.
@@ -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)
@@ -307,7 +309,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 (...)
@@ -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;
@@ -358,7 +361,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 +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);
        }
 
 };