Remove the char junk here, use an std::string

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

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index aa4d3de3e41a867efc1bd50a4d29f76103efdf06..363ba611cf833cea6017dc111f2280ac41702bc6 100644 (file)
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -2,92 +2,62 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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_userhost.h"
+#include "inspircd.h"
+#include "commands/cmd_userhost.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];
 
-void cmd_userhost::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
 {
-       char Return[MAXBUF],junk[MAXBUF];
-       snprintf(Return,MAXBUF,"302 %s :",user->nick);
+       return new cmd_userhost(Instance);
+}
+
+CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, userrec *user)
+{
+       std::string retbuf = std::string("302 ") + user->nick + " :";
+
        
        for (int i = 0; i < pcnt; i++)
        {
-               userrec *u = Find(parameters[i]);
-               if(u)
+               userrec *u = ServerInstance->FindNick(parameters[i]);
+
+               if ((u) && (u->registered == REG_ALL))
                {
-                       if(*u->oper)
-                               if(*user->oper)
-                                       snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->host);
-                               else
-                                       snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->dhost);
+                       retbuf = retbuf + " ";
+
+                       if (*u->oper)
+                       {
+                               retbuf = retbuf + "*=+";
+                       }
                        else
-                               if(*user->oper)
-                                       snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->host);
-                               else
-                                       snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->dhost);
+                       {
+                               retbuf = retbuf + "=+";
+                       }
 
-                       strlcat(Return,junk,MAXBUF);
+                       retbuf = retbuf + u->ident + "@";
+
+                       if (*user->oper)
+                       {
+                               retbuf = retbuf + u->host;
+                       }
+                       else
+                       {
+                               retbuf = retbuf + u->dhost;
+                       }
                }
        }
-       WriteServ(user->fd,Return);
-}
-
 
+       user->WriteServ(retbuf);
 
+       return CMD_SUCCESS;
+}