X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_trace.cpp;h=31dc27a2886c4c320375c61a57100c443d0f7b80;hb=ed105d7fef72b5bb5f23e72fae40d6b4ffdcb5b8;hp=e757896ae1541bc18124ab83178e219588176a17;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp
index e757896ae..31dc27a28 100644
--- a/src/cmd_trace.cpp
+++ b/src/cmd_trace.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,77 +14,39 @@
  * ---------------------------------------------------
  */
 
-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 "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_trace.h"
+#include "inspircd.h"
+#include "commands/cmd_trace.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];
 
-void cmd_trace::Handle (char **parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
 {
-	for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+	return new cmd_trace(Instance);
+}
+
+CmdResult cmd_trace::Handle (const char** parameters, int pcnt, userrec *user)
+{
+	for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++)
 	{
 		if (i->second)
 		{
-			if (isnick(i->second->nick))
+			if (ServerInstance->IsNick(i->second->nick))
 			{
-				if (strchr(i->second->modes,'o'))
+				if (*i->second->oper)
 				{
-					WriteServ(user->fd,"205 %s :Oper 0 %s",user->nick,i->second->nick);
+					user->WriteServ("205 %s :Oper 0 %s",user->nick,i->second->nick);
 				}
 				else
 				{
-					WriteServ(user->fd,"204 %s :User 0 %s",user->nick,i->second->nick);
+					user->WriteServ("204 %s :User 0 %s",user->nick,i->second->nick);
 				}
 			}
 			else
 			{
-				WriteServ(user->fd,"203 %s :???? 0 [%s]",user->nick,i->second->host);
+				user->WriteServ("203 %s :???? 0 [%s]",user->nick,i->second->host);
 			}
 		}
 	}
+	return CMD_SUCCESS;
 }
-
-