Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 251faf58a88113f96bb858738d7456df9eda49bc..3a8b8dd92f1b53c53f2dffed8d45ee5997358cfb 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,27 +19,23 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "commands.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
-extern InspIRCd* ServerInstance;
-
-static Server *Srv;
-
+/** Handle /CHECK
+ */
 class cmd_check : public command_t
 {
  public:
-       cmd_check() : command_t("CHECK", 'o', 1)
+       cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1)
        {
                this->source = "m_check.so";
                syntax = "<nickname>|<ip>|<hostmask>|<channel>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec *targuser;
                chanrec *targchan;
@@ -91,7 +87,7 @@ class cmd_check : public command_t
                        chliststr = targuser->ChannelList(targuser);
                        std::stringstream dump(chliststr);
 
-                       Srv->DumpText(user,checkstr + " onchans ", dump);
+                       ServerInstance->DumpText(user,checkstr + " onchans ", dump);
                }
                else if (targchan)
                {
@@ -123,35 +119,12 @@ class cmd_check : public command_t
                        /* note that unlike /names, we do NOT check +i vs in the channel */
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
-                               char list[MAXBUF];
                                char tmpbuf[MAXBUF];
-                               char* ptr = list;
-                               int flags = targchan->GetStatusFlags(i->second);
                                /*
-                                * find how many connections from this user's IP -- unlike Asuka,
-                                * I define a clone as coming from the same host. --w00t
+                                * Unlike Asuka, I define a clone as coming from the same host. --w00t
                                 */
-                               sprintf(ptr, "%lu    ", i->second->GlobalCloneCount());
-                               
-                               if (flags & UCMODE_OP)
-                               {
-                                       strcat(ptr, "@");
-                               }
-                               
-                               if (flags & UCMODE_HOP)
-                               {
-                                       strcat(ptr, "%");
-                               }
-                               
-                               if (flags & UCMODE_VOICE)
-                               {
-                                       strcat(ptr, "+");
-                               }
-                               
-                               sprintf(tmpbuf, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
-                               strcat(ptr, tmpbuf);
-                               
-                               user->WriteServ(checkstr + " member " + ptr);
+                               snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", i->second->GlobalCloneCount(), targchan->GetAllPrefixChars(i->second), i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
+                               user->WriteServ(checkstr + " member " + tmpbuf);
                        }
                }
                else
@@ -179,6 +152,8 @@ class cmd_check : public command_t
                }
 
                user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -191,8 +166,8 @@ class ModuleCheck : public Module
        ModuleCheck(InspIRCd* Me) : Module::Module(Me)
        {
                
-               mycommand = new cmd_check();
-               Srv->AddCommand(mycommand);
+               mycommand = new cmd_check(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleCheck()
@@ -201,7 +176,7 @@ class ModuleCheck : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 
        void Implements(char* List)