m_mlock Remove unnecessary iteration

[user/henk/code/inspircd.git] / src / modules / m_joinflood.cpp

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 854276500d7f65924225575e0490936e62c979e4..e5844532791879fb350fb62a63916c8c7a2e4b47 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -1,26 +1,34 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "inspircd.h"
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
 /** Holds settings and state associated with channel mode +j
  */
-class joinfloodsettings : public classbase
+class joinfloodsettings
 {
- private:
-       InspIRCd* ServerInstance;
  public:
        int secs;
        int joins;
@@ -29,7 +37,7 @@ class joinfloodsettings : public classbase
        int counter;
        bool locked;
 
-       joinfloodsettings(InspIRCd *Instance, int b, int c) : ServerInstance(Instance), secs(b), joins(c)
+       joinfloodsettings(int b, int c) : secs(b), joins(c)
        {
                reset = ServerInstance->Time() + secs;
                counter = 0;
@@ -87,18 +95,9 @@ class JoinFlood : public ModeHandler
 {
  public:
        SimpleExtItem<joinfloodsettings> ext;
-       JoinFlood(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
+       JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("joinflood", Creator) { }
 
-       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-       {
-               joinfloodsettings* x = ext.get(channel);
-               if (x)
-                       return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
-               else
-                       return std::make_pair(false, parameter);
-       }
-
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
@@ -137,7 +136,7 @@ class JoinFlood : public ModeHandler
                                        if (!f)
                                        {
                                                parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
-                                               f = new joinfloodsettings(ServerInstance, nsecs, njoins);
+                                               f = new joinfloodsettings(nsecs, njoins);
                                                ext.set(channel, f);
                                                channel->SetModeParam('j', parameter);
                                                return MODEACTION_ALLOW;
@@ -156,7 +155,7 @@ class JoinFlood : public ModeHandler
                                                        // new mode param, replace old with new
                                                        if ((nsecs > 0) && (njoins > 0))
                                                        {
-                                                               f = new joinfloodsettings(ServerInstance, nsecs, njoins);
+                                                               f = new joinfloodsettings(nsecs, njoins);
                                                                ext.set(channel, f);
                                                                channel->SetModeParam('j', parameter);
                                                                return MODEACTION_ALLOW;
@@ -196,15 +195,15 @@ class ModuleJoinFlood : public Module
 
  public:
 
-       ModuleJoinFlood(InspIRCd* Me)
-               : Module(Me), jf(Me, this)
+       ModuleJoinFlood()
+               : jf(this)
        {
 
                if (!ServerInstance->Modes->AddMode(&jf))
                        throw ModuleException("Could not add new modes!");
-               Extensible::Register(&jf.ext);
-               Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Extensions.Register(&jf.ext);
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -237,19 +236,18 @@ class ModuleJoinFlood : public Module
                        {
                                f->clear();
                                f->lock();
-                               memb->chan->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", memb->chan->name.c_str(), f->joins, f->secs);
+                               memb->chan->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.c_str(), "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", memb->chan->name.c_str(), f->joins, f->secs);
                        }
                }
        }
 
        ~ModuleJoinFlood()
        {
-               ServerInstance->Modes->DelMode(&jf);
        }
 
        Version GetVersion()
        {
-               return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
        }
 };