Remove InspIRCd* parameters and fields

[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 2f88bfdde6278f25a16c16975b74a77c4cd6e053..db77184d64a458a32d2abeeac1d9161c9e0befce 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,84 +15,58 @@
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
-class NoKicks : public ModeHandler
+class NoKicks : public SimpleChannelModeHandler
 {
  public:
-       NoKicks(InspIRCd* Instance) : ModeHandler(Instance, 'Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-       {
-               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(Module* Creator) : SimpleChannelModeHandler(Creator, 'Q') { }
 };
 
 class ModuleNoKicks : public Module
 {
-       
-       NoKicks* nk;
-       
+       NoKicks nk;
+
  public:
- 
-       ModuleNoKicks(InspIRCd* Me)
-               : Module(Me)
+       ModuleNoKicks()
+               : nk(this)
        {
-               
-               nk = new NoKicks(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(nk))
+               if (!ServerInstance->Modes->AddMode(&nk))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnAccessCheck };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               Implementation eventlist[] = { I_OnUserPreKick, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
+       void On005Numeric(std::string &output)
+       {
+               ServerInstance->AddExtBanChar('Q');
+       }
 
-       virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+       ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
        {
-               if (access_type == AC_KICK)
+               if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
                {
-                       if (channel->IsModeSet('Q'))
+                       if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
+                       {
+                               // ulines can still kick with +Q in place
+                               return MOD_RES_PASSTHRU;
+                       }
+                       else
                        {
-                               if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
-                               {
-                                       // ulines can still kick with +Q in place
-                                       return ACR_ALLOW;
-                               }
-                               else
-                               {
-                                       // nobody else can (not even opers with override, and founders)
-                                       source->WriteNumeric(484, "%s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
-                                       return ACR_DENY;
-                               }
+                               // nobody else can (not even opers with override, and founders)
+                               source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), memb->chan->name.c_str(), memb->user->nick.c_str());
+                               return MOD_RES_DENY;
                        }
                }
-               return ACR_DEFAULT;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleNoKicks()
+       ~ModuleNoKicks()
        {
-               ServerInstance->Modes->DelMode(nk);
-               delete nk;
+               ServerInstance->Modes->DelMode(&nk);
        }
-       
-       virtual Version GetVersion()
+
+       Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };