X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_devoice.cpp;h=64c341ad6acfe8fc2b314f7b2918650ff26c4fbb;hb=2b3394855d5adddb16285b905503d9ffe5a1d963;hp=f3df12cd876fb7447ec03b7022c1855a071557ee;hpb=63cd46d0c0bdae3ee4e4bc0fde186d309add2fcf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index f3df12cd8..64c341ad6 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /*
  * DEVOICE module for InspIRCd
  *  Syntax: /DEVOICE <#chan>
@@ -23,35 +18,40 @@ using namespace std;
 
 /* $ModDesc: Provides voiced users with the ability to devoice themselves. */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
-Server *Srv;
-	 
+/** Handle /DEVOICE
+ */
 class cmd_devoice : public command_t
 {
  public:
-	cmd_devoice () : command_t("DEVOICE", 0, 2)
+	cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1)
 	{
 		this->source = "m_devoice.so";
+		syntax = "<channel>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	void Handle (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.
-		 */
-                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);
+			userrec* n = new userrec(ServerInstance);
+			n->SetFd(FD_MAGIC_NUMBER);
+			ServerInstance->SendMode(modes,3,n);
+			delete n;
+
+			/* route it -- SendMode doesn't distribute over the whole network */
+			return CMD_SUCCESS;
+		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -59,44 +59,21 @@ class ModuleDeVoice : public Module
 {
 	cmd_devoice *mycommand;
  public:
-	ModuleDeVoice(Server* Me) : Module::Module(Me)
+	ModuleDeVoice(InspIRCd* Me) : Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_devoice();
-		Srv->AddCommand(mycommand);
+
+		mycommand = new cmd_devoice(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
-	
+
 	virtual ~ModuleDeVoice()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
-	}
-};
 
-
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-	ModuleDeVoiceFactory()
-	{
-	}
-	
-	~ModuleDeVoiceFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleDeVoice(Me);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)