X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=9d5fe3b623434d831e456cebe20d87491bb21c7a;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=47dec1803bb7cca6d756f959246094662b352b14;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 47dec1803..9d5fe3b62 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -31,7 +31,7 @@ class KickRejoin : public ModeHandler
 {
  public:
 	SimpleExtItem<delaylist> ext;
-	KickRejoin(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'J', 1, 0, false, MODETYPE_CHANNEL, false),
+	KickRejoin(Module* Creator) : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL),
 		ext("norejoinusers", Creator) { }
 
 	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
@@ -104,12 +104,12 @@ class ModuleKickNoRejoin : public Module
 
 public:
 
-	ModuleKickNoRejoin(InspIRCd* Me)
-		: Module(Me), kr(Me, this)
+	ModuleKickNoRejoin()
+		: kr(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&kr))
 			throw ModuleException("Could not add new modes!");
-		Extensible::Register(&kr.ext);
+		ServerInstance->Extensions.Register(&kr.ext);
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
@@ -150,23 +150,22 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
+	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
 	{
-		if (chan->IsModeSet('J') && (source != user))
+		if (memb->chan->IsModeSet('J') && (source != memb->user))
 		{
-			delaylist* dl = kr.ext.get(chan);
+			delaylist* dl = kr.ext.get(memb->chan);
 			if (dl)
 			{
 				dl = new delaylist;
-				kr.ext.set(chan, dl);
+				kr.ext.set(memb->chan, dl);
 			}
-			(*dl)[user] = ServerInstance->Time() + strtoint(chan->GetModeParameter('J'));
+			(*dl)[memb->user] = ServerInstance->Time() + strtoint(memb->chan->GetModeParameter('J'));
 		}
 	}
 
 	~ModuleKickNoRejoin()
 	{
-		ServerInstance->Modes->DelMode(&kr);
 	}
 
 	Version GetVersion()