Patch to not increment nickchange counter for nick changes that would be blocked...

[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 9b57b6fa45b5d7c23596d0850b0220f8a4483d86..eced487d3e62766977542a3531458347470bb908 100644 (file)
--- a/src/commands/cmd_server.cpp
+++ b/src/commands/cmd_server.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,9 +21,15 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandServer(Instance);
 }
 
-CmdResult CommandServer::Handle (const char**, int, User *user)
+CmdResult CommandServer::Handle (const std::vector<std::string>&, User *user)
 {
-       user->WriteServ("666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick);
-       ServerInstance->WriteOpers("*** WARNING: %s attempted to issue a SERVER command and is registered as a user!",user->nick);
+       if (user->registered == REG_ALL)
+       {
+               user->WriteNumeric(ERR_ALREADYREGISTERED, "%s :You are already registered. (Perhaps your IRC client does not have a /SERVER command).",user->nick.c_str());
+       }
+       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());
+       }
        return CMD_FAILURE;
 }