X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sakick.cpp;h=7dfcd8904db3b7e8531059e270274a6eac547cb5;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=b81df75c6c6aac53c01035aea82cf24ae7130759;hpb=e50d016aa23083f81dcf181f68edb81c5b23c78d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index b81df75c6..7dfcd8904 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides a SAKICK command */
@@ -31,9 +38,8 @@ class CommandSakick : public Command
 		User* dest = ServerInstance->FindNick(parameters[1]);
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		const char* reason = "";
-		const char* servername = NULL;
 
-		if (dest && channel)
+		if ((dest) && (dest->registered == REG_ALL) && (channel))
 		{
 			if (parameters.size() > 2)
 			{
@@ -56,7 +62,7 @@ class CommandSakick : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
-				channel->ServerKickUser(dest, reason, servername);
+				channel->KickUser(ServerInstance->FakeClient, dest, reason);
 
 				Channel *n = ServerInstance->FindChan(parameters[1]);
 				if (n && n->HasUser(dest))
@@ -70,7 +76,7 @@ class CommandSakick : public Command
 			if (IS_LOCAL(user))
 			{
 				/* Locally issued command; send the snomasks */
-				ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " SAKICKed " + dest->nick + " on " + parameters[0]);
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick + " SAKICKed " + dest->nick + " on " + parameters[0]);
 			}
 
 			return CMD_SUCCESS;
@@ -99,7 +105,11 @@ class ModuleSakick : public Module
 	ModuleSakick()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
 	virtual ~ModuleSakick()