More AddModes fixes

[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 9fa36b5169b045572bb69d8e98505180e05fc0aa..60bd1bba45f6ebcc4dd735fcbc8d06793428ea26 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -44,7 +44,7 @@ class BanRedirect : public ModeWatcher
        {
        }
 
-       bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &param, bool adding, ModeType type)
+       bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
        {
                /* nick!ident@host -> nick!ident@host
                 * nick!ident@host#chan -> nick!ident@host#chan
@@ -204,7 +204,7 @@ class ModuleBanRedirect : public Module
                List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1;
        }
        
-       virtual void OnChannelDelete(chanrec* chan)
+       virtual void OnChannelDelete(Channel* chan)
        {
                OnCleanup(TYPE_CHANNEL, chan);
        }
@@ -213,7 +213,7 @@ class ModuleBanRedirect : public Module
        {
                if(target_type == TYPE_CHANNEL)
                {
-                       chanrec* chan = static_cast<chanrec*>(item);
+                       Channel* chan = static_cast<Channel*>(item);
                        BanRedirectList* redirects;
                        
                        if(chan->GetExt("banredirects", redirects))
@@ -221,8 +221,6 @@ class ModuleBanRedirect : public Module
                                irc::modestacker modestack(false);
                                StringDeque stackresult;
                                const char* mode_junk[MAXMODES+2];
-                               userrec* myhorriblefakeuser = new userrec(ServerInstance);
-                               myhorriblefakeuser->SetFd(FD_MAGIC_NUMBER);
                                
                                mode_junk[0] = chan->name;
                                
@@ -244,22 +242,21 @@ class ModuleBanRedirect : public Module
                                                mode_junk[i+1] = stackresult[i].c_str();
                                        }
                                        
-                                       ServerInstance->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser);
+                                       ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);
                                }
                                
-                               DELETE(myhorriblefakeuser);
                                DELETE(redirects);
                                chan->Shrink("banredirects");
                        }
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
-               ExceptionModule = ServerInstance->FindModule("m_banexception.so");
+               ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       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)
@@ -296,9 +293,9 @@ class ModuleBanRedirect : public Module
                                        if(ServerInstance->MatchText(user->GetFullRealHost(), redir->banmask) || ServerInstance->MatchText(user->GetFullHost(), redir->banmask) || ServerInstance->MatchText(ipmask, redir->banmask))
                                        {
                                                /* tell them they're banned and are being transferred */
-                                               chanrec* destchan = ServerInstance->FindChan(redir->targetchan);
+                                               Channel* destchan = ServerInstance->FindChan(redir->targetchan);
                                                
-                                               if(destchan && ServerInstance->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
+                                               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);
                                                        return 1;
@@ -308,7 +305,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;
-                                                       chanrec::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
+                                                       Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
                                                        nofollow = false;
                                                        return 1;
                                                }
@@ -332,7 +329,7 @@ class ModuleBanRedirect : public Module
        
        Priority Prioritize()
        {
-               return (Priority)ServerInstance->PriorityBefore("m_banexception.so");
+               return (Priority)ServerInstance->Modules->PriorityBefore("m_banexception.so");
        }
 };