X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=0e0c7813d0521225b828b18135ea93ee18513ab5;hb=caa89fb37c532930805f0b144e3298624ec1adec;hp=a918b4234ca0c1d5c088a48d29f6b4239b7a31cc;hpb=206e3b49c7bfe3e8a7ca972103fe9e30feb3a86a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index a918b4234..0e0c7813d 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,14 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
+#include "m_cap.h"
 
-static const char* dummy = "ON";
-
-/* $ModDesc: Provides aliases of commands. */
+/* $ModDesc: Provides the UHNAMES facility. */
 
 class ModuleUHNames : public Module
 {
@@ -28,18 +24,15 @@ class ModuleUHNames : public Module
 	ModuleUHNames(InspIRCd* Me)
 		: Module(Me)
 	{
-	}
-
-	void Implements(char* List)
-	{
-		List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
+		Implementation eventlist[] = { I_OnEvent, I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
 	virtual ~ModuleUHNames()
 	{
 	}
 
-	void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
 	{
 		if ((displayable) && (extname == "UHNAMES"))
 			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
@@ -47,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)
@@ -55,12 +48,7 @@ class ModuleUHNames : public Module
 		output.append(" UHNAMES");
 	}
 
-	Priority Prioritize()
-	{
-		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* const* parameters, int pcnt, 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,
@@ -72,49 +60,28 @@ class ModuleUHNames : public Module
 		{
 			if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))
 			{
-				user->Extend("UHNAMES",dummy);
+				user->Extend("UHNAMES");
 				return 1;
 			}
 		}
 		return 0;
 	}
 
-	/* IMPORTANT: This must be prioritized above NAMESX! */
-	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+	virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
 	{
-		if (user->GetExt("UHNAMES"))
-		{
-			if (!ulist)
-				ulist = Ptr->GetUsers();
-
-			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-				i->second = i->first->GetFullHost();
-		}
-		return 0;		
- 	}
-};
-
+		if (!issuer->GetExt("UHNAMES"))
+			return;
 
-class ModuleUHNamesFactory : public ModuleFactory
-{
- public:
-	ModuleUHNamesFactory()
-	{
-	}
+		if (nick.empty())
+			return;
 
-	~ModuleUHNamesFactory()
-	{
+		nick = user->GetFullHost();
 	}
 
-		virtual Module * CreateModule(InspIRCd* Me)
+	virtual void OnEvent(Event* ev)
 	{
-		return new ModuleUHNames(Me);
+		GenericCapHandler(ev, "UHNAMES", "userhost-in-names");
 	}
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleUHNamesFactory;
-}
-
+MODULE_INIT(ModuleUHNames)