Fix incorrect ModResult for noctcp user target.

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

diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp
index 19037406b1b0dc17a46eb9a6d7f104a34e150e77..8ef68749a4b1fc60b41248fa4866ec570d973165 100644 (file)
--- a/src/coremods/core_info/cmd_admin.cpp
+++ b/src/coremods/core_info/cmd_admin.cpp
@@ -22,7 +22,7 @@
 #include "core_info.h"
 
 CommandAdmin::CommandAdmin(Module* parent)
-       : Command(parent, "ADMIN", 0, 0)
+       : ServerTargetCommand(parent, "ADMIN")
 {
        Penalty = 2;
        syntax = "[<servername>]";
@@ -30,21 +30,14 @@ CommandAdmin::CommandAdmin(Module* parent)
 
 /** Handle /ADMIN
  */
-CmdResult CommandAdmin::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandAdmin::Handle(User* user, const Params& parameters)
 {
-       if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
+       if (parameters.size() > 0 && !irc::equals(parameters[0], ServerInstance->Config->ServerName))
                return CMD_SUCCESS;
-       user->WriteRemoteNumeric(RPL_ADMINME, InspIRCd::Format("Administrative info for %s", ServerInstance->Config->ServerName.c_str()));
+       user->WriteRemoteNumeric(RPL_ADMINME, ServerInstance->Config->ServerName, "Administrative info");
        if (!AdminName.empty())
                user->WriteRemoteNumeric(RPL_ADMINLOC1, InspIRCd::Format("Name     - %s", AdminName.c_str()));
        user->WriteRemoteNumeric(RPL_ADMINLOC2, InspIRCd::Format("Nickname - %s", AdminNick.c_str()));
        user->WriteRemoteNumeric(RPL_ADMINEMAIL, InspIRCd::Format("E-Mail   - %s", AdminEmail.c_str()));
        return CMD_SUCCESS;
 }
-
-RouteDescriptor CommandAdmin::GetRouting(User* user, const std::vector<std::string>& parameters)
-{
-       if (parameters.size() > 0)
-               return ROUTE_UNICAST(parameters[0]);
-       return ROUTE_LOCALONLY;
-}