Change includes, use --libs_r rather than mysql_config --libs, we want re-enterant...

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

diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index cb3ab20ac1e24cff3163ca705b3cefc2a133352d..dbf7efee475ba91eaf44d78196a55c984f68c1f6 100644 (file)
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -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
@@ -14,53 +14,27 @@
  * ---------------------------------------------------
  */
 
-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"
+#include "wildcard.h"
+#include "commands/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];
 
 char* itab[] = {
        "OnUserConnect", "OnUserQuit", "OnUserDisconnect", "OnUserJoin", "OnUserPart", "OnRehash", "OnServerRaw",
@@ -74,10 +48,10 @@ 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++)
        {
@@ -96,7 +70,7 @@ void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
                if (!flagstate[0])
                        strcpy(flagstate,"  <no flags>");
                strlcpy(modulename,Config->module_names[i].c_str(),256);
-               if (strchr(user->modes,'o'))
+               if (*user->oper)
                {
                        if ((pcnt >= 2) && (!strcasecmp(parameters[0],"debug")))
                        {
@@ -112,8 +86,11 @@ void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
                                                {
                                                        if (itab[it])
                                                        {
-                                                               snprintf(data,MAXBUF,"%s=>%c ",itab[it],(Config->implement_lists[i][it] ? '1' : '0'));
-                                                               strncat(dlist,data,MAXBUF);
+                                                               if (Config->implement_lists[i][it])
+                                                               {
+                                                                       snprintf(data,MAXBUF,"%s=>%c ",itab[it],(Config->implement_lists[i][it] ? '1' : '0'));
+                                                                       strncat(dlist,data,MAXBUF);
+                                                               }
                                                                it++;
                                                        }
                                                }
@@ -123,7 +100,8 @@ void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
                                        WriteServ(user->fd,"900 %s :=== DEBUG: Implementation counts ===",user->nick);
                                        for (int it = 0; itab[it]; it++)
                                        {
-                                               WriteServ(user->fd,"900 %s :%s: %d times",user->nick, itab[it],(int)Config->global_implementation[it]);
+                                               if (Config->global_implementation[it])
+                                                       WriteServ(user->fd,"900 %s :%s: %d times",user->nick, itab[it],(int)Config->global_implementation[it]);
                                        }
                                }
                        }
@@ -139,5 +117,3 @@ void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
        }
        WriteServ(user->fd,"901 %s :End of MODULES list",user->nick);
 }
-
-