X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_join.cpp;h=218e0f7b8b33229c28f675d35b9648fb90521369;hb=eb334f8c69872cc0de28ffd85b41555f196a23dd;hp=159e383907fd81e1e82187ebb56c6d46c273197c;hpb=6b43da7511ca875b64e58b84f72dd89485c0e7fd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 159e38390..218e0f7b8 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,62 +2,51 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.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 "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)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
-	if (ServerInstance->Parser->LoopCall(this, parameters, pcnt, user, 0, 0, 1))
-		return;
+	return new cmd_join(Instance);
+}
 
-	if (IsValidChannelName(parameters[0]))
+/** Handle /JOIN
+ */
+CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
+{
+	if (pcnt > 1)
 	{
-		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]))
+		{
+			chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+			return CMD_SUCCESS;
+		}
 	}
 	else
 	{
-		WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+			return CMD_SUCCESS;
+
+		if (ServerInstance->IsChannel(parameters[0]))
+		{
+			chanrec::JoinUser(ServerInstance, user, parameters[0], false, "");
+			return CMD_SUCCESS;
+		}
 	}
-}
-
-
 
+	user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
+	return CMD_FAILURE;
+}