Reasonably sized fix - when adding modes in modules, be sure to check the return...

[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 42d2330025eedb4848ac91509ea4fd614948e719..622a08ac68463bc69de13ed8a6c1eaf6dcd5b21e 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,57 +2,79 @@
  *       | 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(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               if (adding)
+               {
+                       if (!channel->IsModeSet('C'))
+                       {
+                               channel->SetMode('C',true);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (channel->IsModeSet('C'))
+                       {
+                               channel->SetMode('C',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
+       }
+};
+
 class ModuleNoCTCP : public Module
 {
-       Server *Srv;
+       
+       NoCTCP* nc;
        
  public:
  
-       ModuleNoCTCP(Server* Me)
+       ModuleNoCTCP(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
+               
+               nc = new NoCTCP(ServerInstance);
+               if (!ServerInstance->AddMode(nc, 'C'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
        {
-               List[I_OnExtendedMode] = 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(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)
                {
@@ -63,7 +85,7 @@ class ModuleNoCTCP : public Module
                                {
                                        if (strncmp(text.c_str(),"\1ACTION ",8))
                                        {
-                                               WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
+                                               user->WriteServ("492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
                                                return 1;
                                        }
                                }
@@ -71,28 +93,16 @@ class ModuleNoCTCP : public Module
                }
                return 0;
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'C') && (type == MT_CHANNEL))
-               {
-                       log(DEBUG,"Allowing C change");
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
 
        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);
        }
 };
 
@@ -108,7 +118,7 @@ class ModuleNoCTCPFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleNoCTCP(Me);
        }