X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noinvite.cpp;h=86b960b63f84da4d0a980720a185d446862b550e;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=476dbea1e073bf5f9d89c94567e64ce30d96e9a5;hpb=2d821f2980825be73e3f90b47ffff365b0ec5ecb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 476dbea1e..86b960b63 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.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,65 +24,72 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
 
+class NoInvite : public ModeHandler
+{
+ public:
+	NoInvite() : ModeHandler('V', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		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
 {
 	Server *Srv;
+	NoInvite *ni;
 	
 	public:
  
-		ModuleNoInvite(Server* Me)
-			: Module::Module(Me)
+		ModuleNoInvite(Server* Me) : Module::Module(Me)
 		{
 			Srv = Me;
-			Srv->AddExtendedMode('V',MT_CHANNEL,false,0,0);
+			ni = new NoInvite();
+			Srv->AddMode(ni, 'V');
 		}
 
-		virtual void On005Numeric(std::string &output)
+		void Implements(char* List)
 		{
-			std::stringstream line(output);
-			std::string temp1, temp2;
+			List[I_On005Numeric] = List[I_OnUserPreInvite] = 1;
+		}
 
-			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);
+		virtual void On005Numeric(std::string &output)
+		{
+			InsertMode(output,"V",4);
 		}
 
 
 		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);
 				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(ni);
 		}
 	
 		virtual Version GetVersion()