Convert remaining InspIRCd::Log() calls to new logging system

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

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 36078ab06c719667982cff89524657eff226729b..f7807824f980f9e04d58da3d92840f3192b8a7dd 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -2,59 +2,90 @@
  *       | 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-2008 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.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-
-
-
-class cmd_sapart : public command_t
+/** Handle /SAPART
+ */
+class CommandSapart : public Command
 {
  public:
-       cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
+       CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", "o", 2, false, 0)
        {
                this->source = "m_sapart.so";
-               syntax = "<nick> <channel>";
+               syntax = "<nick> <channel> [reason]";
+               TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
-               chanrec* channel = ServerInstance->FindChan(parameters[1]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               Channel* channel = ServerInstance->FindChan(parameters[1]);
+               std::string reason;
+
                if (dest && channel)
                {
+                       ServerInstance->Logs->Log("m_sapart",DEBUG, "SAPART: pcnt is %d", pcnt);
+                       if (pcnt == 3)
+                               reason = parameters[2];
+                       else
+                               reason = dest->nick;
+
                        if (ServerInstance->ULine(dest->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return CMD_FAILURE;
                        }
-                       ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
-                       if (!channel->PartUser(dest, dest->nick))
-                               delete channel;
+
+                       /* For local clients, directly part them generating a PART message. For remote clients,
+                        * just return CMD_SUCCESS knowing the protocol module will route the SAPART to the users
+                        * local server and that will generate the PART instead
+                        */
+                       if (IS_LOCAL(dest))
+                       {
+                               if (!channel->PartUser(dest, reason.c_str()))
+                                       delete channel;
+                               Channel* n = ServerInstance->FindChan(parameters[1]);
+                               if (!n)
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                                       return CMD_SUCCESS;
+                               }
+                               else
+                               {
+                                       if (!n->HasUser(dest))
+                                       {
+                                               ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                                               return CMD_SUCCESS;
+                                       }
+                                       else
+                                       {
+                                               user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]);
+                                               return CMD_FAILURE;
+                                       }
+                               }
+                       }
+                       else
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
+                       }
 
                        return CMD_SUCCESS;
                }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
+               }
 
                return CMD_FAILURE;
        }
@@ -63,14 +94,15 @@ class cmd_sapart : public command_t
 
 class ModuleSapart : public Module
 {
-       cmd_sapart*     mycommand;
+       CommandSapart*  mycommand;
  public:
        ModuleSapart(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
-               mycommand = new cmd_sapart(ServerInstance);
+               mycommand = new CommandSapart(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSapart()
@@ -79,34 +111,10 @@ class ModuleSapart : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSapartFactory : public ModuleFactory
-{
- public:
-       ModuleSapartFactory()
-       {
-       }
-       
-       ~ModuleSapartFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSapart(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSapartFactory;
-}
+MODULE_INIT(ModuleSapart)