Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 04c621ac0313d668e5acf157cb3d2abec35985e0..967e8fd025d5670bee59ae503706e7f83c8babc0 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -21,14 +21,16 @@ 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() : ModeHandler('c', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       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)
        {
@@ -36,7 +38,7 @@ class BlockColor : public ModeHandler
                {
                        if (!channel->IsModeSet('c'))
                        {
-                               channel->SetCustomMode('c',true);
+                               channel->SetMode('c',true);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -44,7 +46,7 @@ class BlockColor : public ModeHandler
                {
                        if (channel->IsModeSet('c'))
                        {
-                               channel->SetCustomMode('c',false);
+                               channel->SetMode('c',false);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -55,27 +57,22 @@ class BlockColor : public ModeHandler
 
 class ModuleBlockColour : public Module
 {
-       Server *Srv;
+       
        BlockColor *bc;
  public:
  
-       ModuleBlockColour(Server* Me) : Module::Module(Me)
+       ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               bc = new BlockColor();
-               Srv->AddMode(bc, 'c');
+               
+               bc = new BlockColor(ServerInstance);
+               ServerInstance->AddMode(bc, '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)
-       {
-               InsertMode(output,"c",4);
-       }
-       
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                if (target_type == TYPE_CHANNEL)
@@ -95,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;
                                        }
@@ -112,11 +109,13 @@ class ModuleBlockColour : public Module
 
        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);
        }
 };
 
@@ -132,7 +131,7 @@ class ModuleBlockColourFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleBlockColour(Me);
        }