When a server sends a SERVER command with <5 params, dont just close the connection...

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

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index ccd6b85b0a68e6bd95078f319050b81d8af72c94..190c8487835477729c28eab755422ebd08d06734 100644 (file)
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 static const char* dummy = "ON";
@@ -26,25 +23,31 @@ class ModuleUHNames : public Module
  public:
        
        ModuleUHNames(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
        }
 
        void Implements(char* List)
        {
-               List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
+               List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
        }
 
        virtual ~ModuleUHNames()
        {
        }
 
+       void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       {
+               if ((displayable) && (extname == "UHNAMES"))
+                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
+       }
+
        virtual Version GetVersion()
        {
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 
-        virtual void On005Numeric(std::string &output)
+       virtual void On005Numeric(std::string &output)
        {
                output.append(" UHNAMES");
        }
@@ -54,7 +57,7 @@ class ModuleUHNames : public Module
                return (Priority)ServerInstance->PriorityBefore("m_namesx.so");
        }
 
-        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,
@@ -81,36 +84,12 @@ class ModuleUHNames : public Module
                        if (!ulist)
                                ulist = Ptr->GetUsers();
 
-                       nl.clear();
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                               nl[i->first] = i->first->GetFullHost();
-                       ulist = &nl;
+                               i->second = i->first->GetFullHost();
                }
                return 0;               
        }
 };
 
-
-class ModuleUHNamesFactory : public ModuleFactory
-{
- public:
-       ModuleUHNamesFactory()
-       {
-       }
-
-       ~ModuleUHNamesFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleUHNames(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleUHNamesFactory;
-}
+MODULE_INIT(ModuleUHNames)