Remove some debug (im on a crusade to make debug mode useful, but at the same time...

[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 ec2ac61297c465c9f4584d76906e9e37c6c6d1b2..437ce319000b1ff3fc6fede27c69a4434c056fe4 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -2,13 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *               <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *               <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -55,10 +51,10 @@ class CGIResolver : public Resolver
        userrec* them;
        bool notify;
  public:
-       CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type)
-               : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
+       CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached)
+               : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
-       virtual void OnLookupComplete(const std::string &result)
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
        {
                /* Check the user still exists */
                if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
@@ -95,7 +91,7 @@ public:
        ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me)
        {
                
-               OnRehash("");
+               OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -109,7 +105,7 @@ public:
                return PRIORITY_FIRST;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ConfigReader Conf(ServerInstance);
                
@@ -196,7 +192,7 @@ public:
        }
        
 
-       virtual void OnUserRegister(userrec* user)
+       virtual int OnUserRegister(userrec* user)
        {
                ServerInstance->Log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,user->GetIPString());
                
@@ -227,10 +223,10 @@ public:
                                        // If the ident lookup fails, try the password.
                                        CheckPass(user);
                                }
-                               
-                               return;
+                               return 0;
                        }
                }
+               return 0;
        }
 
        bool CheckPass(userrec* user)
@@ -263,8 +259,9 @@ public:
 
                                try
                                {
-                                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS");
-                                       ServerInstance->AddResolver(r);
+                                       bool cached;
+                                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
+                                       ServerInstance->AddResolver(r, cached);
                                }
                                catch (ModuleException& e)
                                {
@@ -319,8 +316,9 @@ public:
                try
                {
                        ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->GetFd(), "IDENT");
-                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT");
-                       ServerInstance->AddResolver(r);
+                       bool cached;
+                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
+                       ServerInstance->AddResolver(r, cached);
                }
                catch (ModuleException& e)
                {