X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=27bef92f5a9e1ba27ad02dc9bfc70b39a467a90b;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=267c8f468fbcc789388d28e92a455d8391c1ef82;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 267c8f468..27bef92f5 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -53,7 +53,7 @@ class ModuleNamesX : public Module
 		output.append(" NAMESX");
 	}
 
-        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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,
@@ -65,7 +65,6 @@ class ModuleNamesX : public Module
 		{
 			if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
 			{
-				ServerInstance->Log(DEBUG,"Setting this user as NAMESX capable");
 				user->Extend("NAMESX",dummy);
 				return 1;
 			}
@@ -75,10 +74,8 @@ class ModuleNamesX : public Module
 
 	virtual int OnUserList(userrec* user, chanrec* Ptr)
 	{
-		ServerInstance->Log(DEBUG,"NAMESX called for %s %s",user->nick,Ptr->name);
 		if (user->GetExt("NAMESX"))
 		{
-			ServerInstance->Log(DEBUG,"Using NAMESX user list code");
 			char list[MAXBUF];
 			size_t dlen, curlen;
 			dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
@@ -99,8 +96,7 @@ class ModuleNamesX : public Module
 				if (curlen > (480-NICKMAX))
 				{
 					/* list overflowed into multiple numerics */
-					ServerInstance->Log(DEBUG,"Send list 1");
-					user->WriteServ(list);
+					user->WriteServ(std::string(list));
 					/* reset our lengths */
 					dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
 					ptr = list + dlen;
@@ -111,15 +107,11 @@ class ModuleNamesX : public Module
 			/* if whats left in the list isnt empty, send it */
 			if (numusers)
 			{
-				ServerInstance->Log(DEBUG,"Send list 2");
-				user->WriteServ(list);
+				user->WriteServ(std::string(list));
 			}
 			user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-			ServerInstance->Log(DEBUG,"Returning 1");
 			return 1;
 		}
-
-		ServerInstance->Log(DEBUG,"Returning 0");
 		return 0;		
  	}
 };