X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=b34b248fdacfc0e57e68d65f2bc9e5da2a7e5c88;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=f0c466f871442860c7e68ffb419553b87064c126;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index f0c466f87..b34b248fd 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -18,37 +18,30 @@
 
 class ModuleUHNames : public Module
 {
-	CUList nl;
  public:
+	GenericCap cap;
 
-	ModuleUHNames(InspIRCd* Me)
-		: Module(Me)
+	ModuleUHNames() : cap(this, "userhost-in-names")
 	{
-		Implementation eventlist[] = { I_OnEvent, I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		Implementation eventlist[] = { I_OnEvent, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
-	virtual ~ModuleUHNames()
+	~ModuleUHNames()
 	{
 	}
 
-	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	Version GetVersion()
 	{
-		if ((displayable) && (extname == "UHNAMES"))
-			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
+		return Version("Provides the UHNAMES facility.",VF_VENDOR);
 	}
 
-	virtual Version GetVersion()
-	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
-	}
-
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
 		output.append(" UHNAMES");
 	}
 
-	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	ModResult 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,
@@ -60,27 +53,27 @@ class ModuleUHNames : public Module
 		{
 			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"UHNAMES")))
 			{
-				user->Extend("UHNAMES");
-				return 1;
+				cap.ext.set(user, 1);
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
 	{
-		if (!issuer->GetExt("UHNAMES"))
+		if (!cap.ext.get(issuer))
 			return;
 
 		if (nick.empty())
 			return;
 
-		nick = user->GetFullHost();
+		nick = memb->user->GetFullHost();
 	}
 
-	virtual void OnEvent(Event* ev)
+	void OnEvent(Event& ev)
 	{
-		GenericCapHandler(ev, "UHNAMES", "userhost-in-names");
+		cap.HandleEvent(ev);
 	}
 };