Broken code commented out by brain until we can fix it.

[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 5e7ae97868eb9a7f950cf175859fb1cea6319fca..deea7abd426de51ab7d2b5b531c2c7d7d76188f6 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -6,7 +6,7 @@
 #include "channels.h"
 #include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for unreal-style SAJOIN command */
 
 Server *Srv;
         
@@ -15,8 +15,18 @@ void handle_sajoin(char **parameters, int pcnt, userrec *user)
        userrec* dest = Srv->FindNick(std::string(parameters[0]));
        if (dest)
        {
-               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));
+
+               for (int x = 0; x < strlen(parameters[1]); x++)
+               {
+                               if ((parameters[1][0] != '#') || (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));
        }
 }