X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noinvite.cpp;h=a0caade2a23e3df719f4ceb649edfbc555c21077;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=30f313a92d27ca5070bddaab95a7dedd211a1291;hpb=ec7fc489a14af54738da17a94b162a9606df4756;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 30f313a92..a0caade2a 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -1,23 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*   +------------------------------------+
+ *   | Inspire Internet Relay Chat Daemon |
+ *   +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
+ *  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.
+ * 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 support for unreal-style channel mode +V */
 
@@ -25,84 +28,75 @@ class ModuleNoInvite : public Module
 {
 	Server *Srv;
 	
- public:
+	public:
  
-	ModuleNoInvite()
-	{
-		Srv = new Server;
-		Srv->AddExtendedMode('V',MT_CHANNEL,false,0,0);
-	}
+		ModuleNoInvite(Server* Me)
+			: Module::Module(Me)
+		{
+			Srv = Me;
+			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);
-        }
+		void Implements(char* List)
+		{
+			List[I_On005Numeric] = List[I_OnUserPreInvite] = List[I_OnExtendedMode] = 1;
+		}
+
+		virtual void On005Numeric(std::string &output)
+		{
+			InsertMode(output,"V",4);
+		}
 
 
-	virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
-	{
-		if (channel->IsCustomModeSet('V'))
+		virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
 		{
-			WriteServ(user->fd,"492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
-			return 1;
+			if (channel->IsModeSet('V'))
+			{
+				WriteServ(user->fd,"492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+				return 1;
+			}
+			return 0;
 		}
-		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
+		virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
 		{
-			return 0;
+			// check if this is our mode character...
+			if ((modechar == 'V') && (type == MT_CHANNEL))
+  			{
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
 		}
-	}
 
-	virtual ~ModuleNoInvite()
-	{
-		delete Srv;
-	}
+		virtual ~ModuleNoInvite()
+		{
+		}
 	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
+		virtual Version GetVersion()
+		{
+			return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		}
 };
 
 
 class ModuleNoInviteFactory : public ModuleFactory
 {
- public:
-	ModuleNoInviteFactory()
-	{
-	}
+	public:
+		ModuleNoInviteFactory()
+		{
+		}
 	
-	~ModuleNoInviteFactory()
-	{
-	}
+		~ModuleNoInviteFactory()
+		{
+		}
 	
-	virtual Module * CreateModule()
-	{
-		return new ModuleNoInvite;
-	}
+		virtual Module * CreateModule(Server* Me)
+		{
+			return new ModuleNoInvite(Me);
+		}
 	
 };