Added a parameter to OnRehash for the rehash parameter

[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 76c568ea71964083032644ef36266d974688cb9c..f82bba20335b7af9807745415b6b2d7ef32c1ab2 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -31,9 +31,17 @@ void handle_sajoin(char **parameters, int pcnt, userrec *user)
        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] != '#')
+               {
+                       /* 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][0] != '#') || (parameters[1][x] == ' ') || (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;