X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=70036d5a2da2e92b78bfc91530ea95b9749ed298;hb=8085aa879bd989b526791797910295944a364084;hp=b56ed5229c84f6fc947f1b30a514f1e3120163f9;hpb=f6b8a12a8066b60446570729f77084116853fe2e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index b56ed5229..70036d5a2 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,8 +12,7 @@
  */
 
 #include "inspircd.h"
-
-static const char* dummy = "ON";
+#include "m_cap.h"
 
 /* $ModDesc: Provides the UHNAMES facility. */
 
@@ -21,27 +20,27 @@ class ModuleUHNames : public Module
 {
 	CUList nl;
  public:
-	
+
 	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_OnSyncUser, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
 	virtual ~ModuleUHNames()
 	{
 	}
 
-	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	void OnSyncUser(User* user, Module* proto,void* opaque)
 	{
-		if ((displayable) && (extname == "UHNAMES"))
-			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
+		if (proto->ProtoTranslate(NULL) == "?" && user->GetExt("UHNAMES"))
+			proto->ProtoSendMetaData(opaque, user, "UHNAMES", "Enabled");
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",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(std::string &command, 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)