X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=9e12b4e185949382df1d24dcfdc067104449d7de;hb=819147178db00008a215670992d0f532dd57f9e5;hp=6378ea773da8694b1492d245ba54e8ca524eb9b9;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 6378ea773..9e12b4e18 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
@@ -38,34 +38,34 @@ class KickRejoin : public ModeHandler
 			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, Channel* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
-	
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (!adding)
 		{
 			// Taking the mode off, we need to clean up.
 			delaylist* dl;
-			
+
 			if (channel->GetExt("norejoinusers", dl))
 			{
-				DELETE(dl);
+				delete dl;
 				channel->Shrink("norejoinusers");
 			}
-			
+
 			if (!channel->IsModeSet('J'))
 			{
 				return MODEACTION_DENY;
 			}
 			else
 			{
-				channel->SetMode('J', false);
+				channel->SetModeParam('J', "");
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -74,8 +74,7 @@ class KickRejoin : public ModeHandler
 			if (!channel->IsModeSet('J'))
 			{
 				parameter = ConvToStr(atoi(parameter.c_str()));
-				channel->SetModeParam('J', parameter.c_str(), adding);
-				channel->SetMode('J', adding);
+				channel->SetModeParam('J', parameter);
 				return MODEACTION_ALLOW;
 			}
 			else
@@ -90,11 +89,9 @@ class KickRejoin : public ModeHandler
 				{
 					// new mode param, replace old with new
 					parameter = ConvToStr(atoi(parameter.c_str()));
-					cur_param = ConvToStr(atoi(cur_param.c_str()));
 					if (parameter != "0")
 					{
-						channel->SetModeParam('J', cur_param.c_str(), false);
-						channel->SetModeParam('J', parameter.c_str(), adding);
+						channel->SetModeParam('J', parameter);
 						return MODEACTION_ALLOW;
 					}
 					else
@@ -114,23 +111,23 @@ class KickRejoin : public ModeHandler
 
 class ModuleKickNoRejoin : public Module
 {
-	
+
 	KickRejoin* kr;
-	
+
 public:
- 
+
 	ModuleKickNoRejoin(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		kr = new KickRejoin(ServerInstance);
-		if (!ServerInstance->AddMode(kr))
+		if (!ServerInstance->Modes->AddMode(kr))
 			throw ModuleException("Could not add new modes!");
 		Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		if (chan)
 		{
@@ -138,14 +135,14 @@ public:
 			if (chan->GetExt("norejoinusers", dl))
 			{
 				std::vector<User*> itemstoremove;
-			
+
 				for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
 				{
-					if (iter->second > time(NULL))
+					if (iter->second > ServerInstance->Time())
 					{
-						if (iter->first == user)					
+						if (iter->first == user)
 						{
-							user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
+							user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter('J').c_str());
 							return 1;
 						}
 					}
@@ -155,21 +152,21 @@ public:
 						itemstoremove.push_back(iter->first);
 					}
 				}
-				
+
 				for (unsigned int i = 0; i < itemstoremove.size(); i++)
 					dl->erase(itemstoremove[i]);
-																	
+
 				if (!dl->size())
 				{
 					// Now it's empty..
-					DELETE(dl);
+					delete dl;
 					chan->Shrink("norejoinusers");
 				}
 			}
 		}
 		return 0;
 	}
-		
+
 	virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
 	{
 		if (chan->IsModeSet('J') && (source != user))
@@ -180,41 +177,37 @@ public:
 				dl = new delaylist;
 				chan->Extend("norejoinusers", dl);
 			}
-			(*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
+			(*dl)[user] = ServerInstance->Time() + strtoint(chan->GetModeParameter('J'));
 		}
 	}
-	
+
 	virtual void OnChannelDelete(Channel* chan)
 	{
 		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((Channel*)item);
 	}
 
-	virtual void Implements(char* List)
-	{
-		List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
-	}
 
 	virtual ~ModuleKickNoRejoin()
 	{
 		ServerInstance->Modes->DelMode(kr);
-		DELETE(kr);
+		delete kr;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };