X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=7caa6225dd909d565c9262d367e3fc6c45e2250b;hb=00fa6d592ed2640fcdf74444786de555c1c3da25;hp=ac9e8f2ac100a44dcb1522b9e0430e59998baaf4;hpb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index ac9e8f2ac..7caa6225d 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
@@ -61,6 +60,7 @@ class CommandCheck : public Command
 			user->WriteServ(checkstr + " modes +" + targuser->FormatModes());
 			user->WriteServ(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
 			user->WriteServ(checkstr + " server " + targuser->server);
+			user->WriteServ(checkstr + " uid " + targuser->uuid);
 
 			if (IS_AWAY(targuser))
 			{
@@ -88,12 +88,12 @@ class CommandCheck : public Command
 		else if (targchan)
 		{
 			/* /check on a channel */
-			time_t creation_time = targchan->created;
+			time_t creation_time = targchan->age;
 			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);
+			user->WriteServ(checkstr + " timestamp " + timebuf);
 
 			if (targchan->topic[0] != 0)
 			{
@@ -131,13 +131,13 @@ class CommandCheck : public Command
 			/* hostname or other */
 			for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
 			{
-				if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
+				if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
 				{
 					/* host or vhost matches mask */
 					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
 				}
 				/* IP address */
-				else if (match(a->second->GetIPString(), parameters[0], true))
+				else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
 				{
 					/* same IP. */
 					user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
@@ -173,7 +173,7 @@ class ModuleCheck : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}