All modules which implement simplemodes (no parameters, not a list mode) can now...

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

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 5d406ed85a14e61000b3e680445ea12de1542d4a..f3f5d537ac65b6efa5eb311354f9b101c6331dec 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -20,14 +20,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 +Q */
 
+
+
 class NoKicks : public ModeHandler
 {
  public:
-       NoKicks() : ModeHandler('Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoKicks(InspIRCd* Instance) : ModeHandler(Instance, 'Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -54,27 +56,22 @@ class NoKicks : public ModeHandler
 
 class ModuleNoKicks : public Module
 {
-       Server *Srv;
+       
        NoKicks* nk;
        
  public:
  
-       ModuleNoKicks(Server* Me)
+       ModuleNoKicks(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               nk = new NoKicks();
-               Srv->AddMode(nk, 'Q');
+               
+               nk = new NoKicks(ServerInstance);
+               ServerInstance->AddMode(nk, 'Q');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnAccessCheck] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output,"Q",4);
+               List[I_OnAccessCheck] = 1;
        }
 
        virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
@@ -83,7 +80,7 @@ class ModuleNoKicks : public Module
                {
                        if (channel->IsModeSet('Q'))
                        {
-                               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
+                               if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
                                {
                                        // ulines can still kick with +Q in place
                                        return ACR_ALLOW;
@@ -101,12 +98,13 @@ class ModuleNoKicks : public Module
 
        virtual ~ModuleNoKicks()
        {
+               ServerInstance->Modes->DelMode(nk);
                DELETE(nk);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
        }
 };
 
@@ -122,7 +120,7 @@ class ModuleNoKicksFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleNoKicks(Me);
        }