X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=b3741a457d73bf89783633fc22eb572462c2cc73;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=5194224b791994ea1ba28ae8a61e6d02f8b1c64a;hpb=6dadb437999760fc10757cf4b9faba4702b1c011;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 5194224b7..b3741a457 100644
--- 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,30 +22,36 @@ class ModuleNamesX : public Module
  public:
 	
 	ModuleNamesX(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 ~ModuleNamesX()
 	{
 	}
 
+	void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	{
+		if ((displayable) && (extname == "NAMESX"))
+			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(" 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,
@@ -83,13 +86,15 @@ class ModuleNamesX : public Module
 			bool has_user = Ptr->HasUser(user);
 			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 			{
-				if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+				if ((!has_user) && (i->first->IsModeSet('i')))
 					continue;
 
-				if (i->second->Visibility && !i->second->Visibility->VisibleTo(user))
+				if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
 					continue;
 
-				size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->second), i->second->nick);
+				size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->first), i->second.c_str());
+				/* OnUserList can change this - reset it back to normal */
+				i->second = i->first->nick;
 				curlen += ptrlen;
 				ptr += ptrlen;
 				numusers++;
@@ -116,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)