X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_pgsql.cpp;h=1e8813e2e48e0eaab968158a6f49596dd8b616be;hb=a94af5f308268cc76fb8c3b59b6443817ba1a8d8;hp=0bc7dfd1cf145d2ec7ea1e256f738482d00c36df;hpb=8394be69a0e3b5fea617c69b69aa27daf547fc4e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 0bc7dfd1c..1e8813e2e 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -29,7 +29,7 @@
 
 /* SQLConn rewritten by peavey to
  * use EventHandler instead of
- * InspSocket. This is much neater
+ * BufferedSocket. This is much neater
  * and gives total control of destroy
  * and delete of resources.
  */
@@ -81,13 +81,13 @@ std::string SQLhost::GetDSN()
 	return conninfo.str();
 }
 
-class ReconnectTimer : public InspTimer
+class ReconnectTimer : public Timer
 {
   private:
 	Module* mod;
   public:
 	ReconnectTimer(InspIRCd* SI, Module* m)
-	: InspTimer(5, SI->Time(), false), mod(m)
+	: Timer(5, SI->Time(), false), mod(m)
 	{
 	}
 	virtual void Tick(time_t TIME);
@@ -143,10 +143,10 @@ public:
 	{
 		/* If we allocated these, free them... */
 		if(fieldlist)
-			DELETE(fieldlist);
+			delete fieldlist;
 
 		if(fieldmap)
-			DELETE(fieldmap);
+			delete fieldmap;
 
 		PQclear(res);
 	}
@@ -301,12 +301,12 @@ public:
 
 	virtual void Free(SQLfieldMap* fm)
 	{
-		DELETE(fm);
+		delete fm;
 	}
 
 	virtual void Free(SQLfieldList* fl)
 	{
-		DELETE(fl);
+		delete fl;
 	}
 };
 
@@ -737,6 +737,8 @@ class ModulePgSQL : public Module
 		ReadConf();
 
 		ServerInstance->Modules->PublishInterface("SQL", this);
+		Implementation eventlist[] = { I_OnUnloadModule, I_OnRequest, I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnUserDisconnect };
+		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
 
 	virtual ~ModulePgSQL()
@@ -750,12 +752,8 @@ class ModulePgSQL : public Module
 		ServerInstance->Modules->DoneWithInterface("SQLutils");
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
-	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadConf();
 	}
@@ -860,7 +858,7 @@ class ModulePgSQL : public Module
 		{
 			if (!HostInConf(iter->second->GetConfHost()))
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				safei = iter;
 				--iter;
 				connections.erase(safei);
@@ -874,7 +872,7 @@ class ModulePgSQL : public Module
 		while ((i = connections.begin()) != connections.end())
 		{
 			connections.erase(i);
-			DELETE(i->second);
+			delete i->second;
 		}
 	}
 
@@ -900,7 +898,7 @@ class ModulePgSQL : public Module
 		{
 			if (conn == iter->second)
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				connections.erase(iter);
 				break;
 			}
@@ -983,4 +981,4 @@ void SQLConn::DelayReconnect()
 	((ModulePgSQL*)us)->ReconnectConn(this);
 }
 
-MODULE_INIT(ModulePgSQL);
+MODULE_INIT(ModulePgSQL)