X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_devoice.cpp;h=c1f4e3bc871cd4589d9cfe1366f602754d23d262;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=713dc2788ddb59f9de1b1ae04865e642fae07cdf;hpb=1ff199172d2fd4fa8e7f29dbffd10c684e25e3a9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 713dc2788..c1f4e3bc8 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -26,34 +26,36 @@ using namespace std;
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
-#include "helperfuncs.h"
 #include "modules.h"
+#include "inspircd.h"
 
-static Server *Srv;
-	 
+/** Handle /DEVOICE
+ */	 
 class cmd_devoice : public command_t
 {
  public:
-	cmd_devoice () : command_t("DEVOICE", 0, 1)
+	cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1)
 	{
 		this->source = "m_devoice.so";
 		syntax = "<channel>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		/*
-		 * NOTE: DO NOT CODE LIKE THIS!!! This has no checks and can send
-		 * invalid or plain confusing mode changes, code some checking!
-		 *
-		 * - I'm not aware what checking I need, so for now... be supreme evil.
-		 */
-		const char* modes[3];
-		modes[0] = parameters[0];
-		modes[1] = "-v";
-		modes[2] = user->nick;
+		chanrec* c = ServerInstance->FindChan(parameters[0]);
+		if (c && c->HasUser(user))
+		{
+			const char* modes[3];
+			modes[0] = parameters[0];
+			modes[1] = "-v";
+			modes[2] = user->nick;
 
-		Srv->SendMode(modes,3,user);
+			ServerInstance->SendMode(modes,3,user);
+
+			return CMD_SUCCESS;
+		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -61,12 +63,11 @@ class ModuleDeVoice : public Module
 {
 	cmd_devoice *mycommand;
  public:
-	ModuleDeVoice(Server* Me) : Module::Module(Me)
+	ModuleDeVoice(InspIRCd* Me) : Module::Module(Me)
 	{
-		log(DEBUG,"ModuleDeVoice constructor");
-		Srv = Me;
-		mycommand = new cmd_devoice();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_devoice(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleDeVoice()
@@ -91,16 +92,15 @@ class ModuleDeVoiceFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		log(DEBUG,"ModuleDevoiceFactory::CreateModule()");
 		return new ModuleDeVoice(Me);
 	}
 	
 };
 
 
-extern "C" void * crud_u_like( void )
+extern "C" void * init_module( void )
 {
 	return new ModuleDeVoiceFactory;
 }