X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=4bb9f9dc1adfdc6353d6af0ef1aa4dfc4a1bf959;hb=7c197db72eab03321e4f3e847054e13126520504;hp=9bbb5f4569bc0b14c4d48034912be092536209a8;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 9bbb5f456..4bb9f9dc1 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -61,17 +61,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()));
@@ -81,12 +89,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)
 				{
@@ -131,7 +133,8 @@ public:
 	{
 		
 		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)
@@ -141,18 +144,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;
 						}
@@ -160,7 +159,6 @@ public:
 					else
 					{
 						// Expired record, remove.
-						ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired");
 						itemstoremove.push_back(iter->first);
 					}
 				}
@@ -189,8 +187,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'));
 		}
 	}