In the grand tradition of huge fucking commits:

[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 a49e9f62236d8a6b4e29e8e34ec811232c45d7aa..cb11dd5ad291aaca860dcffb660a2e228b663825 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,34 +2,25 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-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 */
 
 class NoCTCP : public ModeHandler
 {
  public:
-       NoCTCP() : ModeHandler('C', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoCTCP(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -54,39 +45,35 @@ class NoCTCP : public ModeHandler
 
 class ModuleNoCTCP : public Module
 {
-       Server *Srv;
+       
        NoCTCP* nc;
        
  public:
  
-       ModuleNoCTCP(Server* Me)
-               : Module::Module(Me)
+       ModuleNoCTCP(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
-               nc = new NoCTCP();
-               Srv->AddMode(nc, 'C');
+               
+               nc = new NoCTCP(ServerInstance);
+               if (!ServerInstance->AddMode(nc, 'C'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        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)
-       {
-               InsertMode(output,"C",4);
-       }
-       
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(User* 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(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (target_type == TYPE_CHANNEL)
+               if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
-                       chanrec* c = (chanrec*)dest;
+                       Channel* c = (Channel*)dest;
                        if (c->IsModeSet('C'))
                        {
                                if ((text.length()) && (text[0] == '\1'))
@@ -104,37 +91,14 @@ class ModuleNoCTCP : public Module
 
        virtual ~ModuleNoCTCP()
        {
-               DELETE(nc);
+               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);
        }
 };
 
-
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-       ModuleNoCTCPFactory()
-       {
-       }
-       
-       ~ModuleNoCTCPFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleNoCTCP(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP)