5 files changed, 15 insertions, 25 deletions
diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp
index 722ef8668..19037406b 100644
--- a/src/coremods/core_info/cmd_admin.cpp
+++ b/src/coremods/core_info/cmd_admin.cpp
@@ -34,15 +34,11 @@ 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;
 }
 
diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp
index 8dad99453..e014fa4f2 100644
--- a/src/coremods/core_info/cmd_info.cpp
+++ b/src/coremods/core_info/cmd_info.cpp
@@ -83,9 +83,9 @@ 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;
 }
 
diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 0a1420e13..16931e685 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -65,21 +65,18 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
 					flags[pos] = '-';
 
 #ifdef PURE_STATIC
-			user->SendText(":%s 702 %s :%s %s :%s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str());
+			user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str()));
 #else
 			std::string srcrev = m->ModuleDLLManager->GetVersion();
-			user->SendText(":%s 702 %s :%s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str());
+			user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s - %s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str()));
 #endif
 		}
 		else
 		{
-			user->SendText(":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), m->ModuleSourceFile.c_str(), V.description.c_str());
+			user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s", m->ModuleSourceFile.c_str(), V.description.c_str()));
 		}
 	}
-	user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
+	user->WriteRemoteNumeric(703, "End of MODULES list");
 
 	return CMD_SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_motd.cpp b/src/coremods/core_info/cmd_motd.cpp
index 57616094e..4772f8d2c 100644
--- a/src/coremods/core_info/cmd_motd.cpp
+++ b/src/coremods/core_info/cmd_motd.cpp
@@ -48,18 +48,16 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
 	ConfigFileCache::iterator motd = ServerInstance->Config->Files.find(motd_name);
 	if (motd == ServerInstance->Config->Files.end())
 	{
-		user->SendText(":%s %03d %s :Message of the day file is missing.",
-			ServerInstance->Config->ServerName.c_str(), ERR_NOMOTD, user->nick.c_str());
+		user->WriteRemoteNumeric(ERR_NOMOTD, "Message of the day file is missing.");
 		return CMD_SUCCESS;
 	}
 
-	user->SendText(":%s %03d %s :%s message of the day", ServerInstance->Config->ServerName.c_str(),
-		RPL_MOTDSTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str());
+	user->WriteRemoteNumeric(RPL_MOTDSTART, InspIRCd::Format("%s message of the day", ServerInstance->Config->ServerName.c_str()));
 
 	for (file_cache::iterator i = motd->second.begin(); i != motd->second.end(); i++)
-		user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(), i->c_str());
+		user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
 
-	user->SendText(":%s %03d %s :End of message of the day.", ServerInstance->Config->ServerName.c_str(), RPL_ENDOFMOTD, user->nick.c_str());
+	user->WriteRemoteNumeric(RPL_ENDOFMOTD, "End of message of the day.");
 
 	return CMD_SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_time.cpp b/src/coremods/core_info/cmd_time.cpp
index 95cfb12fd..a0b58efcc 100644
--- a/src/coremods/core_info/cmd_time.cpp
+++ b/src/coremods/core_info/cmd_time.cpp
@@ -32,8 +32,7 @@ CmdResult CommandTime::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 %s :%s", ServerInstance->Config->ServerName.c_str(), RPL_TIME, user->nick.c_str(),
-		ServerInstance->Config->ServerName.c_str(), InspIRCd::TimeString(ServerInstance->Time()).c_str());
+	user->WriteRemoteNumeric(RPL_TIME, ServerInstance->Config->ServerName, InspIRCd::TimeString(ServerInstance->Time()));
 
 	return CMD_SUCCESS;
 }