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

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

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 93daeef61764fd565ad4d49d61fd84b48f21ca93..e4f65576050dc52e25b5b794761b461d65169285 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -18,14 +18,18 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
+#include "mode.h"
 
 /* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */
 
+
+/** Handles the +P channel mode
+ */
 class BlockCaps : public ModeHandler
 {
  public:
-       BlockCaps() : ModeHandler('P', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -52,25 +56,20 @@ class BlockCaps : public ModeHandler
 
 class ModuleBlockCAPS : public Module
 {
-       Server *Srv;
+       
        BlockCaps* bc;
 public:
        
-       ModuleBlockCAPS(Server* Me) : Module::Module(Me)
+       ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               bc = new BlockCaps;
-               Srv->AddMode(bc, 'P');
+               
+               bc = new BlockCaps(ServerInstance);
+               ServerInstance->AddMode(bc, 'P');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "P", 4);
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
@@ -96,20 +95,21 @@ public:
                }
                return 0;
        }
-       
+
        virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                return OnUserPreMessage(user,dest,target_type,text,status);
        }
-       
+
        virtual ~ModuleBlockCAPS()
        {
+               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);
        }
 };
 
@@ -125,7 +125,7 @@ class ModuleBlockCAPSFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleBlockCAPS(Me);
        }