Simple user/channel mode patch

[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 93ab2bd1daea88e67443555dc4014b81926c2352..9daa4c66bfffbaeebcf65e3c1942375002caf189 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,32 +15,10 @@
 
 /* $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(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
@@ -55,16 +33,14 @@ class ModuleNoKicks : public Module
        {
                
                nk = new NoKicks(ServerInstance);
-               if (!ServerInstance->AddMode(nk, 'Q'))
+               if (!ServerInstance->Modes->AddMode(nk))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnAccessCheck };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnAccessCheck] = 1;
-       }
 
-       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)
                {
@@ -78,7 +54,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(484, "%s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
                                        return ACR_DENY;
                                }
                        }
@@ -89,12 +65,12 @@ class ModuleNoKicks : public Module
        virtual ~ModuleNoKicks()
        {
                ServerInstance->Modes->DelMode(nk);
-               DELETE(nk);
+               delete nk;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };