Fix for parameters which contain a colon (which is not the first char in the string)

[user/henk/code/inspircd.git] / src / cmd_join.cpp

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index fc63283e5b68ec8865fcde69a08d0e43650f3a1f..25fb558f11ec6f9faebef90b2af844fd438cc274 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -16,23 +16,32 @@
 
 #include "inspircd.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_join.h"
 
-extern InspIRCd* ServerInstance;
-
 void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       if (ServerInstance->Parser->LoopCall(this, parameters, pcnt, user, 0, 0, 1))
-               return;
-
-       if (IsValidChannelName(parameters[0]))
+       if (pcnt > 1)
        {
-               add_channel(user, parameters[0], parameters[1], false);
+               if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
+                       return;
+
+               if (ServerInstance->IsChannel(parameters[0]))
+               {
+                       chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+                       return;
+               }
        }
        else
        {
-               WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+               if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+                       return;
+
+               if (ServerInstance->IsChannel(parameters[0]))
+               {
+                       chanrec::JoinUser(ServerInstance, user, parameters[0], false);
+                       return;
+               }
        }
+
+       user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
 }