Merge insp20

[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 582b3209a5631c1a2e7d17cdd59bde736a283999..1be389bf767ab53c044393ac885b5a866f883876 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,91 +1,72 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +Q */
+#include "inspircd.h"
+
+/* $ModDesc: Provides channel mode +Q to prevent kicks on the channel. */
+
+class NoKicks : public SimpleChannelModeHandler
+{
+ public:
+       NoKicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nokick", 'Q') { }
+};
 
 class ModuleNoKicks : public Module
 {
-       Server *Srv;
-       
+       NoKicks nk;
+
  public:
- 
        ModuleNoKicks()
+               : nk(this)
        {
-               Srv = new Server;
-               Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
        }
 
-       virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
-       {
-               if (access_type == AC_KICK)
-               {
-                       if (channel->IsCustomModeSet('Q'))
-                       {
-                               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
-                               {
-                                       // ulines can still kick with +Q in place
-                                       return ACR_ALLOW;
-                               }
-                               else
-                               {
-                                       // nobody else can (not even opers with override, and founders)
-                                       WriteServ(source->fd,"484 %s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
-                                       return ACR_DENY;
-                               }
-                       }
-               }
-               return ACR_DEFAULT;
-       }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+       void init()
        {
-               // check if this is our mode character...
-               if ((modechar == 'Q') && (type == MT_CHANNEL))
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
+               ServerInstance->Modules->AddService(nk);
+               Implementation eventlist[] = { I_OnUserPreKick, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual ~ModuleNoKicks()
+       void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-               delete Srv;
+               tokens["EXTBAN"].push_back('Q');
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,0);
-       }
-};
 
-
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-       ModuleNoKicksFactory()
-       {
-       }
-       
-       ~ModuleNoKicksFactory()
+       ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
        {
+               if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
+               {
+                       // Can't kick with Q in place, 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 MOD_RES_PASSTHRU;
        }
-       
-       virtual Module * CreateModule()
+
+       Version GetVersion()
        {
-               return new ModuleNoKicks;
+               return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)