X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_modules.cpp;h=e4e208f7db45177ea93ef22bdf7eb9ceac13f869;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=75c730052c30e2fcf037f8181973cae14434c971;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index 75c730052..e4e208f7d 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 "wildcard.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[MAX_DESCRIPTORS];
 
 char* itab[] = {
 	"OnUserConnect", "OnUserQuit", "OnUserDisconnect", "OnUserJoin", "OnUserPart", "OnRehash", "OnServerRaw",
@@ -74,7 +48,7 @@ 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)
@@ -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);
 }
-
-