Change includes, use --libs_r rather than mysql_config --libs, we want re-enterant...

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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 6250a107e5ca1bca45c420cec12d50e50a53f80f..6e239cb088fd48eaba3d799ea3f3c604cbc83f3f 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -24,10 +24,59 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
+class Redirect : public ModeHandler
+{
+       Server* Srv;
+ public:
+       Redirect(Server* s) : ModeHandler('L', 1, 0, false, MODETYPE_CHANNEL, false), Srv(s) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               if (adding)
+               {
+                       chanrec* c = NULL;
+
+                       if (!IsValidChannelName(parameter.c_str()))
+                       {
+                               WriteServ(source->fd,"403 %s %s :Invalid channel name",source->nick, parameter.c_str());
+                               parameter = "";
+                               return MODEACTION_DENY;
+                       }
+
+                       c = Srv->FindChannel(parameter);
+                       if (c)
+                       {
+                               /* Fix by brain: Dont let a channel be linked to *itself* either */
+                               if ((c == channel) || (c->IsModeSet('L')))
+                               {
+                                       WriteServ(source->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",source->nick,parameter.c_str());
+                                       parameter = "";
+                                       return MODEACTION_DENY;
+                               }
+                       }
+
+                       channel->SetMode('L', true);
+                       channel->SetModeParam('L', parameter.c_str(), true);
+                       return MODEACTION_ALLOW;
+               }
+               else
+               {
+                       if (channel->IsModeSet('L'))
+                       {
+                               channel->SetMode('L', false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
+               
+       }
+};
 
 class ModuleRedirect : public Module
 {
        Server *Srv;
+       Redirect* re;
        
  public:
  
@@ -35,61 +84,25 @@ class ModuleRedirect : public Module
                : Module::Module(Me)
        {
                Srv = Me;
-               Srv->AddExtendedMode('L',MT_CHANNEL,false,1,0);
+               re = new Redirect(Me);
+               Srv->AddMode(re, 'L');
        }
        
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+       void Implements(char* List)
        {
-               if ((modechar == 'L') && (type == MT_CHANNEL))
-               {
-                       if (mode_on)
-                       {
-                               std::string ChanToJoin = params[0];
-                               chanrec* c = Srv->FindChannel(ChanToJoin);
-                               if (c)
-                               {
-                                       if (c->IsCustomModeSet('L'))
-                                       {
-                                               WriteServ(user->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",user->nick,params[0].c_str());
-                                               return 0;
-                                       }
-                               }
-                       }
-                       return 1;
-               }
-               return 0;
+               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
        }
 
-       void Implements(char* List)
+       virtual void On005Numeric(std::string &output)
        {
-               List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnExtendedMode] = 1;
+               InsertMode(output, "L", 3);
        }
-
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                               // By doing this we're *assuming* no other module has fucked up the CHANMODES=
-                               // section of the 005 numeric. If they have, we're going DOWN in a blaze of glory,
-                               // with a honking great EXCEPTION :)
-                               temp1.insert(temp1.find(",")+1,"L");
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
-        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
                if (chan)
                {
-                       if (chan->IsCustomModeSet('L'))
+                       if (chan->IsModeSet('L'))
                        {
                                if (Srv->CountUsers(chan) >= chan->limit)
                                {
@@ -105,6 +118,7 @@ class ModuleRedirect : public Module
 
        virtual ~ModuleRedirect()
        {
+               DELETE(re);
        }
        
        virtual Version GetVersion()