Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index aa190b17b623fb10074dbc8334fda7191b9af339..e365e640571f9ce1aaf51a4680d47757b74a9a1f 100644 (file)
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -14,77 +14,35 @@
  * ---------------------------------------------------
  */
 
-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"
 
-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)
 {
        char Return[MAXBUF],junk[MAXBUF];
        snprintf(Return,MAXBUF,"302 %s :",user->nick);
+       
        for (int i = 0; i < pcnt; i++)
        {
                userrec *u = Find(parameters[i]);
-               if (u)
+               if(u)
                {
-                       if (strchr(u->modes,'o'))
-                       {
-                               snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->host);
-                               strlcat(Return,junk,MAXBUF);
-                       }
+                       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);
                        else
-                       {
-                               snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->host);
-                               strlcat(Return,junk,MAXBUF);
-                       }
+                               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);
+
+                       strlcat(Return,junk,MAXBUF);
                }
        }
        WriteServ(user->fd,Return);
 }
-
-
-