Wheee, mass commit! this adds const stafety, throwing a compile error if anyone does...

[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 e4b36b0357961d1fb1412f6eaa22e1b3d7a9376f..1a176da85a83d8517e9d09239d4324dccb6b3810 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -2,92 +2,119 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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.
  *
  * ---------------------------------------------------
  */
 
-#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 */
 
-Server *Srv;
-        
-void handle_sapart(char **parameters, int pcnt, userrec *user)
+/** Handle /SAPART
+ */
+class CommandSapart : public Command
 {
-       userrec* dest = Srv->FindNick(std::string(parameters[0]));
-       if (dest)
+ public:
+       CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", "o", 2, false, 0)
+       {
+               this->source = "m_sapart.so";
+               syntax = "<nick> <channel> [reason]";
+               TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
+       }
+
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
-               for (int x = 0; x < strlen(parameters[1]); x++)
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               Channel* channel = ServerInstance->FindChan(parameters[1]);
+               std::string reason;
+
+               if (dest && channel)
                {
-                               if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
+                       ServerInstance->Log(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;
+                       }
+
+                       /* 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
                                {
-                                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                                       return;
+                                       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);
                }
 
-               Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::string(dest->nick)+" part "+parameters[1]);
-               Srv->PartUserFromChannel(dest,std::string(parameters[1]),std::string(dest->nick));
+               return CMD_FAILURE;
        }
-}
+};
 
 
 class ModuleSapart : public Module
 {
+       CommandSapart*  mycommand;
  public:
-       ModuleSapart()
+       ModuleSapart(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = new Server;
-               Srv->AddCommand("SAPART",handle_sapart,'o',2,"m_sapart.so");
+               
+               mycommand = new CommandSapart(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSapart()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1);
+               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()
-       {
-               return new ModuleSapart;
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSapartFactory;
-}
+MODULE_INIT(ModuleSapart)