FindNick, FindChan, ChanModes, UserList, CountInvisible, PurgeEmptyChannels, GetClass...

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

diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 5bd7c823565bbd79d0b98b2c108325318dc8d439..0ce00e4ba4c44139ae1f702d3dcec7885c3ae3da 100644 (file)
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.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,81 +14,40 @@
  * ---------------------------------------------------
  */
 
-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_names.h"
+#include "commands/cmd_names.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_names::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
 {
        chanrec* c;
 
        if (!pcnt)
        {
-               WriteServ(user->fd,"366 %s * :End of /NAMES list.",user->nick);
+               user->WriteServ("366 %s * :End of /NAMES list.",user->nick);
                return;
        }
 
-       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
-       c = FindChan(parameters[0]);
+
+       c = ServerInstance->FindChan(parameters[0]);
        if (c)
        {
-                if (((c) && (!has_channel(user,c))) && (c->binarymodes & CM_SECRET))
-                {
-                      WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name);
-                      return;
-                }
-               userlist(user,c);
-               WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
+               if ((c->modes[CM_SECRET]) && (!c->HasUser(user)))
+               {
+                     user->WriteServ("401 %s %s :No such nick/channel",user->nick, c->name);
+                     return;
+               }
+               c->UserList(user);
+               user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, c->name);
        }
        else
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
        }
 }
-
-