Fix crash on propogation after routed squit has reached it's destination. Thx HiroP.

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

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 5424c6958cb6cd221b89be7fbbb5a406f8e91427..219c1c78fee0aeff85bb5f3a8e057c64b994151a 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -2,88 +2,86 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
 
-class ModuleNoInvite : public Module
+class NoInvite : public ModeHandler
 {
-       Server *Srv;
-       
  public:
- 
-       ModuleNoInvite()
+       NoInvite(InspIRCd* Instance) : ModeHandler(Instance, 'V', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               Srv = new Server;
-               Srv->AddExtendedMode('V',MT_CHANNEL,false,0,0);
+               if (adding)
+               {
+                       if (!channel->IsModeSet('V'))
+                       {
+                               channel->SetMode('V',true);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (channel->IsModeSet('V'))
+                       {
+                               channel->SetMode('V',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
        }
+};
+
+class ModuleNoInvite : public Module
+{
+       NoInvite *ni;
+ public:
 
-        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=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "V";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
-        }
+       ModuleNoInvite(InspIRCd* Me) : Module(Me)
+       {
+               ni = new NoInvite(ServerInstance);
+               if (!ServerInstance->AddMode(ni, 'V'))
+                       throw ModuleException("Could not add new modes!");
+       }
 
+       void Implements(char* List)
+       {
+               List[I_OnUserPreInvite] = 1;
+       }
 
        virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
        {
-               if (channel->IsCustomModeSet('V'))
+               if (channel->IsModeSet('V'))
                {
-                       WriteServ(user->fd,"492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+                       user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
                        return 1;
                }
                return 0;
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'V') && (type == MT_CHANNEL))
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
 
        virtual ~ModuleNoInvite()
        {
-               delete Srv;
+               ServerInstance->Modes->DelMode(ni);
+               DELETE(ni);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };
 
@@ -94,20 +92,19 @@ class ModuleNoInviteFactory : public ModuleFactory
        ModuleNoInviteFactory()
        {
        }
-       
+
        ~ModuleNoInviteFactory()
        {
        }
-       
-       virtual Module * CreateModule()
+
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleNoInvite;
+               return new ModuleNoInvite(Me);
        }
-       
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleNoInviteFactory;
 }