X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=8aa15f965e297f8481ee6e6f60068ebdd0124c17;hb=be36d92f3dcb0ac3772daebff43a5ecfe0a2d364;hp=90c55e64826ed58ef2cf522608e8aee1ba1df9fa;hpb=fe3799248f7d4cf50b1ba704615d5952dede8917;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 90c55e648..8aa15f965 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -1,27 +1,20 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *   E-mail:
- *	<brain@chatspike.net>
- *	<Craig@chatspike.net>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "commands.h"
 #include "inspircd.h"
-#include <vector>
 
 static const char* dummy = "ON";
 
@@ -47,7 +40,7 @@ class ModuleNamesX : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 
         virtual void On005Numeric(std::string &output)
@@ -55,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)
+        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,
@@ -67,7 +60,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;
 			}
@@ -77,10 +69,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);
@@ -101,8 +91,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;
@@ -113,15 +102,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;		
  	}
 };