Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 7aa64b092c821bf1e1f939c9dbdec2fb60674d41..f606751d72a959e4fff0d768000bd62cd5673b8d 100644 (file)
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -14,63 +14,24 @@
  * ---------------------------------------------------
  */
 
-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 "configreader.h"
 #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_user.h"
-#include "cull_list.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 CullList* GlobalGoners;
+extern ModuleList modules;
+extern FactoryList factory;
 
 void cmd_user::Handle (char **parameters, int pcnt, userrec *user)
 {
-       log(DEBUG,"Handling USER from cmd_user class!");
        if (user->registered < 3)
        {
-               if (isident(parameters[0]) == 0) {
+               if (!isident(parameters[0])) {
                        // This kinda Sucks, According to the RFC thou, its either this,
                        // or "You have already registered" :p -- Craig
                        WriteServ(user->fd,"461 %s USER :Not enough parameters",user->nick);
@@ -95,8 +56,6 @@ void cmd_user::Handle (char **parameters, int pcnt, userrec *user)
        {
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
                FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
-               ConnectUser(user,GlobalGoners);
+               //ConnectUser(user,NULL);
        }
 }
-       
-