X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=3a8b8dd92f1b53c53f2dffed8d45ee5997358cfb;hb=bcac49dca78631687975771c6d0a76b595171664;hp=8da57d9f28805ef8bda6049ff230f6061e1055d4;hpb=dafc021be4f3ad34ca37953de6a0109a161dd165;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 8da57d9f2..3a8b8dd92 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,28 +19,23 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "message.h"
-#include "commands.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
-extern InspIRCd* ServerInstance;
-
-static Server *Srv;
-
+/** Handle /CHECK
+ */
 class cmd_check : public command_t
 {
  public:
-	cmd_check() : command_t("CHECK", 'o', 1)
+ 	cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1)
 	{
 		this->source = "m_check.so";
 		syntax = "<nickname>|<ip>|<hostmask>|<channel>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		userrec *targuser;
 		chanrec *targchan;
@@ -92,7 +87,7 @@ class cmd_check : public command_t
 			chliststr = targuser->ChannelList(targuser);
 			std::stringstream dump(chliststr);
 
-			Srv->DumpText(user,checkstr + " onchans ", dump);
+			ServerInstance->DumpText(user,checkstr + " onchans ", dump);
 		}
 		else if (targchan)
 		{
@@ -124,35 +119,12 @@ class cmd_check : public command_t
 			/* note that unlike /names, we do NOT check +i vs in the channel */
 			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 			{
-				char list[MAXBUF];
 				char tmpbuf[MAXBUF];
-				char* ptr = list;
-				int flags = targchan->GetStatusFlags(i->second);
 				/*
-				 * find how many connections from this user's IP -- unlike Asuka,
-				 * I define a clone as coming from the same host. --w00t
+				 * Unlike Asuka, I define a clone as coming from the same host. --w00t
 				 */
-				sprintf(ptr, "%lu    ", i->second->GlobalCloneCount());
-				
-				if (flags & UCMODE_OP)
-				{
-					strcat(ptr, "@");
-				}
-				
-				if (flags & UCMODE_HOP)
-				{
-					strcat(ptr, "%");
-				}
-				
-				if (flags & UCMODE_VOICE)
-				{
-					strcat(ptr, "+");
-				}
-				
-				sprintf(tmpbuf, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
-				strcat(ptr, tmpbuf);
-				
-				user->WriteServ(checkstr + " member " + ptr);
+				snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", i->second->GlobalCloneCount(), targchan->GetAllPrefixChars(i->second), i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
+				user->WriteServ(checkstr + " member " + tmpbuf);
 			}
 		}
 		else
@@ -180,6 +152,8 @@ class cmd_check : public command_t
 		}
 
 		user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+
+		return CMD_SUCCESS;
 	}
 };
 
@@ -189,11 +163,11 @@ class ModuleCheck : public Module
  private:
 	cmd_check *mycommand;
  public:
-	ModuleCheck(Server* Me) : Module::Module(Me)
+	ModuleCheck(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_check();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_check(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleCheck()
@@ -202,7 +176,7 @@ class ModuleCheck : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
@@ -225,7 +199,7 @@ class ModuleCheckFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleCheck(Me);
 	}