Patch: /rehash (not /rehash ssl) will now rebind SSL ports, but not dh params etc...

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

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 34e653e2ab6ad449acbc5b190e94ece5f4fbdce8..1e8813e2e48e0eaab968158a6f49596dd8b616be 100644 (file)
--- 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
@@ -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,10 +752,6 @@ 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(User* user, const std::string &parameter)
        {
@@ -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;
                        }