X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=6517da0a2e8438be0db872a93c01f06545d0b3e7;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=f74c756234a5c908b90dbe594e0bbf21ae6f3eef;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index f74c75623..6517da0a2 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,7 +16,7 @@
 
 /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
 
-/* Originally written by Om, January 2007
+/* Originally written by Om, January 2008
  */
 
 class BanRedirectEntry
@@ -154,7 +154,7 @@ class BanRedirect : public ModeWatcher
 										
 										if(redirects->empty())
 										{
-											DELETE(redirects);
+											delete redirects;
 											channel->Shrink("banredirects");
 										}
 										
@@ -193,13 +193,16 @@ class ModuleBanRedirect : public Module
 		re = new BanRedirect(Me);
 		nofollow = false;
 		
-		if(!ServerInstance->AddModeWatcher(re))
+		if(!ServerInstance->Modes->AddModeWatcher(re))
+		{
+			delete re;
 			throw ModuleException("Could not add mode watcher");
+		}
 
 		OnRehash(NULL, "");
 
 		Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
-		Me->Modules->Attach(list, this, sizeof(list));
+		Me->Modules->Attach(list, this, sizeof(*list));
 
 	}
 	
@@ -244,7 +247,7 @@ class ModuleBanRedirect : public Module
 					ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);
 				}
 				
-				DELETE(redirects);
+				delete redirects;
 				chan->Shrink("banredirects");
 			}
 		}
@@ -255,7 +258,7 @@ class ModuleBanRedirect : public Module
 		ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
 	}
 
-	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, bool synching = false)
 	{
 		/* This prevents recursion when a user sets multiple ban redirects in a chain
 		 * (thanks Potter)
@@ -304,7 +307,7 @@ class ModuleBanRedirect : public Module
 							user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
 							user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str());
 							nofollow = true;
-							Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
+							Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time(true));
 							nofollow = false;
 							return 1;
 						}
@@ -318,7 +321,7 @@ class ModuleBanRedirect : public Module
 	virtual ~ModuleBanRedirect()
 	{
 		ServerInstance->Modes->DelModeWatcher(re);
-		DELETE(re);
+		delete re;
 	}
 	
 	virtual Version GetVersion()