X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=b5cf0c02cab8cdd43659233dde5514cb784dbe9c;hb=02c6ce1ad09a7471a6b03dc00bac4b843d157489;hp=1290e998039ef3c41f1677d23547db1775e02142;hpb=ab58b38578dfaeda2f53ba84e475ed9638e5f6da;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 1290e9980..b5cf0c02c 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -2,27 +2,19 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <map>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
@@ -38,13 +30,13 @@ class joinfloodsettings : public classbase
 	time_t unlocktime;
 	int counter;
 	bool locked;
-    InspIRCd* ServerInstance;
-    
+	InspIRCd* ServerInstance;
+
 	joinfloodsettings() : secs(0), joins(0) {};
 
 	joinfloodsettings(int b, int c) : secs(b), joins(c)
 	{
-		reset = ServerInstance->Time() + secs;
+		reset = time(NULL) + secs;
 		counter = 0;
 		locked = false;
 	};
@@ -52,10 +44,10 @@ class joinfloodsettings : public classbase
 	void addjoin()
 	{
 		counter++;
-		if (ServerInstance->Time() > reset)
+		if (time(NULL) > reset)
 		{
 			counter = 0;
-			reset = ServerInstance->Time() + secs;
+			reset = time(NULL) + secs;
 		}
 	}
 
@@ -73,7 +65,7 @@ class joinfloodsettings : public classbase
 	{
 		if (locked)
 		{
-			if (ServerInstance->Time() > unlocktime)
+			if (time(NULL) > unlocktime)
 			{
 				locked = false;
 				return false;
@@ -89,7 +81,7 @@ class joinfloodsettings : public classbase
 	void lock()
 	{
 		locked = true;
-		unlocktime = ServerInstance->Time() + 60;
+		unlocktime = time(NULL) + 60;
 	}
 
 };
@@ -101,16 +93,16 @@ class JoinFlood : public ModeHandler
  public:
 	JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-                joinfloodsettings* x;
-                if (channel->GetExt("joinflood",x))
-                        return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
-                else
-                        return std::make_pair(false, parameter);
-        } 
+	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	{
+		joinfloodsettings* x;
+		if (channel->GetExt("joinflood",x))
+			return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
+		else
+			return std::make_pair(false, parameter);
+	} 
 
-        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
@@ -122,7 +114,6 @@ class JoinFlood : public ModeHandler
 
 		if (adding)
 		{
-			ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
 			char ndata[MAXBUF];
 			char* data = ndata;
 			strlcpy(ndata,parameter.c_str(),MAXBUF);
@@ -140,6 +131,7 @@ class JoinFlood : public ModeHandler
 				else data++;
 			}
 			if (secs)
+
 			{
 				/* Set up the flood parameters for this channel */
 				int njoins = atoi(joins);
@@ -147,7 +139,7 @@ class JoinFlood : public ModeHandler
 				if ((njoins<1) || (nsecs<1))
 				{
 					source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
-					parameter = "";
+					parameter.clear();
 					return MODEACTION_DENY;
 				}
 				else
@@ -223,11 +215,12 @@ class ModuleJoinFlood : public Module
  public:
  
 	ModuleJoinFlood(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		jf = new JoinFlood(ServerInstance);
-		ServerInstance->AddMode(jf, 'j');
+		if (!ServerInstance->AddMode(jf, 'j'))
+			throw ModuleException("Could not add new modes!");
 	}
 	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -247,7 +240,7 @@ class ModuleJoinFlood : public Module
 		return 0;
 	}
 
-	virtual void OnUserJoin(userrec* user, chanrec* channel)
+	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
 	{
 		joinfloodsettings *f;
 		if (channel->GetExt("joinflood",f))
@@ -285,7 +278,7 @@ class ModuleJoinFlood : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
@@ -309,7 +302,7 @@ class ModuleJoinFloodFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleJoinFloodFactory;
 }