X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=5fed7f76e5b96610fd17b32769c76a1bdb3b89b3;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=b3741a457d73bf89783633fc22eb572462c2cc73;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index b3741a457..5fed7f76e 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.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
@@ -12,10 +12,9 @@
  */
 
 #include "inspircd.h"
+#include "m_cap.h"
 
-static const char* dummy = "ON";
-
-/* $ModDesc: Provides aliases of commands. */
+/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 class ModuleNamesX : public Module
 {
@@ -24,18 +23,16 @@ class ModuleNamesX : public Module
 	ModuleNamesX(InspIRCd* Me)
 		: Module(Me)
 	{
+		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
-	void Implements(char* List)
-	{
-		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)
+	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
 	{
 		if ((displayable) && (extname == "NAMESX"))
 			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
@@ -51,7 +48,7 @@ class ModuleNamesX : public Module
 		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* 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,
@@ -63,62 +60,29 @@ class ModuleNamesX : public Module
 		{
 			if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
 			{
-				user->Extend("NAMESX",dummy);
+				user->Extend("NAMESX");
 				return 1;
 			}
 		}
 		return 0;
 	}
 
-	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("NAMESX"))
-		{
-			char list[MAXBUF];
-			size_t dlen, curlen;
-			dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
-			int numusers = 0;
-			char* ptr = list + dlen;
+		if (!issuer->GetExt("NAMESX"))
+			return;
 
-			if (!ulist)
-				ulist = Ptr->GetUsers();
+		/* Some module hid this from being displayed, dont bother */
+		if (nick.empty())
+			return;
 
-			bool has_user = Ptr->HasUser(user);
-			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-			{
-				if ((!has_user) && (i->first->IsModeSet('i')))
-					continue;
-
-				if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
-					continue;
+		prefixes = channel->GetAllPrefixChars(user);
+	}
 
-				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++;
-				if (curlen > (480-NICKMAX))
-				{
-					/* list overflowed into multiple numerics */
-					user->WriteServ(std::string(list));
-					/* reset our lengths */
-					dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
-					ptr = list + dlen;
-					ptrlen = 0;
-					numusers = 0;
-				}
-			}
-			/* if whats left in the list isnt empty, send it */
-			if (numusers)
-			{
-				user->WriteServ(std::string(list));
-			}
-			user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-			return 1;
-		}
-		return 0;		
- 	}
+	virtual void OnEvent(Event *ev)
+	{
+		GenericCapHandler(ev, "NAMESX", "multi-prefix");
+	}
 };
 
 MODULE_INIT(ModuleNamesX)