X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=ed67a880a8d6e915fecca2e07ae9958106536f18;hb=be36d92f3dcb0ac3772daebff43a5ecfe0a2d364;hp=14e963f782e37495a891df992f8e4784520cf407;hpb=b7d4d9501e8fa7ed97d69bf89e4410d6b4908be9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 14e963f78..ed67a880a 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -2,20 +2,15 @@
  *       | 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 "users.h"
@@ -38,12 +33,13 @@ class joinfloodsettings : public classbase
 	time_t unlocktime;
 	int counter;
 	bool locked;
-
+    InspIRCd* ServerInstance;
+    
 	joinfloodsettings() : secs(0), joins(0) {};
 
 	joinfloodsettings(int b, int c) : secs(b), joins(c)
 	{
-		reset = InspIRCd::Time() + secs;
+		reset = time(NULL) + secs;
 		counter = 0;
 		locked = false;
 	};
@@ -51,10 +47,10 @@ class joinfloodsettings : public classbase
 	void addjoin()
 	{
 		counter++;
-		if (InspIRCd::Time() > reset)
+		if (time(NULL) > reset)
 		{
 			counter = 0;
-			reset = InspIRCd::Time() + secs;
+			reset = time(NULL) + secs;
 		}
 	}
 
@@ -72,7 +68,7 @@ class joinfloodsettings : public classbase
 	{
 		if (locked)
 		{
-			if (InspIRCd::Time() > unlocktime)
+			if (time(NULL) > unlocktime)
 			{
 				locked = false;
 				return false;
@@ -88,7 +84,7 @@ class joinfloodsettings : public classbase
 	void lock()
 	{
 		locked = true;
-		unlocktime = InspIRCd::Time() + 60;
+		unlocktime = time(NULL) + 60;
 	}
 
 };
@@ -121,7 +117,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);
@@ -139,6 +134,7 @@ class JoinFlood : public ModeHandler
 				else data++;
 			}
 			if (secs)
+
 			{
 				/* Set up the flood parameters for this channel */
 				int njoins = atoi(joins);
@@ -226,7 +222,8 @@ class ModuleJoinFlood : public Module
 	{
 		
 		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)
@@ -284,7 +281,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);
 	}
 };