X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=63bcc38a4180c30526814f66ee6396d433b94ae8;hb=de4b1863536348520c6498e11d910acd050092a7;hp=54e221019ccd372a4c2b977c4baf91c4d8de19c3;hpb=de25d946733f774e3a5b53a58438a9c92af0acbe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 54e221019..63bcc38a4 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -1,23 +1,33 @@
-/*       +------------------------------------+
- *       | 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
 {
  public:
 	int secs;
@@ -85,18 +95,9 @@ class JoinFlood : public ModeHandler
 {
  public:
 	SimpleExtItem<joinfloodsettings> ext;
-	JoinFlood(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)
@@ -152,17 +153,10 @@ class JoinFlood : public ModeHandler
 						else
 						{
 							// new mode param, replace old with new
-							if ((nsecs > 0) && (njoins > 0))
-							{
-								f = new joinfloodsettings(nsecs, njoins);
-								ext.set(channel, f);
-								channel->SetModeParam('j', parameter);
-								return MODEACTION_ALLOW;
-							}
-							else
-							{
-								return MODEACTION_DENY;
-							}
+							f = new joinfloodsettings(nsecs, njoins);
+							ext.set(channel, f);
+							channel->SetModeParam('j', parameter);
+							return MODEACTION_ALLOW;
 						}
 					}
 				}
@@ -175,8 +169,7 @@ class JoinFlood : public ModeHandler
 		}
 		else
 		{
-			joinfloodsettings* f = ext.get(channel);
-			if (f)
+			if (channel->IsModeSet('j'))
 			{
 				ext.unset(channel);
 				channel->SetModeParam('j', "");
@@ -197,12 +190,14 @@ class ModuleJoinFlood : public Module
 	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);
+	void init()
+	{
+		ServerInstance->Modules->AddService(jf);
+		ServerInstance->Modules->AddService(jf.ext);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -228,7 +223,7 @@ class ModuleJoinFlood : public Module
 		joinfloodsettings *f = jf.ext.get(memb->chan);
 
 		/* But all others are OK */
-		if (f)
+		if ((f) && (!f->islocked()))
 		{
 			f->addjoin();
 			if (f->shouldlock())
@@ -242,12 +237,11 @@ class ModuleJoinFlood : public Module
 
 	~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);
 	}
 };