A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[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 266ed5a049266e4071bf82b6481989ead2f4e3ea..8d01bdf01701a4fecb9df7eda4e3f2be0960dbac 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -1,43 +1,110 @@
-// Sapart and +g support module by C.J.Edwards
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-Server *Srv;
-        
-void handle_sapart(char **parameters, int pcnt, userrec *user)
+/** Handle /SAPART
+ */
+class cmd_sapart : public command_t
 {
-       userrec* dest = Srv->FindNick(std::string(parameters[0]));
-       if (dest)
+ public:
+       cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
        {
-               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));
+               this->source = "m_sapart.so";
+               syntax = "<nick> <channel>";
        }
-}
+
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       {
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               chanrec* channel = ServerInstance->FindChan(parameters[1]);
+               if (dest && channel)
+               {
+                       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, dest->nick))
+                                       delete channel;
+                               chanrec* n = ServerInstance->FindChan(parameters[1]);
+                               if (!n)
+                               {
+                                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                                       return CMD_SUCCESS;
+                               }
+                               else
+                               {
+                                       if (!n->HasUser(dest))
+                                       {
+                                               ServerInstance->WriteOpers("*** "+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->WriteOpers("*** "+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;
+       }
+};
 
 
 class ModuleSapart : public Module
 {
+       cmd_sapart*     mycommand;
  public:
-       ModuleSapart()
+       ModuleSapart(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = new Server;
-               Srv->AddCommand("SAPART",handle_sapart,'o',2);
+               
+               mycommand = new cmd_sapart(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSapart()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
 };
@@ -55,15 +122,15 @@ class ModuleSapartFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleSapart;
+               return new ModuleSapart(Me);
        }
        
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleSapartFactory;
 }