X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=7ac46573224f8eb9aa1e6f9edd7bc08e4060b6f5;hb=7b5703b9a22e176ef6a47b405f2b0d5ce122df0a;hp=7b779a880e8f38259206c19bf8fdc157745edaf6;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 7b779a880..7ac465732 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -1,19 +1,27 @@
-/*       +------------------------------------+
- *       | 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) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005, 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 support for unreal-style SAJOIN command */
+/* $ModDesc: Provides command SAJOIN to allow opers to force-join users to channels */
 
 /** Handle /SAJOIN
  */
@@ -22,6 +30,7 @@ class CommandSajoin : public Command
  public:
 	CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 2)
 	{
+		allow_empty_last_param = false;
 		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
@@ -29,7 +38,7 @@ class CommandSajoin : public Command
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
-		if (dest)
+		if ((dest) && (dest->registered == REG_ALL))
 		{
 			if (ServerInstance->ULine(dest->server))
 			{
@@ -39,7 +48,7 @@ class CommandSajoin : public Command
 			if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
 			{
 				/* we didn't need to check this for each character ;) */
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long");
+				user->WriteServ("NOTICE "+user->nick+" :*** Invalid characters in channel name or name too long");
 				return CMD_FAILURE;
 			}
 
@@ -56,30 +65,29 @@ class CommandSajoin : public Command
 				{
 					if (n->HasUser(dest))
 					{
-						ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+						ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+parameters[1]);
 						return CMD_SUCCESS;
 					}
 					else
 					{
-						user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
+						user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
 						return CMD_FAILURE;
 					}
 				}
 				else
 				{
-					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
+					user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]);
 					return CMD_FAILURE;
 				}
 			}
 			else
 			{
-				ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
 				return CMD_SUCCESS;
 			}
 		}
 		else
 		{
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]);
+			user->WriteServ("NOTICE "+user->nick+" :*** No such nickname "+parameters[0]);
 			return CMD_FAILURE;
 		}
 	}
@@ -100,7 +108,11 @@ class ModuleSajoin : public Module
 	ModuleSajoin()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
 	virtual ~ModuleSajoin()
@@ -109,7 +121,7 @@ class ModuleSajoin : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };