X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_join.cpp;h=218e0f7b8b33229c28f675d35b9648fb90521369;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=25fb558f11ec6f9faebef90b2af844fd438cc274;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 25fb558f1..218e0f7b8 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,12 +2,9 @@
  *       | 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.
  *
@@ -18,30 +15,38 @@
 #include "users.h"
 #include "commands/cmd_join.h"
 
-void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_join(Instance);
+}
+
+/** Handle /JOIN
+ */
+CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt > 1)
 	{
 		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
-			return;
+			return CMD_SUCCESS;
 
 		if (ServerInstance->IsChannel(parameters[0]))
 		{
 			chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
-			return;
+			return CMD_SUCCESS;
 		}
 	}
 	else
 	{
 		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-			return;
+			return CMD_SUCCESS;
 
 		if (ServerInstance->IsChannel(parameters[0]))
 		{
-			chanrec::JoinUser(ServerInstance, user, parameters[0], false);
-			return;
+			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;
 }