First phase of conversion to dynamic limits on all the lengths, configured via the...

[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 4a46a7264535a485b5095db9a45866f4bffb9d1d..f786d48ee692b92c6b0b48b562c8474a78fec581 100644 (file)
--- 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.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans);
                                return false;
                        }
                        
@@ -114,11 +114,11 @@ class BanRedirect : public ModeWatcher
        
                        if(mask[CHAN].length())
                        {
-                               if(Srv->IsChannel(mask[CHAN].c_str()))
+                               if(!IS_LOCAL(source) || Srv->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax))
                                {
-                                       if(irc::string(channel->name) == irc::string(mask[CHAN].c_str()))
+                                       if (assign(channel->name) == mask[CHAN])
                                        {
-                                               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.c_str(), channel->name.c_str());
                                                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.c_str(), channel->name.c_str(), mask[CHAN].c_str());
                                        return false;
                                }
                        }
@@ -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, 4);
 
        }
        
@@ -219,9 +222,8 @@ class ModuleBanRedirect : public Module
                        {
                                irc::modestacker modestack(false);
                                StringDeque stackresult;
-                               const char* mode_junk[MAXMODES+2];
-                               
-                               mode_junk[0] = chan->name;
+                               std::vector<std::string> mode_junk;
+                               mode_junk.push_back(chan->name);
                                
                                for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++)
                                {
@@ -238,10 +240,10 @@ class ModuleBanRedirect : public Module
                                {
                                        for(StringDeque::size_type i = 0; i < stackresult.size(); i++)
                                        {
-                                               mode_junk[i+1] = stackresult[i].c_str();
+                                               mode_junk.push_back(stackresult[i]);
                                        }
                                        
-                                       ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);
+                                       ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
                                }
                                
                                delete redirects;
@@ -255,7 +257,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, const std::string &keygiven)
        {
                /* This prevents recursion when a user sets multiple ban redirects in a chain
                 * (thanks Potter)
@@ -296,15 +298,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.c_str(), chan->name.c_str());
                                                        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.c_str(), chan->name.c_str());
+                                                       user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick.c_str(), 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());
                                                        nofollow = false;
                                                        return 1;
                                                }