Decide that it wasn't quite appropriate :(

[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 0cdde51c8e6adbc932e40887018f7b362e9ef2f3..a91ddef7f6104d0d00424a8e1add07f2cfd956bf 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -1,8 +1,26 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
 
+#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
@@ -13,28 +31,52 @@ class ModuleRedirect : public Module
        
  public:
  
-       ModuleRedirect()
+       ModuleRedirect(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                Srv->AddExtendedMode('L',MT_CHANNEL,false,1,0);
        }
        
        virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
        {
-               
                if ((modechar == 'L') && (type == MT_CHANNEL))
                {
-                       chanrec* c = Srv->Findchannel(params[0]);
-                       if (c)
+                       if (mode_on)
                        {
-                               if (c->IsCustomModeSet('L'))
+                               std::string ChanToJoin = params[0];
+                               chanrec *c;
+
+                               if (!IsValidChannelName(ChanToJoin.c_str()))
                                {
-                                       WriteServ(user->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",user->nick,params[0].c_str());
-                                       return 0;
+                                       WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, ChanToJoin.c_str());
+                                       return 0;
+                               }
+
+                               c = Srv->FindChannel(ChanToJoin);
+                               if (c)
+                               {
+                                       /* Fix by brain: Dont let a channel be linked to *itself* either */
+                                       if ((c == target) || (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;
+       }
+
+       void Implements(char* List)
+       {
+               List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnExtendedMode] = 1;
+       }
+
+       virtual void On005Numeric(std::string &output)
+       {
+               InsertMode(output, "L", 3);
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -43,31 +85,26 @@ class ModuleRedirect : public Module
                {
                        if (chan->IsCustomModeSet('L'))
                        {
-                               if (chan->limit >= Srv->CountUsers(chan))
+                               if (Srv->CountUsers(chan) >= chan->limit)
                                {
-                                       char* channel = chan->GetModeParameter('L');
-                                       WriteServ(user->fd,"470 %s :%s has become full, so you are automatically being transferred to the linked channel %s",user->nick,cname,channel);
-                                       Srv->JoinUserToChannel(user,channel,"");
+                                       std::string channel = chan->GetModeParameter('L');
+                                       WriteServ(user->fd,"470 %s :%s has become full, so you are automatically being transferred to the linked channel %s",user->nick,cname,channel.c_str());
+                                       Srv->JoinUserToChannel(user,channel.c_str(),"");
                                        return 1;
                                }
                        }
                }
+               return 0;
        }
 
        virtual ~ModuleRedirect()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
-       
-       virtual void OnUserConnect(userrec* user)
-       {
-       }
-
 };
 
 
@@ -82,9 +119,9 @@ class ModuleRedirectFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleRedirect;
+               return new ModuleRedirect(Me);
        }
        
 };