X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=d429704d99e04dd9ee4a09f7b3f0dfa289152b87;hb=27cef863f7286b626e01f1287f31005478a66fea;hp=5b7ead9b4c457f1da46d56960417bbd5a461dcf6;hpb=449bbb6e04f73685341fc22acb4b579794bd56ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 5b7ead9b4..d429704d9 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -27,20 +27,20 @@ class CommandSajoin : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
 		if (dest)
 		{
 			if (ServerInstance->ULine(dest->server))
 			{
-				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
 				return CMD_FAILURE;
 			}
-			if (!ServerInstance->IsChannel(parameters[1]))
+			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");
+				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long");
 				return CMD_FAILURE;
 			}
 
@@ -50,7 +50,7 @@ class CommandSajoin : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
-				Channel::JoinUser(ServerInstance, dest, parameters[1], true, "", false, ServerInstance->Time(true));
+				Channel::JoinUser(ServerInstance, dest, parameters[1].c_str(), true, "", false, ServerInstance->Time());
 				/* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propagate */
 				Channel* n = ServerInstance->FindChan(parameters[1]);
 				if (n)
@@ -93,21 +93,21 @@ class ModuleSajoin : public Module
 	ModuleSajoin(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		mycommand = new CommandSajoin(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 
 	}
-	
+
 	virtual ~ModuleSajoin()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleSajoin)