Add "created" parameter to OnUserJoin, to avoid explicit checks for +P

[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 3956c265f9f34473ce49e3db11db4b8a9513c5c3..ce43e576fc1a585efaef5af028fb31d63d4636e6 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.
@@ -23,28 +23,28 @@ class NoKicks : public SimpleChannelModeHandler
 
 class ModuleNoKicks : public Module
 {
-
-       NoKicks* nk;
+       NoKicks nk;
 
  public:
-
        ModuleNoKicks(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), nk(Me)
        {
-
-               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_OnAccessCheck, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
+       virtual void On005Numeric(std::string &output)
+       {
+               ServerInstance->AddExtBanChar('Q');
+       }
 
        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->GetExtBanStatus(source, 'Q') < 0)
                        {
                                if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
                                {
@@ -54,7 +54,7 @@ class ModuleNoKicks : public Module
                                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.c_str(), channel->name.c_str(), dest->nick.c_str());
+                                       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;
                                }
                        }
@@ -64,13 +64,12 @@ class ModuleNoKicks : public Module
 
        virtual ~ModuleNoKicks()
        {
-               ServerInstance->Modes->DelMode(nk);
-               delete nk;
+               ServerInstance->Modes->DelMode(&nk);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };