X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noinvite.cpp;h=c1d7f0d6f67e06888333e7c0dbe5f863faf293e2;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=5424c6958cb6cd221b89be7fbbb5a406f8e91427;hpb=87bba3d377a99fef1e22a96a8ac403c9aad6efbd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 5424c6958..c1d7f0d6f 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -2,113 +2,84 @@
  *       | 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 "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
 
-class ModuleNoInvite : public Module
+class NoInvite : public ModeHandler
 {
-	Server *Srv;
-	
  public:
- 
-	ModuleNoInvite()
-	{
-		Srv = new Server;
-		Srv->AddExtendedMode('V',MT_CHANNEL,false,0,0);
-	}
-
-        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);
-        }
+	NoInvite(InspIRCd* Instance) : ModeHandler(Instance, 'V', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-
-	virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		if (channel->IsCustomModeSet('V'))
+		if (adding)
 		{
-			WriteServ(user->fd,"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;
+			if (!channel->IsModeSet('V'))
+			{
+				channel->SetMode('V',true);
+				return MODEACTION_ALLOW;
+			}
 		}
 		else
 		{
-			return 0;
+			if (channel->IsModeSet('V'))
+			{
+				channel->SetMode('V',false);
+				return MODEACTION_ALLOW;
+			}
 		}
+
+		return MODEACTION_DENY;
 	}
+};
 
-	virtual ~ModuleNoInvite()
+class ModuleNoInvite : public Module
+{
+	NoInvite *ni;
+ public:
+
+	ModuleNoInvite(InspIRCd* Me) : Module(Me)
 	{
-		delete Srv;
+		ni = new NoInvite(ServerInstance);
+		if (!ServerInstance->AddMode(ni, 'V'))
+			throw ModuleException("Could not add new modes!");
 	}
-	
-	virtual Version GetVersion()
+
+	void Implements(char* List)
 	{
-		return Version(1,0,0,0);
+		List[I_OnUserPreInvite] = 1;
 	}
-};
-
 
-class ModuleNoInviteFactory : public ModuleFactory
-{
- public:
-	ModuleNoInviteFactory()
+	virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
 	{
+		if (channel->IsModeSet('V'))
+		{
+			user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+			return 1;
+		}
+		return 0;
 	}
-	
-	~ModuleNoInviteFactory()
+
+	virtual ~ModuleNoInvite()
 	{
+		ServerInstance->Modes->DelMode(ni);
+		DELETE(ni);
 	}
 	
-	virtual Module * CreateModule()
+	virtual Version GetVersion()
 	{
-		return new ModuleNoInvite;
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoInviteFactory;
-}
-
+MODULE_INIT(ModuleNoInvite)