Proper checking in /SAPART that the user really did leave, for the CMD_FAILURE and...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5264 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 36078ab06c719667982cff89524657eff226729b..b5f97a66a2260ade41b82e0e3c30f29b925e64a5 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -49,9 +49,28 @@ class cmd_sapart : public command_t
                                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;
+                       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;
+                               }
+                       }
 
                        return CMD_SUCCESS;
                }