Warning: Loads of craq logging in here atm. /connect with openssl is broken, gnutls...

[user/henk/code/inspircd.git] / src / modules / extra / m_testclient.cpp

diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index 5a140500ab6d111cfcc9bbfcd902c6e68c0d6fc9..f4e58b7b5969cbee5810b759585c3c129d47ac95 100644 (file)
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -1,19 +1,27 @@
-#include <string>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
 #include "configreader.h"
 #include "m_sqlv2.h"
 
-extern InspIRCd* ServerInstance;
-
 class ModuleTestClient : public Module
 {
 private:
-       Server* Srv;
+       
 
 public:
        ModuleTestClient(InspIRCd* Me)
@@ -28,7 +36,7 @@ public:
                
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
        
        virtual void OnBackgroundTimer(time_t foo)
@@ -41,11 +49,11 @@ public:
                        
                        if(foo.Send())
                        {
-                               log(DEBUG, "Sent query, got given ID %lu", foo.id);
+                               ServerInstance->Log(DEBUG, "Sent query, got given ID %lu", foo.id);
                        }
                        else
                        {
-                               log(DEBUG, "SQLrequest failed: %s", foo.error.Str());
+                               ServerInstance->Log(DEBUG, "SQLrequest failed: %s", foo.error.Str());
                        }
                }
        }
@@ -54,7 +62,7 @@ public:
        {
                if(strcmp(SQLRESID, request->GetId()) == 0)
                {
-                       log(DEBUG, "Got SQL result (%s)", request->GetId());
+                       ServerInstance->Log(DEBUG, "Got SQL result (%s)", request->GetId());
                
                        SQLresult* res = (SQLresult*)request;
 
@@ -62,33 +70,33 @@ public:
                        {
                                if(res->Cols())
                                {
-                                       log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
+                                       ServerInstance->Log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
 
                                        for (int r = 0; r < res->Rows(); r++)
                                        {
-                                               log(DEBUG, "Row %d:", r);
+                                               ServerInstance->Log(DEBUG, "Row %d:", r);
                                                
                                                for(int i = 0; i < res->Cols(); i++)
                                                {
-                                                       log(DEBUG, "\t[%s]: %s", res->ColName(i).c_str(), res->GetValue(r, i).d.c_str());
+                                                       ServerInstance->Log(DEBUG, "\t[%s]: %s", res->ColName(i).c_str(), res->GetValue(r, i).d.c_str());
                                                }
                                        }
                                }
                                else
                                {
-                                       log(DEBUG, "%d rows affected in query", res->Rows());
+                                       ServerInstance->Log(DEBUG, "%d rows affected in query", res->Rows());
                                }
                        }
                        else
                        {
-                               log(DEBUG, "SQLrequest failed: %s", res->error.Str());
+                               ServerInstance->Log(DEBUG, "SQLrequest failed: %s", res->error.Str());
                                
                        }
                
                        return SQLSUCCESS;
                }
                
-               log(DEBUG, "Got unsupported API version string: %s", request->GetId());
+               ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
                
                return NULL;
        }
@@ -98,25 +106,5 @@ public:
        }       
 };
 
-class ModuleTestClientFactory : public ModuleFactory
-{
- public:
-       ModuleTestClientFactory()
-       {
-       }
-       
-       ~ModuleTestClientFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTestClient(Me);
-       }
-};
-
+MODULE_INIT(ModuleTestClient);
 
-extern "C" void * init_module( void )
-{
-       return new ModuleTestClientFactory;
-}