Add extra parameter to MySQLresult and SQLresult

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

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 17b14fdff4aa42056d9374564c388ef1cc6c867f..728038c2eb11d600700f489fd64a09ace172df78 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -22,17 +22,30 @@
 
 extern InspIRCd* ServerInstance;
 
-void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
+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 (IsValidChannelName(parameters[0]))
+               {
+                       add_channel(user, parameters[0], parameters[1], false);
+                       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 (IsValidChannelName(parameters[0]))
+               {
+                       add_channel(user, parameters[0], "", false);
+                       return;
+               }
        }
+
+       WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
 }