X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=5e7b4847cf0ee7968b31cafb8a9e16964ee54556;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=c60ff0abed40273f6af15212cda710fe0668b2cb;hpb=c46c37300ad6b6e90dd2935f0fd6c94986aedea4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index c60ff0abe..5e7b4847c 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -22,9 +22,13 @@ using namespace std;
 #include "message.h"
 #include "commands.h"
 #include "inspircd.h"
+#include "helperfuncs.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
@@ -42,6 +46,10 @@ class cmd_check : public command_t
 		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]));
@@ -62,7 +70,7 @@ class cmd_check : public command_t
 			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->modes);
+			Srv->SendTo(NULL, user, checkstr + " modes +" + targuser->FormatModes());
 			Srv->SendTo(NULL, user, checkstr + " server " + targuser->server);
 			if (targuser->awaymsg[0] != 0)
 			{
@@ -88,10 +96,96 @@ class cmd_check : public command_t
 		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);
+			Srv->SendTo(NULL, user, 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);
+				mytime = gmtime(&topic_time);
+				strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime);
+				Srv->SendTo(NULL, user, checkstr + " topic_setat " + timebuf);
+			}
+
+			Srv->SendTo(NULL, user, checkstr + " modes " + chanmodes(targchan, true));
+			Srv->SendTo(NULL, user, 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 = cflags(i->second, targchan);
+				/*
+				 * 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));
+				
+				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);
+				
+				Srv->SendTo(NULL, user, 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 = clientlist.begin(); a != clientlist.end(); a++)
+				{
+					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());
+					}
+				}
+			}
+			else
+			{
+				/* IP address */
+				for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++)
+				{
+					if (addr.sin_addr.s_addr == a->second->ip4.s_addr)
+					{
+						/* same IP. */
+						Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+					}
+				}
+			}
+
+			Srv->SendTo(NULL, user, checkstr + " matches " + ConvToStr(x));
 		}
 
 		Srv->SendTo(NULL, user, checkstr + " END " + std::string(parameters[0]));