This is better now.

[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 8389984d8382b454bb5ff85f81b53bec6d831488..f62e546136485ee142ec6d4061ee90af01d0f28f 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -21,32 +21,59 @@ 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 */
 
+/** Handles the +c channel mode
+ */
+class BlockColor : public ModeHandler
+{
+ public:
+       BlockColor(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 ModuleBlockColour : public Module
 {
-       Server *Srv;
+       
+       BlockColor *bc;
  public:
  
-       ModuleBlockColour(Server* Me) : Module::Module(Me)
+       ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
+               
+               bc = new BlockColor(ServerInstance);
+               ServerInstance->AddMode(bc, 'c');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 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)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -55,9 +82,9 @@ class ModuleBlockColour : public Module
                        if(c->IsModeSet('c'))
                        {
                                /* Replace a strlcpy(), which ran even when +c wasn't set, with this (no copies at all) -- Om */
-                               for(unsigned int i = 0; i < text.length(); i++)
+                               for (std::string::iterator i = text.begin(); i != text.end(); i++)
                                {
-                                       switch (text[i])
+                                       switch (*i)
                                        {
                                                case 2:
                                                case 3:
@@ -65,7 +92,7 @@ class ModuleBlockColour : public Module
                                                case 21:
                                                case 22:
                                                case 31:
-                                                       WriteServ(user->fd,"404 %s %s :Can't send colours 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;
                                        }
@@ -75,32 +102,20 @@ class ModuleBlockColour : public Module
                return 0;
        }
        
-       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)
        {
-               return OnUserPreMessage(user,dest,target_type,text,status);
-       }
-       
-       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;
-               }
+               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
        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);
        }
 };
 
@@ -116,7 +131,7 @@ class ModuleBlockColourFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleBlockColour(Me);
        }