Argh, i give up

[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 60bd1bba45f6ebcc4dd735fcbc8d06793428ea26..80a79e25b256da57a8774877ff375f63cc2c60d4 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -154,7 +154,7 @@ class BanRedirect : public ModeWatcher
                                                                                
                                                                                if(redirects->empty())
                                                                                {
-                                                                                       DELETE(redirects);
+                                                                                       delete redirects;
                                                                                        channel->Shrink("banredirects");
                                                                                }
                                                                                
@@ -194,14 +194,16 @@ class ModuleBanRedirect : public Module
                nofollow = false;
                
                if(!ServerInstance->AddModeWatcher(re))
+               {
+                       delete re;
                        throw ModuleException("Could not add mode watcher");
+               }
 
                OnRehash(NULL, "");
-       }
-       
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1;
+
+               Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
+               Me->Modules->Attach(list, this, sizeof(list));
+
        }
        
        virtual void OnChannelDelete(Channel* chan)
@@ -245,7 +247,7 @@ class ModuleBanRedirect : public Module
                                        ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);
                                }
                                
-                               DELETE(redirects);
+                               delete redirects;
                                chan->Shrink("banredirects");
                        }
                }
@@ -256,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)
@@ -305,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;
                                                }
@@ -319,7 +321,7 @@ class ModuleBanRedirect : public Module
        virtual ~ModuleBanRedirect()
        {
                ServerInstance->Modes->DelModeWatcher(re);
-               DELETE(re);
+               delete re;
        }
        
        virtual Version GetVersion()
@@ -327,11 +329,11 @@ class ModuleBanRedirect : public Module
                return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
-       Priority Prioritize()
+       void Prioritize()
        {
-               return (Priority)ServerInstance->Modules->PriorityBefore("m_banexception.so");
+               Module* banex = ServerInstance->Modules->Find("m_banexception.so");
+               ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIO_BEFORE, &banex);
        }
 };
 
-
 MODULE_INIT(ModuleBanRedirect)