Spotted problem: must clear out all prefixes attached to a user when they quit or...

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

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 7b17cfa7753fb4dbe8a9a047676cdf5d714712eb..ab9ca083dcf6cbb2964abd8e9ea1bf4868139b0f 100644 (file)
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -14,45 +14,29 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include "users.h"
 #include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "message.h"
 #include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_list.h"
-
-extern chan_hash chanlist;
+#include "inspircd.h"
+#include "commands/cmd_list.h"
+#include "wildcard.h"
 
-void cmd_list::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       WriteServ(user->fd,"321 %s Channel :Users Name",user->nick);
-       for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
+       user->WriteServ("321 %s Channel :Users Name",user->nick);
+       for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
        {
+               // attempt to match a glob pattern
+               if (pcnt && !match(i->second->name, parameters[0]))
+                       continue;
                // if the channel is not private/secret, OR the user is on the channel anyway
-               if (((!(i->second->binarymodes & CM_PRIVATE)) && (!(i->second->binarymodes & CM_SECRET))) || (i->second->HasUser(user)))
+               bool n = i->second->HasUser(user);
+               if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n))
                {
-                       WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,usercount_i(i->second),chanmodes(i->second,i->second->HasUser(user)),i->second->topic);
+                       long users = i->second->GetUserCounter();
+                       if (users)
+                               user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
                }
        }
-       WriteServ(user->fd,"323 %s :End of channel list.",user->nick);
+       user->WriteServ("323 %s :End of channel list.",user->nick);
 }
-
-
-