fix some unitialised vectors and tidy up a bit.

[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 b56ed5229c84f6fc947f1b30a514f1e3120163f9..3733d1b351a16e7144b888e0ad4b73ea41752e23 100644 (file)
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -12,8 +12,7 @@
  */
 
 #include "inspircd.h"
-
-static const char* dummy = "ON";
+#include "m_cap.h"
 
 /* $ModDesc: Provides the UHNAMES facility. */
 
@@ -25,8 +24,8 @@ class ModuleUHNames : public Module
        ModuleUHNames(InspIRCd* Me)
                : Module(Me)
        {
-               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnEvent, I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
        virtual ~ModuleUHNames()
@@ -41,7 +40,7 @@ class ModuleUHNames : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
 
        virtual void On005Numeric(std::string &output)
@@ -49,7 +48,7 @@ class ModuleUHNames : public Module
                output.append(" UHNAMES");
        }
 
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *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,
@@ -59,9 +58,9 @@ class ModuleUHNames : public Module
                 */
                if (c == "PROTOCTL")
                {
-                       if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))
+                       if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"UHNAMES")))
                        {
-                               user->Extend("UHNAMES",dummy);
+                               user->Extend("UHNAMES");
                                return 1;
                        }
                }
@@ -78,6 +77,11 @@ class ModuleUHNames : public Module
 
                nick = user->GetFullHost();
        }
+
+       virtual void OnEvent(Event* ev)
+       {
+               GenericCapHandler(ev, "UHNAMES", "userhost-in-names");
+       }
 };
 
 MODULE_INIT(ModuleUHNames)