X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=cf6c278282509b2be1c6409330cce3c312cae26b;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=11ce93c9a4054f3c13a919bde779b49bc9f246be;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 11ce93c9a..cf6c27828 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -20,7 +20,7 @@
 /* Originally written by Om, January 2009
  */
 
-class BanRedirectEntry : public classbase
+class BanRedirectEntry
 {
  public:
 	std::string targetchan;
@@ -39,7 +39,7 @@ class BanRedirect : public ModeWatcher
 {
  public:
 	SimpleExtItem<BanRedirectList> extItem;
-	BanRedirect(Module* parent) : ModeWatcher('b', MODETYPE_CHANNEL),
+	BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL),
 		extItem("banredirect", parent)
 	{
 	}
@@ -212,9 +212,9 @@ class ModuleBanRedirect : public Module
 
 		OnRehash(NULL);
 
-		Extensible::Register(&re.extItem);
-		Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
-		ServerInstance->Modules->Attach(list, this, 4);
+		ServerInstance->Extensions.Register(&re.extItem);
+		Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
+		ServerInstance->Modules->Attach(list, this, 3);
 	}
 
 	virtual void OnChannelDelete(Channel* chan)
@@ -283,12 +283,12 @@ class ModuleBanRedirect : public Module
 				 * Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost?
 				 */
 
-				if (ExceptionModule)
+				ModResult result;
+				FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, chan));
+				if (result == MOD_RES_ALLOW)
 				{
-					ListModeRequest n(this, ExceptionModule, user, chan);
-					/* Users with ban exceptions are allowed to join without being redirected */
-					if (n.Send())
-						return MOD_RES_PASSTHRU;
+					// they have a ban exception
+					return MOD_RES_PASSTHRU;
 				}
 
 				std::string ipmask(user->nick);
@@ -328,12 +328,11 @@ class ModuleBanRedirect : public Module
 
 	virtual ~ModuleBanRedirect()
 	{
-		ServerInstance->Modes->DelModeWatcher(&re);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
 	}
 
 	void Prioritize()