X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=d1321947b2bb54979ecf8618a19556ae05581321;hb=0ec19b7ac91eedc83b31c3da733e237bfe28fc48;hp=406d9ffcd703127741e4535e085a10b45168cee8;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 406d9ffcd..d1321947b 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -29,13 +29,17 @@ class CommandSajoin : public Command
 	CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 1)
 	{
 		allow_empty_last_param = false;
-		flags_needed = 'o'; Penalty = 0; syntax = "[<nick>] <channel>";
+		flags_needed = 'o'; Penalty = 0; syntax = "[<nick>] <channel>[,<channel>]";
 		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		const std::string& channel = parameters.size() > 1 ? parameters[1] : parameters[0];
+		const unsigned int channelindex = (parameters.size() > 1) ? 1 : 0;
+		if (CommandParser::LoopCall(user, this, parameters, channelindex))
+			return CMD_FAILURE;
+
+		const std::string& channel = parameters[channelindex];
 		const std::string& nickname = parameters.size() > 1 ? parameters[0] : user->nick;
 
 		User* dest = ServerInstance->FindNick(nickname);
@@ -59,6 +63,13 @@ class CommandSajoin : public Command
 				return CMD_FAILURE;
 			}
 
+			Channel* chan = ServerInstance->FindChan(channel);
+			if ((chan) && (chan->HasUser(dest)))
+			{
+				user->SendText(":" + user->server->GetName() + " NOTICE " + user->nick + " :*** " + dest->nick + " is already on " + channel);
+				return CMD_FAILURE;
+			}
+
 			/* For local users, we call Channel::JoinUser which may create a channel and set its TS.
 			 * For non-local users, we just return CMD_SUCCESS, knowing this will propagate it where it needs to be
 			 * and then that server will handle the command.
@@ -66,8 +77,8 @@ class CommandSajoin : public Command
 			LocalUser* localuser = IS_LOCAL(dest);
 			if (localuser)
 			{
-				Channel* n = Channel::JoinUser(localuser, channel, true);
-				if (n && n->HasUser(dest))
+				chan = Channel::JoinUser(localuser, channel, true);
+				if (chan)
 				{
 					ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+channel);
 					return CMD_SUCCESS;