Move SetNoticeMask(), FormatNoticeMasks() and ProcessNoticeMasks() from the User...

[user/henk/code/inspircd.git] / src / commands / cmd_commands.cpp

diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp
index 13bd3fab8d5b3eec9e396dc4e648eb1f79483289..99acdfe963cb13f756d65eed39bcc7b2f4540646 100644 (file)
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.cpp
@@ -48,13 +48,14 @@ CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
        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;
-               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);
+               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(),
+                       i->second->min_params, i->second->Penalty));
        }
        sort(list.begin(), list.end());
        for(unsigned int i=0; i < list.size(); i++)