Fix for parameters which contain a colon (which is not the first char in the string)

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

diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 318846d1328775ef828b3fa524483ecadd8c642f..ac8e18270d7e2730d0ab2280809ddd1bb4055a2a 100644 (file)
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -16,12 +16,8 @@
 
 #include "inspircd.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_names.h"
 
-extern InspIRCd* ServerInstance;
-
 void cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
 {
        chanrec* c;
@@ -35,7 +31,7 @@ void cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
 
-       c = FindChan(parameters[0]);
+       c = ServerInstance->FindChan(parameters[0]);
        if (c)
        {
                if ((c->modes[CM_SECRET]) && (!c->HasUser(user)))
@@ -43,7 +39,7 @@ void cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
                      user->WriteServ("401 %s %s :No such nick/channel",user->nick, c->name);
                      return;
                }
-               userlist(user,c);
+               c->UserList(user);
                user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, c->name);
        }
        else