X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_testclient.cpp;h=0bad0466e3663ddafc37a02c0004de1ace512306;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=5a60d5b39603b1299ceb6479982adf0958a9b5c2;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index 5a60d5b39..0bad0466e 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -1,15 +1,23 @@
-#include <string>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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 "inspircd.h"
 #include "configreader.h"
 #include "m_sqlv2.h"
 
-
-
 class ModuleTestClient : public Module
 {
 private:
@@ -19,42 +27,41 @@ public:
 	ModuleTestClient(InspIRCd* Me)
 		: Module::Module(Me)
 	{
+		Implementation eventlist[] = { I_OnRequest, I_OnBackgroundTimer };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRequest] = List[I_OnBackgroundTimer] = 1;
-	}
 		
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
 	}
 	
-	virtual void OnBackgroundTimer(time_t foo)
+	virtual void OnBackgroundTimer(time_t)
 	{
-		Module* target = ServerInstance->FindFeature("SQL");
+		Module* target = ServerInstance->Modules->FindFeature("SQL");
 		
 		if(target)
 		{
-			SQLrequest foo = SQLreq(this, target, "foo", "UPDATE rawr SET foo = '?' WHERE bar = 42", ConvToStr(time(NULL)));
+			SQLrequest foo = SQLrequest(this, target, "foo",
+					SQLquery("UPDATE rawr SET foo = '?' WHERE bar = 42") % time(NULL));
 			
 			if(foo.Send())
 			{
-				ServerInstance->Log(DEBUG, "Sent query, got given ID %lu", foo.id);
+				ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Sent query, got given ID %lu", foo.id);
 			}
 			else
 			{
-				ServerInstance->Log(DEBUG, "SQLrequest failed: %s", foo.error.Str());
+				ServerInstance->Logs->Log("m_testclient.so", DEBUG, "SQLrequest failed: %s", foo.error.Str());
 			}
 		}
 	}
 	
-	virtual char* OnRequest(Request* request)
+	virtual const char* OnRequest(Request* request)
 	{
 		if(strcmp(SQLRESID, request->GetId()) == 0)
 		{
-			ServerInstance->Log(DEBUG, "Got SQL result (%s)", request->GetId());
+			ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Got SQL result (%s)", request->GetId());
 		
 			SQLresult* res = (SQLresult*)request;
 
@@ -62,33 +69,33 @@ public:
 			{
 				if(res->Cols())
 				{
-					ServerInstance->Log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
+					ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
 
 					for (int r = 0; r < res->Rows(); r++)
 					{
-						ServerInstance->Log(DEBUG, "Row %d:", r);
+						ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Row %d:", r);
 						
 						for(int i = 0; i < res->Cols(); i++)
 						{
-							ServerInstance->Log(DEBUG, "\t[%s]: %s", res->ColName(i).c_str(), res->GetValue(r, i).d.c_str());
+							ServerInstance->Logs->Log("m_testclient.so", DEBUG, "\t[%s]: %s", res->ColName(i).c_str(), res->GetValue(r, i).d.c_str());
 						}
 					}
 				}
 				else
 				{
-					ServerInstance->Log(DEBUG, "%d rows affected in query", res->Rows());
+					ServerInstance->Logs->Log("m_testclient.so", DEBUG, "%d rows affected in query", res->Rows());
 				}
 			}
 			else
 			{
-				ServerInstance->Log(DEBUG, "SQLrequest failed: %s", res->error.Str());
+				ServerInstance->Logs->Log("m_testclient.so", DEBUG, "SQLrequest failed: %s", res->error.Str());
 				
 			}
 		
 			return SQLSUCCESS;
 		}
 		
-		ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
+		ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Got unsupported API version string: %s", request->GetId());
 		
 		return NULL;
 	}
@@ -98,25 +105,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;
-}