X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=bb59cde3db36b9fc3fbb8cfbb666b97a7d63204c;hb=89fc6ca9c66198fe54cce19d59279cd454fc1bd0;hp=8493ec0ff409dc8c35d8c734e1d69ff8352e1c2b;hpb=24a685df2da7e8b9f0aeaee1d6c3e89e716939a6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 8493ec0ff..bb59cde3d 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,10 +16,10 @@
 
 /* $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
+class BanRedirectEntry : public classbase
 {
  public:
 	std::string targetchan;
@@ -44,7 +44,7 @@ class BanRedirect : public ModeWatcher
 	{
 	}
 
-	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
+	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type, bool)
 	{
 		/* nick!ident@host -> nick!ident@host
 		 * nick!ident@host#chan -> nick!ident@host#chan
@@ -64,7 +64,7 @@ class BanRedirect : public ModeWatcher
 		
 			if(adding && (channel->bans.size() > static_cast<unsigned>(maxbans)))
 			{
-				source->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)", source->nick, channel->name, channel->name, maxbans);
+				source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick, channel->name, channel->name, maxbans);
 				return false;
 			}
 			
@@ -118,7 +118,7 @@ class BanRedirect : public ModeWatcher
 				{
 					if(irc::string(channel->name) == irc::string(mask[CHAN].c_str()))
 					{
-						source->WriteServ("690 %s %s :You cannot set a ban redirection to the channel the ban is on", source->nick, channel->name);
+						source->WriteNumeric(690, "%s %s :You cannot set a ban redirection to the channel the ban is on", source->nick, channel->name);
 						return false;
 					}
 					else
@@ -170,7 +170,7 @@ class BanRedirect : public ModeWatcher
 				}
 				else
 				{
-					source->WriteServ("403 %s %s :Invalid channel name in redirection (%s)", source->nick, channel->name, mask[CHAN].c_str());
+					source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick, channel->name, mask[CHAN].c_str());
 					return false;
 				}
 			}
@@ -193,7 +193,7 @@ 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");
@@ -202,7 +202,7 @@ class ModuleBanRedirect : public Module
 		OnRehash(NULL, "");
 
 		Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
-		Me->Modules->Attach(list, this, sizeof(*list));
+		Me->Modules->Attach(list, this, 4);
 
 	}
 	
@@ -258,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, bool synching = false)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		/* This prevents recursion when a user sets multiple ban redirects in a chain
 		 * (thanks Potter)
@@ -299,15 +299,15 @@ class ModuleBanRedirect : public Module
 						
 						if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
 						{
-							user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
+							user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick, chan->name);
 							return 1;
 						}
 						else
 						{
-							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());
+							user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick, chan->name);
+							user->WriteNumeric(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, "", false, ServerInstance->Time(true));
+							Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
 							nofollow = false;
 							return 1;
 						}