Remove next_call garbage.. It didn't really do much more than obfuscate things. InspI...

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

diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index 7d27009339d7b79d898dd699f054566bdb2624ba..fd86254e560278c695c4b75746d274a6c46982e9 100644 (file)
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_modules.h"
 
@@ -34,18 +31,18 @@ char* itab[] = {
        "OnPostCommand", "OnPostJoin", "OnWhoisLine", "OnBuildExemptList", "OnRawSocketConnect", "OnGarbageCollect", NULL
 };
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
        return new cmd_modules(Instance);
 }
 
 /** Handle /MODULES
  */
-CmdResult cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_modules::Handle (const char** parameters, int pcnt, User *user)
 {
        for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++)
        {
-               Version V = ServerInstance->modules[i]->GetVersion();
+               Version V = ServerInstance->Modules->modules[i]->GetVersion();
                char modulename[MAXBUF];
                char flagstate[MAXBUF];
                *flagstate = 0;
@@ -60,45 +57,9 @@ CmdResult cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
                if (!flagstate[0])
                        strcpy(flagstate,"  <no flags>");
                strlcpy(modulename,ServerInstance->Config->module_names[i].c_str(),256);
-               if (*user->oper)
+               if (IS_OPER(user))
                {
-                       if ((pcnt >= 2) && (!strcasecmp(parameters[0],"debug")))
-                       {
-                               if (match(ServerInstance->Config->module_names[i].c_str(),parameters[1]))
-                               {
-                                       user->WriteServ("900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,ServerInstance->modules[i],V.Major,V.Minor,V.Revision,V.Build,ServerConfig::CleanFilename(modulename),flagstate+2);
-                                       for (int it = 0; itab[it];)
-                                       {
-                                               char data[MAXBUF];
-                                               char dlist[MAXBUF];
-                                               *dlist = 0;
-                                               for (int v = 0; v < 4; v++)
-                                               {
-                                                       if (itab[it])
-                                                       {
-                                                               if (ServerInstance->Config->implement_lists[i][it])
-                                                               {
-                                                                       snprintf(data,MAXBUF,"%s=>%c ",itab[it],(ServerInstance->Config->implement_lists[i][it] ? '1' : '0'));
-                                                                       strlcat(dlist,data,MAXBUF);
-                                                               }
-                                                               it++;
-                                                       }
-                                               }
-                                               if (*dlist)
-                                                       user->WriteServ("900 %s :%s [ %s]",user->nick,ServerConfig::CleanFilename(modulename),dlist);
-                                       }
-                                       user->WriteServ("900 %s :=== DEBUG: Implementation counts ===",user->nick);
-                                       for (int it = 0; itab[it]; it++)
-                                       {
-                                               if (ServerInstance->Config->global_implementation[it])
-                                                       user->WriteServ("900 %s :%s: %d times",user->nick, itab[it],(int)ServerInstance->Config->global_implementation[it]);
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               user->WriteServ("900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,ServerInstance->modules[i],V.Major,V.Minor,V.Revision,V.Build,ServerConfig::CleanFilename(modulename),flagstate+2);
-                       }
+                       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);
                }
                else
                {