Resolve /STATS S conflict between SVSHOLD and SHUN

[user/henk/code/inspircd.git] / src / commands / cmd_server.cpp

diff --git a/src/commands/cmd_server.cpp b/src/commands/cmd_server.cpp
index c350dd2a6169005b7f3538c124f3277814b5b995..e1289eac7dfbce9a8ebfae99fd7eec0b8c1c8010 100644 (file)
--- a/src/commands/cmd_server.cpp
+++ b/src/commands/cmd_server.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_SERVER_H__
-#define __CMD_SERVER_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /SERVER. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -31,7 +23,7 @@ class CommandServer : public Command
  public:
        /** Constructor for server.
         */
-       CommandServer (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"SERVER",0,0,true) { }
+       CommandServer ( Module* parent) : Command(parent,"SERVER") { works_before_reg = true;}
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -41,11 +33,6 @@ class CommandServer : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
-
-
 CmdResult CommandServer::Handle (const std::vector<std::string>&, User *user)
 {
        if (user->registered == REG_ALL)
@@ -54,7 +41,7 @@ CmdResult CommandServer::Handle (const std::vector<std::string>&, User *user)
        }
        else
        {
-               user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have seperate ports from clients, change your config)",command.c_str());
+               user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have seperate ports from clients, change your config)",name.c_str());
        }
        return CMD_FAILURE;
 }