Fix test client error cheecking on result types

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

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 148de057ee5f95243174140b088364f6708747c7..728038c2eb11d600700f489fd64a09ace172df78 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -14,47 +14,38 @@
  * ---------------------------------------------------
  */
 
-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"
+#include "commands/cmd_join.h"
 
 extern InspIRCd* ServerInstance;
 
-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 (IsValidChannelName(parameters[0]))
+               {
+                       add_channel(user, parameters[0], parameters[1], false);
+                       return;
+               }
+       }
+       else
+       {
+               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]);
+}