Add extra parameter to OnUserPreNotice and OnUserPrePrivmsg, CUList &exempt_list...

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 461a05de4e86c21821eaeb273da92240e190ab51..f62e546136485ee142ec6d4061ee90af01d0f28f 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -21,81 +21,70 @@ using namespace std;
 #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 ModuleBlockColor : public Module
+/** Handles the +c channel mode
+ */
+class BlockColor : public ModeHandler
 {
-       Server *Srv;
  public:
- 
-       ModuleBlockColor(Server* Me)
-               : Module::Module(Me)
-       {
-               Srv = Me;
-               Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
-       }
+       BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       void Implements(char* List)
-        {
-                List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
-        }
-
-        virtual void On005Numeric(std::string &output)
-        {
-               InsertMode(output,"c",4);
-        }
-       
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               if (target_type == TYPE_CHANNEL)
+               if (adding)
                {
-                       chanrec* c = (chanrec*)dest;
-                       char ctext[MAXBUF];
-                       char *ctptr = ctext;
-                       strlcpy(ctext,text.c_str(),MAXBUF);
-
-
-                       if (c->IsCustomModeSet('c'))
+                       if (!channel->IsModeSet('c'))
                        {
-                               /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
-                               while (ctptr && *ctptr)
-                               {
-                                       switch (*ctptr++)
-                                       {
-                                               case 2:
-                                               case 3:
-                                               case 15:
-                                               case 21:
-                                               case 22:
-                                               case 31:
-                                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-                                                       return 1;
-                                               break;
-                                       }
-                               }
+                               channel->SetMode('c',true);
+                               return MODEACTION_ALLOW;
                        }
                }
-               return 0;
+               else
+               {
+                       if (channel->IsModeSet('c'))
+                       {
+                               channel->SetMode('c',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
        }
+};
+
+class ModuleBlockColour : public Module
+{
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       BlockColor *bc;
+ public:
+ 
+       ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
+       {
+               
+               bc = new BlockColor(ServerInstance);
+               ServerInstance->AddMode(bc, 'c');
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+       }
+
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* c = (chanrec*)dest;
-                       char ctext[MAXBUF];
-                       char *ctptr = ctext;
-                       strlcpy(ctext,text.c_str(),MAXBUF);
-
-
-                       if (c->IsCustomModeSet('c'))
+                       
+                       if(c->IsModeSet('c'))
                        {
-                               /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
-                               while (ctptr && *ctptr)
+                               /* Replace a strlcpy(), which ran even when +c wasn't set, with this (no copies at all) -- Om */
+                               for (std::string::iterator i = text.begin(); i != text.end(); i++)
                                {
-                                       switch (*ctptr++)
+                                       switch (*i)
                                        {
                                                case 2:
                                                case 3:
@@ -103,7 +92,7 @@ class ModuleBlockColor : public Module
                                                case 21:
                                                case 22:
                                                case 31:
-                                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
+                                                       user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
                                                        return 1;
                                                break;
                                        }
@@ -113,45 +102,38 @@ class ModuleBlockColor : public Module
                return 0;
        }
        
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               // check if this is our mode character...
-               if ((modechar == 'c') && (type == MT_CHANNEL))
-               {
-                       log(DEBUG,"Allowing c change");
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
+               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
-       virtual ~ModuleBlockColor()
+       virtual ~ModuleBlockColour()
        {
+               ServerInstance->Modes->DelMode(bc);
+               DELETE(bc);
        }
        
        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 ModuleBlockColorFactory : public ModuleFactory
+class ModuleBlockColourFactory : public ModuleFactory
 {
  public:
-       ModuleBlockColorFactory()
+       ModuleBlockColourFactory()
        {
        }
        
-       ~ModuleBlockColorFactory()
+       ~ModuleBlockColourFactory()
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleBlockColor(Me);
+               return new ModuleBlockColour(Me);
        }
        
 };
@@ -159,6 +141,5 @@ class ModuleBlockColorFactory : public ModuleFactory
 
 extern "C" void * init_module( void )
 {
-       return new ModuleBlockColorFactory;
+       return new ModuleBlockColourFactory;
 }
-