Of course, it DOES help to actually initialise the Mutex objects, and delete them...

[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 7f5135970e2b8f403f2d9612e80b450e409d3bfb..c010b289f499e57e068405f6f775073eef70335c 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -31,19 +31,16 @@ class CommandSapart : public Command
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
                Channel* channel = ServerInstance->FindChan(parameters[1]);
-               std::string reason;
+               std::string reason = "";
 
                if (dest && channel)
                {
-                       ServerInstance->Logs->Log("m_sapart",DEBUG, "SAPART: pcnt is %d", parameters.size());
-                       if (parameters.size() == 3)
+                       if (parameters.size() > 2)
                                reason = parameters[2];
-                       else
-                               reason = dest->nick;
 
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
 
@@ -53,8 +50,9 @@ class CommandSapart : public Command
                         */
                        if (IS_LOCAL(dest))
                        {
-                               if (!channel->PartUser(dest, reason.c_str()))
+                               if (!channel->PartUser(dest, reason))
                                        delete channel;
+
                                Channel* n = ServerInstance->FindChan(parameters[1]);
                                if (!n)
                                {
@@ -70,7 +68,7 @@ class CommandSapart : public Command
                                        }
                                        else
                                        {
-                                               user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1].c_str());
+                                               user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
                                                return CMD_FAILURE;
                                        }
                                }
@@ -84,7 +82,7 @@ class CommandSapart : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
+                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
                }
 
                return CMD_FAILURE;
@@ -99,21 +97,21 @@ class ModuleSapart : public Module
        ModuleSapart(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                mycommand = new CommandSapart(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleSapart()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleSapart)