X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_info%2Fcmd_info.cpp;h=3bf9db893338241e05ccd5cdac0966cc1dc7691f;hb=9180e4664e8b76c53a96f98d82362482450bde84;hp=0d8c1a45a9a7d382e9d41a322f72f9ca34a78df7;hpb=bb51cfe506e6e534ea6ce1f4d5649ba27f51666f;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 0d8c1a45a..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>]";
@@ -35,9 +35,10 @@ static const char* const lines[] = {
 	"                 November 2002 - Present",
 	" ",
 	"\2Core Developers\2:",
-	"    Craig Edwards,          Brain,      <brain@inspircd.org>",
-	"    Craig McLure,           Craig,      <craig@inspircd.org>",
-	"    Robin Burchell,         w00t,       <w00t@inspircd.org>",
+	"    Attila Molnar,          Attila,     <attilamolnar@hush.com>",
+	"    Peter Powell,           SaberUK,    <petpow@saberuk.com>",
+	" ",
+	"\2Former Developers\2:",
 	"    Oliver Lupton,          Om,         <om@inspircd.org>",
 	"    John Brooks,            Special,    <special@inspircd.org>",
 	"    Dennis Friis,           peavey,     <peavey@inspircd.org>",
@@ -45,14 +46,14 @@ static const char* const lines[] = {
 	"    Uli Schlachter,         psychon,    <psychon@inspircd.org>",
 	"    Matt Smith,             dz,         <dz@inspircd.org>",
 	"    Daniel De Graaf,        danieldg,   <danieldg@inspircd.org>",
-	"                            jackmcbarn, <jackmcbarn@inspircd.org>",
-	"    Attila Molnar,          Attila,     <attilamolnar@hush.com>",
 	" ",
-	"\2Regular Contributors\2:",
-	"    Adam           SaberUK",
+	"\2Founding Developers\2:",
+	"    Craig Edwards,          Brain,      <brain@inspircd.org>",
+	"    Craig McLure,           Craig,      <craig@inspircd.org>",
+	"    Robin Burchell,         w00t,       <w00t@inspircd.org>",
 	" ",
-	"\2Other Contributors\2:",
-	"    ChrisTX        Shawn           Shutter",
+	"\2Active Contributors\2:",
+	"    Adam           Shutter",
 	" ",
 	"\2Former Contributors\2:",
 	"   dmb             Zaba            skenmy         GreenReaper",
@@ -64,9 +65,10 @@ static const char* const lines[] = {
 	"   Stskeeps        ThaPrince       BuildSmart     Thunderhacker",
 	"   Skip            LeaChim         Majic          MacGyver",
 	"   Namegduf        Ankit           Phoenix        Taros",
+	"   jackmcbarn      ChrisTX         Shawn",
 	" ",
 	"\2Thanks To\2:",
-	"   searchirc.com   irc-junkie.org  Brik           fraggeln",
+	"   Asmo            Brik            fraggeln",
 	" ",
 	" Best experienced with: \2An IRC client\2",
 	NULL
@@ -81,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;
-}