X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=54abe0940557617cedd728776b3a698a34b831ac;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=4dd0f8a62517532b122f1f016501ceb445f4e17c;hpb=dc8f5d02f77aeabefaefe88005b99c8b47030ab7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 4dd0f8a62..54abe0940 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,22 +19,19 @@ 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 user_hash clientlist;
-extern bool match(const char *, const char *);
 
-static Server *Srv;
 
 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>";
@@ -53,8 +50,8 @@ class cmd_check : public command_t
 
 		checkstr = "304 " + std::string(user->nick) + " :CHECK";
 
-		targuser = Srv->FindNick(std::string(parameters[0]));
-		targchan = Srv->FindChannel(std::string(parameters[0]));
+		targuser = ServerInstance->FindNick(parameters[0]);
+		targchan = ServerInstance->FindChan(parameters[0]);
 
 		/*
 		 * Syntax of a /check reply:
@@ -63,36 +60,36 @@ class cmd_check : public command_t
 		 *  :server.name 304 target :CHECK END
 		 */
 
-		Srv->SendTo(NULL, user, checkstr + " START " + parameters[0]);
+		user->WriteServ(checkstr + " START " + parameters[0]);
 
 		if (targuser)
 		{
 			/* /check on a user */
-			Srv->SendTo(NULL, user, checkstr + " nuh " + targuser->GetFullHost());
-			Srv->SendTo(NULL, user, checkstr + " realnuh " + targuser->GetFullRealHost());
-			Srv->SendTo(NULL, user, checkstr + " realname " + targuser->fullname);
-			Srv->SendTo(NULL, user, checkstr + " modes +" + targuser->FormatModes());
-			Srv->SendTo(NULL, user, checkstr + " server " + targuser->server);
+			user->WriteServ(checkstr + " nuh " + targuser->GetFullHost());
+			user->WriteServ(checkstr + " realnuh " + targuser->GetFullRealHost());
+			user->WriteServ(checkstr + " realname " + targuser->fullname);
+			user->WriteServ(checkstr + " modes +" + targuser->FormatModes());
+			user->WriteServ(checkstr + " server " + targuser->server);
 			if (targuser->awaymsg[0] != 0)
 			{
 				/* user is away */
-				Srv->SendTo(NULL, user, checkstr + " awaymsg " + targuser->awaymsg);
+				user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg);
 			}
 			if (targuser->oper[0] != 0)
 			{
 				/* user is an oper of type ____ */
-				Srv->SendTo(NULL, user, checkstr + " opertype " + targuser->oper);
+				user->WriteServ(checkstr + " opertype " + targuser->oper);
 			}
 			if (IS_LOCAL(targuser))
 			{
 				/* port information is only held for a local user! */
-				Srv->SendTo(NULL, user, checkstr + " onport " + ConvToStr(targuser->port));
+				user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort()));
 			}
 
-			chliststr = chlist(targuser, targuser);
+			chliststr = targuser->ChannelList(targuser);
 			std::stringstream dump(chliststr);
 
-			Srv->DumpText(user,checkstr + " onchans ", dump);
+			ServerInstance->DumpText(user,checkstr + " onchans ", dump);
 		}
 		else if (targchan)
 		{
@@ -102,20 +99,20 @@ class cmd_check : public command_t
 
 			mytime = gmtime(&creation_time);
 			strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
-			Srv->SendTo(NULL, user, checkstr + " created " + timebuf);
+			user->WriteServ(checkstr + " created " + timebuf);
 
 			if (targchan->topic[0] != 0)
 			{
 				/* there is a topic, assume topic related information exists */
-				Srv->SendTo(NULL, user, checkstr + " topic " + targchan->topic);
-				Srv->SendTo(NULL, user, checkstr + " topic_setby " + targchan->setby);
+				user->WriteServ(checkstr + " topic " + targchan->topic);
+				user->WriteServ(checkstr + " topic_setby " + targchan->setby);
 				mytime = gmtime(&topic_time);
 				strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
-				Srv->SendTo(NULL, user, checkstr + " topic_setat " + timebuf);
+				user->WriteServ(checkstr + " topic_setat " + timebuf);
 			}
 
-			Srv->SendTo(NULL, user, checkstr + " modes " + chanmodes(targchan, true));
-			Srv->SendTo(NULL, user, checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
+			user->WriteServ(checkstr + " modes " + targchan->ChanModes(true));
+			user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
 			
 			/* now the ugly bit, spool current members of a channel. :| */
 
@@ -127,12 +124,12 @@ class cmd_check : public command_t
 				char list[MAXBUF];
 				char tmpbuf[MAXBUF];
 				char* ptr = list;
-				int flags = cflags(i->second, targchan);
+				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
 				 */
-				sprintf(ptr, "%lu    ", FindMatchingGlobal(i->second));
+				sprintf(ptr, "%lu    ", i->second->GlobalCloneCount());
 				
 				if (flags & UCMODE_OP)
 				{
@@ -152,44 +149,34 @@ class cmd_check : public command_t
 				sprintf(tmpbuf, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname);
 				strcat(ptr, tmpbuf);
 				
-				Srv->SendTo(NULL, user, checkstr + " member " + ptr);
+				user->WriteServ(checkstr + " member " + ptr);
 			}
 		}
 		else
 		{
 			/*  /check on an IP address, or something that doesn't exist */
-			struct sockaddr_in addr;
 			long x = 0;
 
-			if (inet_aton(parameters[0], &addr.sin_addr) == 0)
+			/* hostname or other */
+			for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
 			{
-				/* hostname or other */
-				for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++)
+				if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
 				{
-					if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
-					{
-						/* host or vhost matches mask */
-						Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
-					}
+					/* host or vhost matches mask */
+					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
 				}
-			}
-			else
-			{
 				/* IP address */
-				for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++)
+				else if (match(a->second->GetIPString(), parameters[0]))
 				{
-					if (addr.sin_addr.s_addr == a->second->ip4.s_addr)
-					{
-						/* same IP. */
-						Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
-					}
+					/* same IP. */
+					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
 				}
 			}
 
-			Srv->SendTo(NULL, user, checkstr + " matches " + ConvToStr(x));
+			user->WriteServ(checkstr + " matches " + ConvToStr(x));
 		}
 
-		Srv->SendTo(NULL, user, checkstr + " END " + std::string(parameters[0]));
+		user->WriteServ(checkstr + " END " + std::string(parameters[0]));
 	}
 };
 
@@ -199,11 +186,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()
@@ -235,7 +222,7 @@ class ModuleCheckFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleCheck(Me);
 	}