X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=bdb988ad245c2fc1e8bfa22f19fd6259a5aa4a22;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=56322507cf563b19cc328496b2d9eec40caabd99;hpb=f07a2aa0866a8f953b41ba21592919f05d3a315e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 56322507c..bdb988ad2 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -1,16 +1,24 @@
-#include <time.h>
-#include <map>
-#include <vector>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 #include <sstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
-
-
 inline int strtoint(const std::string &str)
 {
 	std::istringstream ss(str);
@@ -28,15 +36,15 @@ class KickRejoin : public ModeHandler
  public:
 	KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-                if (channel->IsModeSet('J'))
-                        return std::make_pair(true, channel->GetModeParameter('J'));
-                else
-                        return std::make_pair(false, parameter);
-        } 
+	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	{
+		if (channel->IsModeSet('J'))
+			return std::make_pair(true, channel->GetModeParameter('J'));
+		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);
@@ -48,17 +56,25 @@ class KickRejoin : public ModeHandler
 		{
 			// Taking the mode off, we need to clean up.
 			delaylist* dl;
-
+			
 			if (channel->GetExt("norejoinusers", dl))
 			{
 				DELETE(dl);
 				channel->Shrink("norejoinusers");
 			}
+			
+			if (!channel->IsModeSet('J'))
+			{
+				return MODEACTION_DENY;
+			}
+			else
+			{
+				channel->SetMode('J', false);
+				return MODEACTION_ALLOW;
+			}
 		}
-		if ((!adding) || (atoi(parameter.c_str()) > 0))
+		else if (atoi(parameter.c_str()) > 0)
 		{
-			ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
-
 			if (!channel->IsModeSet('J'))
 			{
 				parameter = ConvToStr(atoi(parameter.c_str()));
@@ -68,12 +84,6 @@ class KickRejoin : public ModeHandler
 			}
 			else
 			{
-				if (!adding)
-				{
-					channel->SetModeParam('J', parameter.c_str(), adding);
-					return MODEACTION_ALLOW;
-				}
-
 				std::string cur_param = channel->GetModeParameter('J');
 				if (cur_param == parameter)
 				{
@@ -114,11 +124,12 @@ class ModuleKickNoRejoin : public Module
 public:
  
 	ModuleKickNoRejoin(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		kr = new KickRejoin(ServerInstance);
-		ServerInstance->AddMode(kr, 'J');
+		if (!ServerInstance->AddMode(kr, 'J'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -128,18 +139,14 @@ public:
 			delaylist* dl;
 			if (chan->GetExt("norejoinusers", dl))
 			{
-				ServerInstance->Log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it");
 				std::vector<userrec*> itemstoremove;
 			
 				for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
 				{
-					ServerInstance->Log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
 					if (iter->second > time(NULL))
 					{
-						ServerInstance->Log(DEBUG, "m_kicknorejoin.so: still inside time slot");
 						if (iter->first == user)					
 						{
-							ServerInstance->Log(DEBUG, "m_kicknorejoin.so: and we have the right user");
 							user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
 							return 1;
 						}
@@ -147,7 +154,6 @@ public:
 					else
 					{
 						// Expired record, remove.
-						ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired");
 						itemstoremove.push_back(iter->first);
 					}
 				}
@@ -166,7 +172,7 @@ public:
 		return 0;
 	}
 		
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
+	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
 	{
 		if (chan->IsModeSet('J') && (source != user))
 		{
@@ -176,8 +182,6 @@ public:
 				dl = new delaylist;
 				chan->Extend("norejoinusers", dl);
 			}
-			
-			ServerInstance->Log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
 			(*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
 		}
 	}
@@ -212,32 +216,9 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
-	}
-};
-
-
-class ModuleKickNoRejoinFactory : public ModuleFactory
-{
- public:
-	ModuleKickNoRejoinFactory()
-	{
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
-	~ModuleKickNoRejoinFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleKickNoRejoin(Me);
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleKickNoRejoinFactory;
-}
-
+MODULE_INIT(ModuleKickNoRejoin)