Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / modules / m_check.cpp

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 964a8c0756268a90128324bf0ae2512316ce9535..e3de633254728e10f3a43a75b5ae8913e77e786a 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -20,9 +20,9 @@
 class CommandCheck : public Command
 {
  public:
-       CommandCheck (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"CHECK", "o", 1)
+       CommandCheck(Module* parent) : Command(parent,"CHECK", 1)
        {
-               syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
+               flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
        }
 
        std::string timestring(time_t time)
@@ -41,7 +41,7 @@ class CommandCheck : public Command
                        ExtensionItem* item = Extensible::GetItem(i->first);
                        std::string value;
                        if (item)
-                               value = item->serialize(creator, ext, i->second);
+                               value = item->serialize(FORMAT_USER, ext, i->second);
                        if (value.empty())
                                dumpkeys << " " << i->first;
                        else
@@ -115,7 +115,12 @@ class CommandCheck : public Command
                        else
                                ServerInstance->DumpText(user, checkstr + " onip " + targuser->GetIPString());
 
-                       chliststr = targuser->ChannelList(targuser);
+                       for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
+                       {
+                               Channel* c = *i;
+                               chliststr.append(c->GetPrefixChar(targuser)).append(c->name).append(" ");
+                       }
+
                        std::stringstream dump(chliststr);
 
                        ServerInstance->DumpText(user,checkstr + " onchans", dump);
@@ -140,10 +145,10 @@ class CommandCheck : public Command
 
                        /* now the ugly bit, spool current members of a channel. :| */
 
-                       CUList *ulist= targchan->GetUsers();
+                       const UserMembList *ulist= targchan->GetUsers();
 
                        /* note that unlike /names, we do NOT check +i vs in the channel */
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+                       for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                        {
                                char tmpbuf[MAXBUF];
                                /*
@@ -198,7 +203,7 @@ class ModuleCheck : public Module
  private:
        CommandCheck mycommand;
  public:
-       ModuleCheck(InspIRCd* Me) : Module(Me), mycommand(Me, this)
+       ModuleCheck() : mycommand(this)
        {
                ServerInstance->AddCommand(&mycommand);
        }
@@ -211,17 +216,6 @@ class ModuleCheck : public Module
        {
                return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON);
        }
-
-       std::string ProtoTranslate(Extensible* item)
-       {
-               User* u = dynamic_cast<User*>(item);
-               Channel* c = dynamic_cast<Channel*>(item);
-               if (u)
-                       return u->nick;
-               if (c)
-                       return c->name;
-               return "?";
-       }
 };
 
 MODULE_INIT(ModuleCheck)