Gah, im forgetting to SetMode!

[user/henk/code/inspircd.git] / src / modules / m_sajoin.cpp

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index acf5122d8d1d1f60c1bddf6974eb74ac35e46d79..2471efe91fae41e54c8c34d24b138217a87c5d7f 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -21,17 +21,18 @@ 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
 {
  public:
        cmd_sajoin() : command_t("SAJOIN", 'o', 2)
        {
-               this->source = "m_sajoin.cpp";
+               this->source = "m_sajoin.so";
        }
 
        void Handle (char **parameters, int pcnt, userrec *user)
@@ -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));
                }