Fix for bug found by danieldg, where remote nicks were truncated to NICKMAX, but...

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

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index a70477e693be18e13f7ad8c7d56bf2fb7c58a8c9..7ca29bb2fdbec6198acfcd57b87b0554e5221643 100644 (file)
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,25 +12,8 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "commands/cmd_modules.h"
 
-char* itab[] = {
-       "OnUserConnect", "OnUserQuit", "OnUserDisconnect", "OnUserJoin", "OnUserPart", "OnRehash", "OnServerRaw",
-       "OnUserPreJoin", "OnUserPreKick", "OnUserKick", "OnOper", "OnInfo", "OnWhois", "OnUserPreInvite",
-       "OnUserInvite", "OnUserPreMessage", "OnUserPreNotice", "OnUserPreNick", "OnUserMessage", "OnUserNotice", "OnMode",
-       "OnGetServerDescription", "OnSyncUser", "OnSyncChannel", "OnSyncChannelMetaData", "OnSyncUserMetaData",
-       "OnDecodeMetaData", "ProtoSendMode", "ProtoSendMetaData", "OnWallops", "OnChangeHost", "OnChangeName", "OnAddGLine",
-       "OnAddZLine", "OnAddQLine", "OnAddKLine", "OnAddELine", "OnDelGLine", "OnDelZLine", "OnDelKLine", "OnDelELine", "OnDelQLine",
-       "OnCleanup", "OnUserPostNick", "OnAccessCheck", "On005Numeric", "OnKill", "OnRemoteKill", "OnLoadModule", "OnUnloadModule",
-       "OnBackgroundTimer", "OnSendList", "OnPreCommand", "OnCheckReady", "OnUserRegister", "OnCheckInvite",
-       "OnCheckKey", "OnCheckLimit", "OnCheckBan", "OnStats", "OnChangeLocalUserHost", "OnChangeLocalUserGecos", "OnLocalTopicChange",
-       "OnPostLocalTopicChange", "OnEvent", "OnRequest", "OnOperCompre", "OnGlobalOper", "OnPostConnect", "OnAddBan", "OnDelBan",
-       "OnRawSocketAccept", "OnRawSocketClose", "OnRawSocketWrite", "OnRawSocketRead", "OnChangeLocalUserGECOS", "OnUserRegister",
-       "OnOperCompare", "OnChannelDelete", "OnPostOper", "OnSyncOtherMetaData", "OnSetAway", "OnCancelAway", "OnNamesList",
-       "OnPostCommand", "OnPostJoin", "OnWhoisLine", "OnBuildExemptList", "OnRawSocketConnect", "OnGarbageCollect", NULL
-};
-
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
        return new CommandModules(Instance);
@@ -38,35 +21,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MODULES
  */
-CmdResult CommandModules::Handle (const char**, int, User *user)
-{/* XXX FIXME
-       for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++)
+CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
+{
+       std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
+
+       for (unsigned int i = 0; i < module_names.size(); i++)
        {
-               Version V = ServerInstance->Modules->modules[i]->GetVersion();
-               char modulename[MAXBUF];
-               char flagstate[MAXBUF];
-               *flagstate = 0;
-               if (V.Flags & VF_STATIC)
-                       strlcat(flagstate,", static",MAXBUF);
-               if (V.Flags & VF_VENDOR)
-                       strlcat(flagstate,", vendor",MAXBUF);
-               if (V.Flags & VF_COMMON)
-                       strlcat(flagstate,", common",MAXBUF);
-               if (V.Flags & VF_SERVICEPROVIDER)
-                       strlcat(flagstate,", service provider",MAXBUF);
-               if (!flagstate[0])
-                       strcpy(flagstate,"  <no flags>");
-               strlcpy(modulename,ServerInstance->Config->module_names[i].c_str(),256);
-               if (IS_OPER(user))
+               Module* m = ServerInstance->Modules->Find(module_names[i]);
+               Version V = m->GetVersion();
+
+               if (user->HasPrivPermission("servers/auspex"))
                {
-                       user->WriteServ("900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,ServerInstance->Modules->modules[i],V.Major,V.Minor,V.Revision,V.Build,ServerConfig::CleanFilename(modulename),flagstate+2);
+                       std::string flags("Svsc");
+                       int pos = 0;
+                       for (int mult = 1; mult <= VF_SERVICEPROVIDER; mult *= 2, ++pos)
+                               if (!(V.Flags & mult))
+                                       flags[pos] = '-';
+
+                       user->WriteNumeric(702, "%s :0x%08lx %s %s :%s", user->nick.c_str(), (unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
                }
                else
                {
-                       user->WriteServ("900 %s :%s",user->nick,ServerConfig::CleanFilename(modulename));
+                       user->WriteNumeric(702, "%s :%s",user->nick.c_str(), module_names[i].c_str());
                }
        }
-       user->WriteServ("901 %s :End of MODULES list",user->nick);
-       */
+       user->WriteNumeric(703, "%s :End of MODULES list",user->nick.c_str());
+
        return CMD_SUCCESS;
 }