X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_commands.cpp;h=1555b4d0443198d69bac2fb298cedafa749d5ba2;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=63b4b24fb68fe5ce83633aa1605ef4337af8db84;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp
index 63b4b24fb..1555b4d04 100644
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.cpp
@@ -1,25 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-#ifndef __CMD_COMMANDS_H__
-#define __CMD_COMMANDS_H__
 
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
 /** Handle /COMMANDS. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -31,7 +30,11 @@ class CommandCommands : public Command
  public:
 	/** Constructor for commands.
 	 */
-	CommandCommands ( Module* parent) : Command(parent,"COMMANDS",0,0) { }
+	CommandCommands(Module* parent) : Command(parent,"COMMANDS",0,0)
+	{
+		Penalty = 3;
+	}
+
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -41,23 +44,29 @@ class CommandCommands : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 /** Handle /COMMANDS
  */
 CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
 {
+	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++)
 	{
+		// Don't show S2S commands to users
+		if (i->second->flags_needed == FLAG_SERVERONLY)
+			continue;
+
 		Module* src = i->second->creator;
-		user->WriteNumeric(RPL_COMMANDS, "%s :%s %s %d %d",
-				user->nick.c_str(),
-				i->second->command.c_str(),
-				src ? src->ModuleSourceFile.c_str() : "<core>",
-				i->second->min_params,
-				i->second->Penalty);
+		char buffer[MAXBUF];
+		snprintf(buffer, MAXBUF, ":%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(),
+			i->second->min_params, i->second->Penalty);
+		list.push_back(buffer);
 	}
+	sort(list.begin(), list.end());
+	for(unsigned int i=0; i < list.size(); i++)
+		user->Write(list[i]);
 	user->WriteNumeric(RPL_COMMANDSEND, "%s :End of COMMANDS list",user->nick.c_str());
 	return CMD_SUCCESS;
 }