Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

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

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 621a187ef2f915066b54b84a81c32186e1afa223..8c24c7bcb1dad066e031073187f33b7c69e094cc 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,59 +2,51 @@
  *       | 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 "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"
+#include "commands/cmd_join.h"
 
-extern InspIRCd* ServerInstance;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_join(Instance);
+}
 
-void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /JOIN
+ */
+CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *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]))
+               {
+                       chanrec::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]))
+               {
+                       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;
+}