X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=2471efe91fae41e54c8c34d24b138217a87c5d7f;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=602a7c3c2d068a804398cd0603d90ea71c0056cf;hpb=29b4e8dce678748ecc9e6004288464c179ca20ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 602a7c3c2..2471efe91 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -21,10 +21,11 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
-Server *Srv;
+static Server *Srv;
 
 class cmd_sajoin : public command_t
 {
@@ -39,23 +40,13 @@ class cmd_sajoin : public command_t
 		userrec* dest = Srv->FindNick(std::string(parameters[0]));
 		if (dest)
 		{
-			/* might be nicer to make checking valid channel names an api function sometime --w00t */
-			if (parameters[1][0] != '#')
+			if (!IsValidChannelName(parameters[1]))
 			{
 				/* we didn't need to check this for each character ;) */
 				Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
 				return;
 			}
 
-			for (unsigned int x = 0; x < strlen(parameters[1]); x++)
-			{
-					if ((parameters[1][x] == ' ') || (parameters[1][x] == ','))
-					{
-						Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-						return;
-					}
-			}
-
 			Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
 			Srv->JoinUserToChannel(dest,std::string(parameters[1]),std::string(dest->nick));
 		}