X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=30508fab23787acd845e074625b4206277f6b2e8;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=dddf45591dbe2fb8f18755a1834d5488f2ad362a;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index dddf45591..30508fab2 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,51 +12,36 @@
  */
 
 #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
 {
-	CUList nl;
  public:
-	
-	ModuleUHNames(InspIRCd* Me)
-		: Module(Me)
-	{
-		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnUserList, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
-	}
+	GenericCap cap;
 
-
-	virtual ~ModuleUHNames()
+	ModuleUHNames() : cap(this, "userhost-in-names")
 	{
+		Implementation eventlist[] = { I_OnEvent, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
-	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	~ModuleUHNames()
 	{
-		if ((displayable) && (extname == "UHNAMES"))
-			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Provides the UHNAMES facility.",VF_VENDOR);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
 		output.append(" UHNAMES");
 	}
 
-	void Prioritize()
-	{
-		Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
-	}
-
-	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *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,
@@ -66,28 +51,30 @@ 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);
-				return 1;
+				cap.ext.set(user, 1);
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	/* IMPORTANT: This must be prioritized above NAMESX! */
-	virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
+	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
 	{
-		if (user->GetExt("UHNAMES"))
-		{
-			if (!ulist)
-				ulist = Ptr->GetUsers();
+		if (!cap.ext.get(issuer))
+			return;
 
-			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-				i->second = i->first->GetFullHost();
-		}
-		return 0;		
- 	}
+		if (nick.empty())
+			return;
+
+		nick = memb->user->GetFullHost();
+	}
+
+	void OnEvent(Event& ev)
+	{
+		cap.HandleEvent(ev);
+	}
 };
 
 MODULE_INIT(ModuleUHNames)