X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=02c2f02b6d793fce1a09a17de8b5b519864bb35a;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=1a19c6645b613864218312f2c3eb537d260e7054;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 1a19c6645..02c2f02b6 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -21,7 +21,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style SAPART command */
+/* $ModDesc: Provides command SAPART to force-part users from a channel. */
 
 /** Handle /SAPART
  */
@@ -38,9 +38,9 @@ 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)
+		if ((dest) && (dest->registered == REG_ALL) && (channel))
 		{
 			if (parameters.size() > 2)
 				reason = parameters[2];
@@ -62,14 +62,14 @@ class CommandSapart : public Command
 				Channel* n = ServerInstance->FindChan(parameters[1]);
 				if (!n)
 				{
-					ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+					ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+parameters[1]);
 					return CMD_SUCCESS;
 				}
 				else
 				{
 					if (!n->HasUser(dest))
 					{
-						ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+						ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+parameters[1]);
 						return CMD_SUCCESS;
 					}
 					else
@@ -107,19 +107,17 @@ class ModuleSapart : public Module
 	ModuleSapart()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleSapart()
+	void init()
 	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSapart)
-