Odd bits and bobs to keep the numeric sane if the user is insane (like stskeeps for...

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

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index e5b6c60cd2361c40c7a840027c477bda39973d5c..745e5db15f2c28aa71293e7322818244e817c9e4 100644 (file)
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -18,11 +18,11 @@
 #include "users.h"
 #include "modules.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-extern InspIRCd* ServerInstance;
+
 
 /* get the last 'visible' chan of a user */
 static char *getlastchanname(userrec *u)
@@ -46,6 +46,9 @@ bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_
        bool realhost = false;
        bool realname = false;
 
+       if (user->registered != REG_ALL)
+               return false;
+
        if (opt_realname)
                realname = match(user->fullname, matchtext);
 
@@ -228,7 +231,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
        {
                for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
                        user->WriteServ(*n);
-               user->WriteServ("315 %s %s :End of /WHO list.",user->nick, parameters[0]);
+               user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
        }
        else
        {