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

diff --git a/src/coremods/core_info/cmd_commands.cpp b/src/coremods/core_info/cmd_commands.cpp
index 9ae258a9c..b6cc8e34d 100644
--- a/src/coremods/core_info/cmd_commands.cpp
+++ b/src/coremods/core_info/cmd_commands.cpp
@@ -31,22 +31,22 @@ CommandCommands::CommandCommands(Module* parent)
  */
 CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
 {
+	const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
 	std::vector<std::string> list;
-	list.reserve(ServerInstance->Parser->cmdlist.size());
-	for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+	list.reserve(commands.size());
+	for (CommandParser::CommandMap::const_iterator i = commands.begin(); i != commands.end(); ++i)
 	{
 		// Don't show S2S commands to users
 		if (i->second->flags_needed == FLAG_SERVERONLY)
 			continue;
 
 		Module* src = i->second->creator;
-		list.push_back(InspIRCd::Format(":%s %03d %s :%s %s %d %d", ServerInstance->Config->ServerName.c_str(),
-			RPL_COMMANDS, user->nick.c_str(), i->second->name.c_str(), src->ModuleSourceFile.c_str(),
+		list.push_back(InspIRCd::Format("%s %s %d %d", i->second->name.c_str(), src->ModuleSourceFile.c_str(),
 			i->second->min_params, i->second->Penalty));
 	}
-	sort(list.begin(), list.end());
+	std::sort(list.begin(), list.end());
 	for(unsigned int i=0; i < list.size(); i++)
-		user->Write(list[i]);
-	user->WriteNumeric(RPL_COMMANDSEND, ":End of COMMANDS list");
+		user->WriteNumeric(RPL_COMMANDS, list[i]);
+	user->WriteNumeric(RPL_COMMANDSEND, "End of COMMANDS list");
 	return CMD_SUCCESS;
 }