Windows support. Tested and working to compile on freebsd and linux. Next step is...

[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 180a989c950eeed9414e4cc9e7c2f8a69f97a764..d12513af906bc98526e401f45cdb0f7a20b37623 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -2,44 +2,35 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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;
@@ -71,17 +62,21 @@ class cmd_check : public command_t
                        user->WriteServ(checkstr + " realnuh " + targuser->GetFullRealHost());
                        user->WriteServ(checkstr + " realname " + targuser->fullname);
                        user->WriteServ(checkstr + " modes +" + targuser->FormatModes());
+                       user->WriteServ(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
                        user->WriteServ(checkstr + " server " + targuser->server);
-                       if (targuser->awaymsg[0] != 0)
+
+                       if (IS_AWAY(targuser))
                        {
                                /* user is away */
                                user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg);
                        }
-                       if (targuser->oper[0] != 0)
+
+                       if (IS_OPER(targuser))
                        {
                                /* user is an oper of type ____ */
-                               user->WriteServ(checkstr + " opertype " + targuser->oper);
+                               user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper));
                        }
+
                        if (IS_LOCAL(targuser))
                        {
                                /* port information is only held for a local user! */
@@ -91,7 +86,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 +118,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->first->GlobalCloneCount(), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname);
+                               user->WriteServ(checkstr + " member " + tmpbuf);
                        }
                }
                else
@@ -160,7 +132,7 @@ class cmd_check : public command_t
                        long x = 0;
 
                        /* hostname or other */
-                       for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
+                       for (user_hash::const_iterator a = ServerInstance->clientlist->begin(); a != ServerInstance->clientlist->end(); a++)
                        {
                                if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
                                {
@@ -168,7 +140,7 @@ class cmd_check : public command_t
                                        user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
                                }
                                /* IP address */
-                               else if (match(a->second->GetIPString(), parameters[0]))
+                               else if (match(a->second->GetIPString(), parameters[0], true))
                                {
                                        /* same IP. */
                                        user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
@@ -179,6 +151,8 @@ class cmd_check : public command_t
                }
 
                user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+
+               return CMD_LOCALONLY;
        }
 };
 
@@ -188,11 +162,11 @@ class ModuleCheck : public Module
  private:
        cmd_check *mycommand;
  public:
-       ModuleCheck(Server* Me) : Module::Module(Me)
+       ModuleCheck(InspIRCd* Me) : Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_check();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_check(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleCheck()
@@ -201,7 +175,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)
@@ -224,14 +198,14 @@ class ModuleCheckFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleCheck(Me);
        }
        
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleCheckFactory;
 }