More tweaks

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

diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index 7948c0fb9f17fc19ecc1240e4244f8c5a6fb5959..af8c3e9abdd5b0a6d9c138c1ce2dde34dec166f5 100644 (file)
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -27,14 +27,11 @@
 #include "users.h"
 #include "modules.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "wildcard.h"
 #include "commands/cmd_modules.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+
 
 char* itab[] = {
        "OnUserConnect", "OnUserQuit", "OnUserDisconnect", "OnUserJoin", "OnUserPart", "OnRehash", "OnServerRaw",
@@ -55,7 +52,7 @@ void cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
 {
        for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++)
        {
-               Version V = modules[i]->GetVersion();
+               Version V = ServerInstance->modules[i]->GetVersion();
                char modulename[MAXBUF];
                char flagstate[MAXBUF];
                *flagstate = 0;
@@ -76,7 +73,7 @@ void cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
                        {
                                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,modules[i],V.Major,V.Minor,V.Revision,V.Build,CleanFilename(modulename),flagstate+2);
+                                       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];
@@ -95,7 +92,7 @@ void cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
                                                        }
                                                }
                                                if (*dlist)
-                                                       user->WriteServ("900 %s :%s [ %s]",user->nick,CleanFilename(modulename),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++)
@@ -107,12 +104,12 @@ void cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        else
                        {
-                               user->WriteServ("900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,modules[i],V.Major,V.Minor,V.Revision,V.Build,CleanFilename(modulename),flagstate+2);
+                               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);
                        }
                }
                else
                {
-                       user->WriteServ("900 %s :%s",user->nick,CleanFilename(modulename));
+                       user->WriteServ("900 %s :%s",user->nick,ServerConfig::CleanFilename(modulename));
                }
        }
        user->WriteServ("901 %s :End of MODULES list",user->nick);