No idea why this wasn't using MODULE_INIT. Thanks Om.

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

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index db8270cb9a6380f02959010c47653aa19e94d106..e97ec8e1b74bda3a761c7ddb902298981656e2c5 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 static const char* dummy = "ON";
@@ -25,7 +22,7 @@ class ModuleNamesX : public Module
  public:
        
        ModuleNamesX(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
        }
 
@@ -49,12 +46,12 @@ class ModuleNamesX : public Module
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 
-        virtual void On005Numeric(std::string &output)
+       virtual void On005Numeric(std::string &output)
        {
                output.append(" NAMESX");
        }
 
-        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
        {
                irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
@@ -79,7 +76,7 @@ class ModuleNamesX : public Module
                {
                        char list[MAXBUF];
                        size_t dlen, curlen;
-                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
+                       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
                        int numusers = 0;
                        char* ptr = list + dlen;
 
@@ -106,7 +103,7 @@ class ModuleNamesX : public Module
                                        /* list overflowed into multiple numerics */
                                        user->WriteServ(std::string(list));
                                        /* reset our lengths */
-                                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
+                                       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
                                        ptr = list + dlen;
                                        ptrlen = 0;
                                        numusers = 0;
@@ -124,27 +121,4 @@ class ModuleNamesX : public Module
        }
 };
 
-
-class ModuleNamesXFactory : public ModuleFactory
-{
- public:
-       ModuleNamesXFactory()
-       {
-       }
-
-       ~ModuleNamesXFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleNamesX(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNamesXFactory;
-}
-
+MODULE_INIT(ModuleNamesX)