X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_info%2Fcmd_admin.cpp;h=f79ebc036dd218520ab9aa26922efacdd8e44257;hb=b200104cf2c61465acecaca111e3ec727fc3b954;hp=722ef866803069a1d26e19eb3a118b83f6ad439e;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp
index 722ef8668..f79ebc036 100644
--- 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>]";
@@ -34,21 +34,10 @@ CmdResult CommandAdmin::Handle (const std::vector<std::string>& parameters, User
 {
 	if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
 		return CMD_SUCCESS;
-	user->SendText(":%s %03d %s :Administrative info for %s", ServerInstance->Config->ServerName.c_str(),
-		RPL_ADMINME, user->nick.c_str(),ServerInstance->Config->ServerName.c_str());
+	user->WriteRemoteNumeric(RPL_ADMINME, InspIRCd::Format("Administrative info for %s", ServerInstance->Config->ServerName.c_str()));
 	if (!AdminName.empty())
-		user->SendText(":%s %03d %s :Name     - %s", ServerInstance->Config->ServerName.c_str(),
-			RPL_ADMINLOC1, user->nick.c_str(), AdminName.c_str());
-	user->SendText(":%s %03d %s :Nickname - %s", ServerInstance->Config->ServerName.c_str(),
-		RPL_ADMINLOC2, user->nick.c_str(), AdminNick.c_str());
-	user->SendText(":%s %03d %s :E-Mail   - %s", ServerInstance->Config->ServerName.c_str(),
-		RPL_ADMINEMAIL, user->nick.c_str(), AdminEmail.c_str());
+		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;
-}