Decide that it wasn't quite appropriate :(

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

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 5e4f886a7a6f21d452bf087c79f73067d6729b78..883f352135da47c3fcce7eff20df0742257e55ef 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -33,45 +33,32 @@ using namespace std;
 #include "users.h"
 #include "ctables.h"
 #include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
 #include "cmd_join.h"
 
-extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
 {
        chanrec* Ptr;
        
-       /*if (ServerInstance->Parser->LoopCall(handle_join,parameters,pcnt,user,0,0,1))
-               return;*/
-       if (parameters[0][0] == '#')
+       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,0,1))
+               return;
+
+       if (IsValidChannelName(parameters[0]))
        {
                Ptr = add_channel(user,parameters[0],parameters[1],false);
        }
+       else
+       {
+               WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+       }
 }