X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_info%2Fcmd_info.cpp;h=3bf9db893338241e05ccd5cdac0966cc1dc7691f;hb=5267fb9d362aeb326c9e64f7171c957f76776f90;hp=b98c6fe48572007ee762c3a8fb31e02f74c8dca7;hpb=a9503880d881d79ca91038c66ebe29da357108a5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp
index b98c6fe48..3bf9db893 100644
--- a/src/coremods/core_info/cmd_info.cpp
+++ b/src/coremods/core_info/cmd_info.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2011 Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2015 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -24,7 +24,7 @@
 #include "core_info.h"
 
 CommandInfo::CommandInfo(Module* parent)
-	: Command(parent, "INFO")
+	: ServerTargetCommand(parent, "INFO")
 {
 	Penalty = 4;
 	syntax = "[<servername>]";
@@ -36,6 +36,7 @@ static const char* const lines[] = {
 	" ",
 	"\2Core Developers\2:",
 	"    Attila Molnar,          Attila,     <attilamolnar@hush.com>",
+	"    Peter Powell,           SaberUK,    <petpow@saberuk.com>",
 	" ",
 	"\2Former Developers\2:",
 	"    Oliver Lupton,          Om,         <om@inspircd.org>",
@@ -52,8 +53,7 @@ static const char* const lines[] = {
 	"    Robin Burchell,         w00t,       <w00t@inspircd.org>",
 	" ",
 	"\2Active Contributors\2:",
-	"    Adam           SaberUK         ChrisTX",
-	"    Shawn          Shutter",
+	"    Adam           Shutter",
 	" ",
 	"\2Former Contributors\2:",
 	"   dmb             Zaba            skenmy         GreenReaper",
@@ -65,7 +65,7 @@ static const char* const lines[] = {
 	"   Stskeeps        ThaPrince       BuildSmart     Thunderhacker",
 	"   Skip            LeaChim         Majic          MacGyver",
 	"   Namegduf        Ankit           Phoenix        Taros",
-	"   jackmcbarn",
+	"   jackmcbarn      ChrisTX         Shawn",
 	" ",
 	"\2Thanks To\2:",
 	"   Asmo            Brik            fraggeln",
@@ -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;
-}