X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_join.cpp;h=a71e4d81c9f294ec7c3f5e01c4b275aafc09d42b;hb=77123f4dec9f29105f6c0ceea0262cfe8e9eaa1a;hp=428f83e56b0267dd3da2bcf59a439695b20c170f;hpb=c8240fcba32a3467bebbbcc43084979bdeb6c278;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 428f83e56..a71e4d81c 100644
--- 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
@@ -14,65 +14,25 @@
  * ---------------------------------------------------
  */
 
-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 "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(this,parameters,pcnt,user,0,0,1))
+	if (ServerInstance->Parser->LoopCall(this, parameters, pcnt, user, 0, 0, 1))
 		return;
-	if (parameters[0][0] == '#')
+
+	if (IsValidChannelName(parameters[0]))
+	{
+		add_channel(user, parameters[0], parameters[1], false);
+	}
+	else
 	{
-		Ptr = add_channel(user,parameters[0],parameters[1],false);
+		WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
 	}
 }
-
-
-