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 b1478392d7f285b8c7e1dab24d591d7a51825c03..25fb558f11ec6f9faebef90b2af844fd438cc274 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -14,51 +14,34 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_join.h"
-
-extern InspIRCd* ServerInstance;
+#include "commands/cmd_join.h"
 
-void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       chanrec* Ptr;
-       
-       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,0,1))
-               return;
-       if (parameters[0][0] == '#')
+       if (pcnt > 1)
        {
-               Ptr = 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]);
+}