X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_modules.cpp;h=dbf7efee475ba91eaf44d78196a55c984f68c1f6;hb=221934729eba613b1a845771a0a6aabf3eb6390c;hp=460290edcf41a1fd8ffaa37a046e3f6f040989f2;hpb=a8aace58064fe3552b905567e4eab0bd4d4aba14;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index 460290edc..dbf7efee4 100644
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -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[MAX_DESCRIPTORS];
 
 char* itab[] = {
 	"OnUserConnect", "OnUserQuit", "OnUserDisconnect", "OnUserJoin", "OnUserPart", "OnRehash", "OnServerRaw",
@@ -77,7 +51,7 @@ char* itab[] = {
 	"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")))
 			{
@@ -143,5 +117,3 @@ void cmd_modules::Handle (char **parameters, int pcnt, userrec *user)
 	}
 	WriteServ(user->fd,"901 %s :End of MODULES list",user->nick);
 }
-
-