Tidyup

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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 0c3e3649a8b007ac48bb4ce7213e0a0cc81bacf0..2e62c8e51a1a98b6bbf3d4a10db84e03abd55bf2 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -16,16 +16,14 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
-extern InspIRCd* ServerInstance;
+
 
 class NoCTCP : public ModeHandler
 {
@@ -57,7 +55,7 @@ class NoCTCP : public ModeHandler
 
 class ModuleNoCTCP : public Module
 {
-       Server *Srv;
+       
        NoCTCP* nc;
        
  public:
@@ -67,25 +65,20 @@ class ModuleNoCTCP : public Module
        {
                
                nc = new NoCTCP(ServerInstance);
-               Srv->AddMode(nc, 'C');
+               ServerInstance->AddMode(nc, 'C');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output,"C",4);
-       }
-       
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreNotice(user,dest,target_type,text,status);
+               return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -107,12 +100,13 @@ class ModuleNoCTCP : public Module
 
        virtual ~ModuleNoCTCP()
        {
+               ServerInstance->Modes->DelMode(nc);
                DELETE(nc);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };