X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_server.cpp;h=e1289eac7dfbce9a8ebfae99fd7eec0b8c1c8010;hb=7866c42d8f80723d07cf38ed9413857164b55e00;hp=c7b413406513561fed331baba3cc2a023d1aef21;hpb=4b856bda135a08e800b96c970a10b0b6a34d433a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_server.cpp b/src/commands/cmd_server.cpp
index c7b413406..e1289eac7 100644
--- a/src/commands/cmd_server.cpp
+++ b/src/commands/cmd_server.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,18 +12,38 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_server.h"
 
-
-
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** 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
+ * may not.
+ */
+class CommandServer : public Command
 {
-	return new CommandServer(Instance);
-}
+ public:
+	/** Constructor for server.
+	 */
+	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
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
 CmdResult CommandServer::Handle (const std::vector<std::string>&, User *user)
 {
-	user->WriteNumeric(666, "%s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick.c_str());
-	ServerInstance->SNO->WriteToSnoMask('A', "WARNING: %s attempted to issue a SERVER command and is registered as a user!", user->nick.c_str());
+	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)",name.c_str());
+	}
 	return CMD_FAILURE;
 }
+
+COMMAND_INIT(CommandServer)