X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=a1ae48b7026acd7618c27b8738f5ca764b4b00ef;hb=9a2481ebf1109adc4b626414108d92674793cd5d;hp=dd2b32e7b7c02e9f81c8956a38ba27a81d2576e2;hpb=959c67db271b593d32db022841d0723654a8dd67;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index dd2b32e7b..a1ae48b70 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
@@ -11,10 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
+#include "m_cap.h"
 
 static const char* dummy = "ON";
 
@@ -25,17 +23,21 @@ class ModuleNamesX : public Module
  public:
 	
 	ModuleNamesX(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
+		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnUserList, I_On005Numeric, I_OnEvent };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
-	void Implements(char* List)
+
+	virtual ~ModuleNamesX()
 	{
-		List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
 	}
 
-	virtual ~ModuleNamesX()
+	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");
 	}
 
 	virtual Version GetVersion()
@@ -43,12 +45,12 @@ class ModuleNamesX : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 
-        virtual void On005Numeric(std::string &output)
+	virtual void On005Numeric(std::string &output)
 	{
 		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,
@@ -67,13 +69,13 @@ class ModuleNamesX : public Module
 		return 0;
 	}
 
-	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+	virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
 	{
 		if (user->GetExt("NAMESX"))
 		{
 			char list[MAXBUF];
 			size_t dlen, curlen;
-			dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
+			dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
 			int numusers = 0;
 			char* ptr = list + dlen;
 
@@ -100,7 +102,7 @@ class ModuleNamesX : public Module
 					/* 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);
+					dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
 					ptr = list + dlen;
 					ptrlen = 0;
 					numusers = 0;
@@ -116,29 +118,44 @@ class ModuleNamesX : public Module
 		}
 		return 0;		
  	}
-};
 
-
-class ModuleNamesXFactory : public ModuleFactory
-{
- public:
-	ModuleNamesXFactory()
+	virtual void OnEvent(Event *ev)
 	{
-	}
+		if (ev->GetEventID() == "cap_req")
+		{
+			CapData *data = (CapData *) ev->GetData();
 
-	~ModuleNamesXFactory()
-	{
-	}
+			std::vector<std::string>::iterator it;
+			if ((it = std::find(data->wanted.begin(), data->wanted.end(), "multi-prefix")) != data->wanted.end())
+			{
+				// we can handle this, so ACK it, and remove it from the wanted list
+				data->wanted.erase(it);
+				data->ack.push_back(*it);
+				data->user->Extend("NAMESX",dummy);
+			}
+		}
 
-		virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNamesX(Me);
-	}
-};
+		if (ev->GetEventID() == "cap_ls")
+		{
+			CapData *data = (CapData *) ev->GetData();
+			data->wanted.push_back("multi-prefix");
+		}
 
+		if (ev->GetEventID() == "cap_list")
+		{
+			CapData *data = (CapData *) ev->GetData();
 
-extern "C" void * init_module( void )
-{
-	return new ModuleNamesXFactory;
-}
+			if (data->user->GetExt("NAMESX"))
+				data->ack.push_back("multi-prefix");
+		}
+
+		if (ev->GetEventID() == "cap_clear")
+		{
+			CapData *data = (CapData *) ev->GetData();
+			data->ack.push_back("-multi-prefix");
+			data->user->Shrink("NAMESX");
+		}
+	}
+};
 
+MODULE_INIT(ModuleNamesX)