X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=cb8c90e098a155b23cabb5314c0b541dcf0352e4;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;hp=33ba98aa410951b33f69c3e688e19ede82bd5222;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 33ba98aa4..cb8c90e09 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.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.
@@ -19,21 +19,19 @@
  */
 class joinfloodsettings : public classbase
 {
+ private:
+	InspIRCd* ServerInstance;
  public:
-
 	int secs;
 	int joins;
 	time_t reset;
 	time_t unlocktime;
 	int counter;
 	bool locked;
-	InspIRCd* ServerInstance;
-
-	joinfloodsettings() : secs(0), joins(0) {};
 
-	joinfloodsettings(int b, int c) : secs(b), joins(c)
+	joinfloodsettings(InspIRCd *Instance, int b, int c) : ServerInstance(Instance), secs(b), joins(c)
 	{
-		reset = time(NULL) + secs;
+		reset = ServerInstance->Time() + secs;
 		counter = 0;
 		locked = false;
 	};
@@ -41,10 +39,10 @@ class joinfloodsettings : public classbase
 	void addjoin()
 	{
 		counter++;
-		if (time(NULL) > reset)
+		if (ServerInstance->Time() > reset)
 		{
 			counter = 0;
-			reset = time(NULL) + secs;
+			reset = ServerInstance->Time() + secs;
 		}
 	}
 
@@ -62,7 +60,7 @@ class joinfloodsettings : public classbase
 	{
 		if (locked)
 		{
-			if (time(NULL) > unlocktime)
+			if (ServerInstance->Time() > unlocktime)
 			{
 				locked = false;
 				return false;
@@ -78,7 +76,7 @@ class joinfloodsettings : public classbase
 	void lock()
 	{
 		locked = true;
-		unlocktime = time(NULL) + 60;
+		unlocktime = ServerInstance->Time() + 60;
 	}
 
 };
@@ -144,10 +142,9 @@ class JoinFlood : public ModeHandler
 					if (!channel->GetExt("joinflood", dummy))
 					{
 						parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
-						joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
+						joinfloodsettings *f = new joinfloodsettings(ServerInstance, nsecs, njoins);
 						channel->Extend("joinflood", f);
-						channel->SetMode('j', true);
-						channel->SetModeParam('j', parameter.c_str(), true);
+						channel->SetModeParam('j', parameter);
 						return MODEACTION_ALLOW;
 					}
 					else
@@ -167,11 +164,10 @@ class JoinFlood : public ModeHandler
 								joinfloodsettings* f;
 								channel->GetExt("joinflood", f);
 								delete f;
-								f = new joinfloodsettings(nsecs,njoins);
+								f = new joinfloodsettings(ServerInstance, nsecs, njoins);
 								channel->Shrink("joinflood");
 								channel->Extend("joinflood", f);
-								channel->SetModeParam('j', cur_param.c_str(), false);
-								channel->SetModeParam('j', parameter.c_str(), true);
+								channel->SetModeParam('j', parameter);
 								return MODEACTION_ALLOW;
 							}
 							else
@@ -196,7 +192,7 @@ class JoinFlood : public ModeHandler
 				channel->GetExt("joinflood", f);
 				delete f;
 				channel->Shrink("joinflood");
-				channel->SetMode('j', false);
+				channel->SetModeParam('j', "");
 				return MODEACTION_ALLOW;
 			}
 		}