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

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 428f83e56..b5359397d 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,77 +2,50 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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"
+#include "commands/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];
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
+{
+	return new CommandJoin(Instance);
+}
 
-void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /JOIN
+ */
+CmdResult CommandJoin::Handle (const char** parameters, int pcnt, User *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 CMD_SUCCESS;
 
+		if (ServerInstance->IsChannel(parameters[0]))
+		{
+			Channel::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+			return CMD_SUCCESS;
+		}
+	}
+	else
+	{
+		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+			return CMD_SUCCESS;
 
+		if (ServerInstance->IsChannel(parameters[0]))
+		{
+			Channel::JoinUser(ServerInstance, user, parameters[0], false, "");
+			return CMD_SUCCESS;
+		}
+	}
 
+	user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
+	return CMD_FAILURE;
+}