]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/cmd_modules.cpp
Just to mess with om's head, remove helperfuncs.h from everywhere
[user/henk/code/inspircd.git] / src / cmd_modules.cpp
index 93908d21d3adc7c4f566cff8ee96962a08d54d00..af8c3e9abdd5b0a6d9c138c1ce2dde34dec166f5 100644 (file)
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
 #include <deque>
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include "configreader.h"
+#include "hash_map.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_modules.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
+#include "wildcard.h"
+#include "commands/cmd_modules.h"
+
+
 
 char* itab[] = {
        "OnUserConnect", "OnUserQuit", "OnUserDisconnect", "OnUserJoin", "OnUserPart", "OnRehash", "OnServerRaw",
@@ -74,14 +45,14 @@ char* itab[] = {
        "OnCheckKey", "OnCheckLimit", "OnCheckBan", "OnStats", "OnChangeLocalUserHost", "OnChangeLocalUserGecos", "OnLocalTopicChange",
        "OnPostLocalTopicChange", "OnEvent", "OnRequest", "OnOperCompre", "OnGlobalOper", "OnGlobalConnect", "OnAddBan", "OnDelBan",
        "OnRawSocketAccept", "OnRawSocketClose", "OnRawSocketWrite", "OnRawSocketRead", "OnChangeLocalUserGECOS", "OnUserRegister",
-       "OnOperCompare", NULL
+       "OnOperCompare", "OnChannelDelete", "OnPostOper", "OnSyncOtherMetaData", "OnSetAway", "OnCancelAway", NULL
 };
 
-void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       for (unsigned int i = 0; i < Config->module_names.size(); i++)
+       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;
@@ -95,14 +66,14 @@ void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
                        strlcat(flagstate,", service provider",MAXBUF);
                if (!flagstate[0])
                        strcpy(flagstate,"  <no flags>");
-               strlcpy(modulename,Config->module_names[i].c_str(),256);
-               if (strchr(user->modes,'o'))
+               strlcpy(modulename,ServerInstance->Config->module_names[i].c_str(),256);
+               if (*user->oper)
                {
                        if ((pcnt >= 2) && (!strcasecmp(parameters[0],"debug")))
                        {
-                               if (match(Config->module_names[i].c_str(),parameters[1]))
+                               if (match(ServerInstance->Config->module_names[i].c_str(),parameters[1]))
                                {
-                                       WriteServ(user->fd,"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];
@@ -112,36 +83,34 @@ void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
                                                {
                                                        if (itab[it])
                                                        {
-                                                               if (Config->implement_lists[i][it])
+                                                               if (ServerInstance->Config->implement_lists[i][it])
                                                                {
-                                                                       snprintf(data,MAXBUF,"%s=>%c ",itab[it],(Config->implement_lists[i][it] ? '1' : '0'));
+                                                                       snprintf(data,MAXBUF,"%s=>%c ",itab[it],(ServerInstance->Config->implement_lists[i][it] ? '1' : '0'));
                                                                        strncat(dlist,data,MAXBUF);
                                                                }
                                                                it++;
                                                        }
                                                }
                                                if (*dlist)
-                                                       WriteServ(user->fd,"900 %s :%s [ %s]",user->nick,CleanFilename(modulename),dlist);
+                                                       user->WriteServ("900 %s :%s [ %s]",user->nick,ServerConfig::CleanFilename(modulename),dlist);
                                        }
-                                       WriteServ(user->fd,"900 %s :=== DEBUG: Implementation counts ===",user->nick);
+                                       user->WriteServ("900 %s :=== DEBUG: Implementation counts ===",user->nick);
                                        for (int it = 0; itab[it]; it++)
                                        {
-                                               if (Config->global_implementation[it])
-                                                       WriteServ(user->fd,"900 %s :%s: %d times",user->nick, itab[it],(int)Config->global_implementation[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
                        {
-                               WriteServ(user->fd,"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
                {
-                       WriteServ(user->fd,"900 %s :%s",user->nick,CleanFilename(modulename));
+                       user->WriteServ("900 %s :%s",user->nick,ServerConfig::CleanFilename(modulename));
                }
        }
-       WriteServ(user->fd,"901 %s :End of MODULES list",user->nick);
+       user->WriteServ("901 %s :End of MODULES list",user->nick);
 }
-
-