Change to use std::string::iterator rather than making a copy of the pointer and...

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

diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp
index 0e40fea8181bdafd63b3035413e093ecc0f5bcbe..05f9114e092993b8f2bc0f0161e0343d7ee8dda2 100644 (file)
--- a/src/cmd_pass.cpp
+++ b/src/cmd_pass.cpp
@@ -2,79 +2,42 @@
  *       | 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_pass.h"
+#include "commands/cmd_pass.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_pass::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_pass(Instance);
+}
+
+CmdResult cmd_pass::Handle (const char** parameters, int pcnt, userrec *user)
 {
        // Check to make sure they havnt registered -- Fix by FCS
-       if (user->registered == 7)
+       if (user->registered == REG_ALL)
        {
-               WriteServ(user->fd,"462 %s :You may not reregister",user->nick);
-               return;
+               user->WriteServ("462 %s :You may not reregister",user->nick);
+               return CMD_FAILURE;
        }
-       ConnectClass* a = GetClass(user);
-       strlcpy(user->password,parameters[0],MAXBUF);
-       if (!strcmp(parameters[0],a->pass.c_str()))
+       ConnectClass* a = user->GetClass();
+       if (!a)
+               return CMD_FAILURE;
+
+       strlcpy(user->password,parameters[0],63);
+       if (a->GetPass() == parameters[0])
        {
                user->haspassed = true;
        }
-}
 
+       return CMD_SUCCESS;
+}