Add VF_COMMON to a lot modules which require it. Reported by danielg in bug #369...

[user/henk/code/inspircd.git] / src / modules / m_devoice.cpp

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 5b60752f31fcf2d2f99498889d9bf5c663ae53ff..06413f0ec0432206b662b3311bb9cf708c3570d7 100644 (file)
--- 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,37 +18,42 @@ using namespace std;
 
 /* $ModDesc: Provides voiced users with the ability to devoice themselves. */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
-extern InspIRCd* ServerInstance;
-        
+/** 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;
+
+                       userrec* n = new userrec(ServerInstance);
+                       n->SetFd(FD_MAGIC_NUMBER);
+                       ServerInstance->SendMode(modes,3,n);
+                       delete n;
 
-               ServerInstance->SendMode(modes,3,user);
+                       /* route it -- SendMode doesn't distribute over the whole network */
+                       return CMD_SUCCESS;
+               }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -61,44 +61,21 @@ class ModuleDeVoice : public Module
 {
        cmd_devoice *mycommand;
  public:
-       ModuleDeVoice(InspIRCd* Me) : Module::Module(Me)
+       ModuleDeVoice(InspIRCd* Me) : Module(Me)
        {
-               
-               mycommand = new cmd_devoice();
+
+               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(InspIRCd* 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)