Fixes for config reader

[user/henk/code/inspircd.git] / src / modules / m_check.cpp

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 81354609f2c751a7a952d202c753a5e94dc6b27c..86b03552267be1bf27334bc6588d8b336cd55d18 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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 */
 
@@ -27,6 +26,14 @@ class CommandCheck : public Command
                syntax = "<nickname>|<ip>|<hostmask>|<channel>";
        }
 
+       std::string timestring(time_t time)
+       {
+               char timebuf[60];
+               struct tm *mytime = gmtime(&time);
+               strftime(timebuf, 59, "%Y-%m-%d %H:%M:%S UTC (%s)", mytime);
+               return std::string(timebuf);
+       }
+
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                User *targuser;
@@ -34,10 +41,6 @@ class CommandCheck : public Command
                std::string checkstr;
                std::string chliststr;
 
-               char timebuf[60];
-               struct tm *mytime;
-
-
                checkstr = "304 " + std::string(user->nick) + " :CHECK";
 
                targuser = ServerInstance->FindNick(parameters[0]);
@@ -61,10 +64,16 @@ 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);
+                       user->WriteServ(checkstr + " signon " + timestring(targuser->signon));
+                       user->WriteServ(checkstr + " nickts " + timestring(targuser->age));
+                       if (IS_LOCAL(targuser))
+                               user->WriteServ(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
 
                        if (IS_AWAY(targuser))
                        {
                                /* user is away */
+                               user->WriteServ(checkstr + " awaytime " + timestring(targuser->awaytime));
                                user->WriteServ(checkstr + " awaymsg " + targuser->awaymsg);
                        }
 
@@ -74,10 +83,13 @@ class CommandCheck : public Command
                                user->WriteServ(checkstr + " opertype " + irc::Spacify(targuser->oper.c_str()));
                        }
 
+                       user->WriteServ(checkstr + " onip " + targuser->GetIPString());
                        if (IS_LOCAL(targuser))
                        {
-                               /* port information is only held for a local user! */
                                user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort()));
+                               std::string classname = targuser->GetClass()->name;
+                               if (!classname.empty())
+                                       user->WriteServ(checkstr + " connectclass " + classname);
                        }
 
                        chliststr = targuser->ChannelList(targuser);
@@ -88,26 +100,19 @@ class CommandCheck : public Command
                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);
+                       user->WriteServ(checkstr + " timestamp " + timestring(targchan->age));
 
                        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 + " topic_setat " + timestring(targchan->topicset));
                        }
 
                        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();
@@ -119,7 +124,7 @@ class CommandCheck : public Command
                                /*
                                 * Unlike Asuka, I define a clone as coming from the same host. --w00t
                                 */
-                               snprintf(tmpbuf, MAXBUF, "%lu    %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
+                               snprintf(tmpbuf, MAXBUF, "%-3lu %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
                                user->WriteServ(checkstr + " member " + tmpbuf);
                        }
                }
@@ -131,13 +136,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());
@@ -161,22 +166,22 @@ class ModuleCheck : public Module
  public:
        ModuleCheck(InspIRCd* Me) : Module(Me)
        {
-               
+
                mycommand = new CommandCheck(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleCheck()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
-       
+
 };
 
 MODULE_INIT(ModuleCheck)