X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=80e1fb8d0ecd1f58f3e533f92c43f216fd03cb20;hb=c4458ecc70025aeac7ca87115ed0a698e7bbcdad;hp=bd8597a0fc650f9fb14fe2ca3c111aa7ffdac8c7;hpb=ed00bf8f4e9107a00a8ddc8c0784515f1bdd2195;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index bd8597a0f..80e1fb8d0 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -6,6 +6,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
@@ -19,9 +20,42 @@ inline int strtoint(const std::string &str)
 
 typedef std::map<userrec*, time_t> delaylist;
 
+class KickRejoin : public ModeHandler
+{
+ public:
+	KickRejoin() : ModeHandler('J', 1, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (!adding)
+		{
+			// Taking the mode off, we need to clean up.
+			delaylist* dl;
+
+			if (channel->GetExt("norejoinusers", dl))
+			{
+				DELETE(dl);
+				channel->Shrink("norejoinusers");
+			}
+		}
+		if ((!adding) || (atoi(parameter.c_str()) > 0))
+		{
+			parameter = ConvToStr(atoi(parameter.c_str()));
+			channel->SetModeParam('J', parameter.c_str(), adding);
+			channel->SetMode('J', adding);
+			return MODEACTION_ALLOW;
+		}
+		else
+		{
+			return MODEACTION_DENY;
+		}
+	}
+};
+
 class ModuleKickNoRejoin : public Module
 {
 	Server *Srv;
+	KickRejoin* kr;
 	
 public:
  
@@ -29,51 +63,27 @@ public:
 		: Module::Module(Me)
 	{
 		Srv = Me;
-		
-		Srv->AddExtendedMode('J', MT_CHANNEL, false, 1, 0);
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		if ((modechar == 'J') && (type == MT_CHANNEL))
-		{
-			if(!mode_on)
-			{
-				// Taking the mode off, we need to clean up.
-				chanrec* c = (chanrec*)target;
-				
-				delaylist* dl = (delaylist*)c->GetExt("norejoinusers");
-				
-				if(dl)
-				{
-					delete dl;
-					c->Shrink("norejoinusers");
-				}
-			}
-			return 1;
-		}
-		return 0;
+		kr = new KickRejoin();
+		Srv->AddMode(kr, 'J');
 	}
 
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
-		if(chan)
+		if (chan)
 		{
-			delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
-			log(DEBUG, "m_kicknorejoin.so: tried to grab delay list");
-			
-			if(dl)
+			delaylist* dl;
+			if (chan->GetExt("norejoinusers", dl))
 			{
 				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++)
+				for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
 				{
 					log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
-					if(iter->second > time(NULL))
+					if (iter->second > time(NULL))
 					{
 						log(DEBUG, "m_kicknorejoin.so: still inside time slot");
-						if(iter->first == user)					
+						if (iter->first == user)					
 						{
 							log(DEBUG, "m_kicknorejoin.so: and we have the right user");
 							WriteServ(user->fd, "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
@@ -88,30 +98,29 @@ public:
 					}
 				}
 				
-				for(unsigned int i = 0; i < itemstoremove.size(); i++)
+				for (unsigned int i = 0; i < itemstoremove.size(); i++)
 					dl->erase(itemstoremove[i]);
 																	
-				if(!dl->size())
+				if (!dl->size())
 				{
 					// Now it's empty..
-					delete dl;
-					chan->Shrink("norejoinusers");
+						DELETE(dl);
+						chan->Shrink("norejoinusers");
 				}
 			}
 		}
 		return 0;
 	}
-	
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
+		
+	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
 	{
-		if(chan->IsCustomModeSet('J'))
+		if (chan->IsModeSet('J') && (source != user))
 		{
-			delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
-			
-			if(!dl)
+			delaylist* dl;
+			if (!chan->GetExt("norejoinusers", dl))
 			{
 				dl = new delaylist;
-				chan->Extend("norejoinusers", (char*)dl);
+				chan->Extend("norejoinusers", dl);
 			}
 			
 			log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
@@ -121,18 +130,24 @@ public:
 	
 	virtual void OnChannelDelete(chanrec* chan)
 	{
-		delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
-		
-		if(dl)
+		delaylist* dl;
+			
+		if (chan->GetExt("norejoinusers", dl))
 		{
-			delete dl;
+			DELETE(dl);
 			chan->Shrink("norejoinusers");
 		}
 	}
+	
+	virtual void OnCleanup(int target_type, void* item)
+	{
+		if(target_type == TYPE_CHANNEL)
+			OnChannelDelete((chanrec*)item);
+	}
 
 	virtual void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
+		List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
 	}
 
 	virtual void On005Numeric(std::string &output)
@@ -142,6 +157,7 @@ public:
 
 	virtual ~ModuleKickNoRejoin()
 	{
+		DELETE(kr);
 	}
 	
 	virtual Version GetVersion()