X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=b8dc89f7cff2560c0243035fa80b7a548f218192;hb=66098d307c036997e51eaea21724615e27fdc3e9;hp=aaaf10930f44844e95106eae38b9fdffc32c4b25;hpb=033640feb2f01c6d6d704b01bbafa1a98d6c2d61;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index aaaf10930..b8dc89f7c 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,32 +19,39 @@ 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 */
 
-static Server *Srv;
+extern InspIRCd* ServerInstance;
 
 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 (char **parameters, int pcnt, userrec *user)
+	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		userrec *targuser;
 		chanrec *targchan;
 		std::string checkstr;
 		std::string chliststr;
 
+		char timebuf[60];
+		struct tm *mytime;
+
+
 		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:
@@ -53,47 +60,123 @@ class cmd_check : public command_t
 		 *  :server.name 304 target :CHECK END
 		 */
 
-		Srv->SendTo(NULL, user, checkstr + " START " + std::string(parameters[0]));
+		user->WriteServ(checkstr + " START " + parameters[0]);
 
 		if (targuser)
 		{
 			/* /check on a user */
-			Srv->SendTo(NULL, user, checkstr + " nuh " + std::string(targuser->GetFullHost()));
-			Srv->SendTo(NULL, user, checkstr + " realnuh " + std::string(targuser->GetFullRealHost()));
-			Srv->SendTo(NULL, user, checkstr + " realname " + std::string(targuser->fullname));
-			Srv->SendTo(NULL, user, checkstr + " modes +" + std::string(targuser->modes));
-			Srv->SendTo(NULL, user, checkstr + " server " + std::string(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 " + std::string(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 " + std::string(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);
-			/* XXX - This doent suck so much */
-			Srv->DumpText(user,checkstr + " onchans ", dump);
+
+			ServerInstance->DumpText(user,checkstr + " onchans ", dump);
 		}
 		else if (targchan)
 		{
 			/* /check on a channel */
+			time_t creation_time = targchan->created;
+			time_t topic_time = targchan->topicset;
+
+			mytime = gmtime(&creation_time);
+			strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
+			user->WriteServ(checkstr + " created " + timebuf);
+
+			if (targchan->topic[0] != 0)
+			{
+				/* there is a topic, assume topic related information exists */
+				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);
+				user->WriteServ(checkstr + " topic_setat " + timebuf);
+			}
+
+			user->WriteServ(checkstr + " modes " + targchan->ChanModes(true));
+			user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
+			
+			/* now the ugly bit, spool current members of a channel. :| */
+
+			CUList *ulist= targchan->GetUsers();
+
+			/* 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
+				 */
+				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);
+			}
 		}
 		else
 		{
 			/*  /check on an IP address, or something that doesn't exist */
+			long x = 0;
+
+			/* hostname or other */
+			for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
+			{
+				if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
+				{
+					/* host or vhost matches mask */
+					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+				}
+				/* IP address */
+				else if (match(a->second->GetIPString(), parameters[0]))
+				{
+					/* same IP. */
+					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+				}
+			}
+
+			user->WriteServ(checkstr + " matches " + ConvToStr(x));
 		}
 
-		Srv->SendTo(NULL, user, checkstr + " END " + std::string(parameters[0]));
+		user->WriteServ(checkstr + " END " + std::string(parameters[0]));
 	}
 };
 
@@ -103,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()
@@ -139,7 +222,7 @@ class ModuleCheckFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleCheck(Me);
 	}