Merge insp20

[user/henk/code/inspircd.git] / src / coremods / core_info / cmd_info.cpp

diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp
index 8dad99453581684e212f2e9e17cef64aedbe4a30..3bf9db893338241e05ccd5cdac0966cc1dc7691f 100644 (file)
--- a/src/coremods/core_info/cmd_info.cpp
+++ b/src/coremods/core_info/cmd_info.cpp
@@ -24,7 +24,7 @@
 #include "core_info.h"
 
 CommandInfo::CommandInfo(Module* parent)
-       : Command(parent, "INFO")
+       : ServerTargetCommand(parent, "INFO")
 {
        Penalty = 4;
        syntax = "[<servername>]";
@@ -83,15 +83,8 @@ CmdResult CommandInfo::Handle (const std::vector<std::string>& parameters, User
 
        int i=0;
        while (lines[i])
-               user->SendText(":%s %03d %s :%s", ServerInstance->Config->ServerName.c_str(), RPL_INFO, user->nick.c_str(), lines[i++]);
+               user->WriteRemoteNumeric(RPL_INFO, lines[i++]);
        FOREACH_MOD(OnInfo, (user));
-       user->SendText(":%s %03d %s :End of /INFO list", ServerInstance->Config->ServerName.c_str(), RPL_ENDOFINFO, user->nick.c_str());
+       user->WriteRemoteNumeric(RPL_ENDOFINFO, "End of /INFO list");
        return CMD_SUCCESS;
 }
-
-RouteDescriptor CommandInfo::GetRouting(User* user, const std::vector<std::string>& parameters)
-{
-       if (parameters.size() > 0)
-               return ROUTE_UNICAST(parameters[0]);
-       return ROUTE_LOCALONLY;
-}