Move Blocking/NonBlocking to socket.cpp and make inline

[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 33b323fea22c60144ec829aefb31a87c8d93d7e5..6d1086bba5d670229c04ac81eaaef34368e350f9 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -33,21 +33,23 @@ class cmd_sapart : public command_t
        cmd_sapart () : command_t("SAPART", 'o', 2)
        {
                this->source = "m_sapart.so";
+               syntax = "<nick> <channel>";
        }
         
-       void Handle (char **parameters, int pcnt, userrec *user)
+       void Handle (const char** parameters, int pcnt, userrec *user)
        {
-               userrec* dest = Srv->FindNick(std::string(parameters[0]));
-               if (dest)
+               userrec* dest = Srv->FindNick(parameters[0]);
+               chanrec* channel = Srv->FindChannel(parameters[1]);
+               if (dest && channel)
                {
-                       if (!IsValidChannelName(parameters[1]))
+                       if (Srv->IsUlined(dest->server))
                        {
-                               Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return;
                        }
-
-                       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));
+                       Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                       if (!channel->PartUser(dest, dest->nick))
+                               delete channel;
                }
        }
 };