X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=3bcfdd2dd84796a757495947ad4df411d766df3d;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=9f7afbdd7c1d239a59ca369c1c84f6eeac48fd50;hpb=fb6ae5de3a9b3dab30c87df69141448f69ab3ee0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 9f7afbdd7..3bcfdd2dd 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 static const char* dummy = "ON";
 
@@ -26,25 +26,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 +60,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,
@@ -78,10 +84,11 @@ class ModuleUHNames : public Module
 	{
 		if (user->GetExt("UHNAMES"))
 		{
-			nl.clear();
+			if (!ulist)
+				ulist = Ptr->GetUsers();
+
 			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-				nl[i->second->GetFullHost()] = i->second;
-			nameslist = &nl;
+				i->second = i->first->GetFullHost();
 		}
 		return 0;		
  	}
@@ -106,7 +113,7 @@ class ModuleUHNamesFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleUHNamesFactory;
 }