fix little typo in syntax hint, type => action

[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 c1cc9670f7572566bcaacc71e9e9d6474a16eaf3..5db14299bb216e859761f59ea199399ed43383da 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,89 +2,52 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#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
+class NoKicks : public SimpleChannelModeHandler
 {
  public:
-       NoKicks() : ModeHandler('Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('Q'))
-                       {
-                               channel->SetMode('Q',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('Q'))
-                       {
-                               channel->SetMode('Q',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       NoKicks(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'Q') { }
 };
 
 class ModuleNoKicks : public Module
 {
-       Server *Srv;
        NoKicks* nk;
-       
- public:
- 
-       ModuleNoKicks(Server* Me)
-               : Module::Module(Me)
-       {
-               Srv = Me;
-               nk = new NoKicks();
-               Srv->AddMode(nk, 'Q');
-       }
 
-       void Implements(char* List)
+ public:
+       ModuleNoKicks(InspIRCd* Me)
+               : Module(Me)
        {
-               List[I_On005Numeric] = List[I_OnAccessCheck] = 1;
+               nk = new NoKicks(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(nk))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnAccessCheck, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual void On005Numeric(std::string &output)
        {
-               InsertMode(output,"Q",4);
+               ServerInstance->AddExtBanChar('Q');
        }
 
-       virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+       virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
        {
                if (access_type == AC_KICK)
                {
-                       if (channel->IsModeSet('Q'))
+                       if (channel->IsModeSet('Q') || channel->IsExtBanned(source, 'Q'))
                        {
-                               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
+                               if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
                                {
                                        // ulines can still kick with +Q in place
                                        return ACR_ALLOW;
@@ -92,7 +55,7 @@ class ModuleNoKicks : public Module
                                else
                                {
                                        // nobody else can (not even opers with override, and founders)
-                                       source->WriteServ("484 %s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
+                                       source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), channel->name.c_str(), dest->nick.c_str());
                                        return ACR_DENY;
                                }
                        }
@@ -102,37 +65,15 @@ class ModuleNoKicks : public Module
 
        virtual ~ModuleNoKicks()
        {
-               DELETE(nk);
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               ServerInstance->Modes->DelMode(nk);
+               delete nk;
        }
-};
 
-
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-       ModuleNoKicksFactory()
-       {
-       }
-       
-       ~ModuleNoKicksFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleNoKicks(Me);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
 };
 
 
-extern "C" void * init_module( void )
-{
-       return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)