Remote server PRIVMSG/NOTICE to nickname support

[user/henk/code/inspircd.git] / src / modules / m_banredirect.cpp

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 56be984b665c3b206a301cc82d3353fe92039c41..bb59cde3db36b9fc3fbb8cfbb666b97a7d63204c 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -19,7 +19,7 @@
 /* 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;
                                }
                        }
@@ -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);
 
        }
        
@@ -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;
                                                }