X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=86b03552267be1bf27334bc6588d8b336cd55d18;hb=0036e3a70cabea02e9ec2103ed1dfdf5c799289f;hp=a7d2485eeb771702834493c95cadf732042348e2;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index a7d2485ee..86b035522 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. @@ -11,35 +11,35 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" -#include "wildcard.h" /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */ /** Handle /CHECK */ -class cmd_check : public command_t +class CommandCheck : public Command { public: - cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1) + CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", "o", 1) { this->source = "m_check.so"; syntax = "|||"; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + std::string timestring(time_t time) { - userrec *targuser; - chanrec *targchan; - std::string checkstr; - std::string chliststr; - char timebuf[60]; - struct tm *mytime; + 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 ¶meters, User *user) + { + User *targuser; + Channel *targchan; + std::string checkstr; + std::string chliststr; checkstr = "304 " + std::string(user->nick) + " :CHECK"; @@ -62,21 +62,34 @@ class cmd_check : public command_t user->WriteServ(checkstr + " realnuh " + targuser->GetFullRealHost()); user->WriteServ(checkstr + " realname " + targuser->fullname); user->WriteServ(checkstr + " modes +" + targuser->FormatModes()); + user->WriteServ(checkstr + " snomasks +" + targuser->FormatNoticeMasks()); user->WriteServ(checkstr + " server " + targuser->server); - if (targuser->awaymsg[0] != 0) + 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); } - if (targuser->oper[0] != 0) + + if (IS_OPER(targuser)) { /* user is an oper of type ____ */ - user->WriteServ(checkstr + " opertype " + targuser->oper); + 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); @@ -87,26 +100,19 @@ 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); - 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(); @@ -118,7 +124,7 @@ class cmd_check : public command_t /* * Unlike Asuka, I define a clone as coming from the same host. --w00t */ - snprintf(tmpbuf, MAXBUF, "%lu %s%s (%s@%s) %s ", i->second->GlobalCloneCount(), targchan->GetAllPrefixChars(i->second), i->second->nick, i->second->ident, i->second->dhost, i->second->fullname); + 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); } } @@ -128,15 +134,15 @@ class cmd_check : public command_t long x = 0; /* hostname or other */ - for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++) + 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])) + else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0])) { /* same IP. */ user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); @@ -146,9 +152,9 @@ class cmd_check : public command_t user->WriteServ(checkstr + " matches " + ConvToStr(x)); } - user->WriteServ(checkstr + " END " + std::string(parameters[0])); + user->WriteServ(checkstr + " END " + parameters[0]); - return CMD_SUCCESS; + return CMD_LOCALONLY; } }; @@ -156,53 +162,26 @@ class cmd_check : public command_t class ModuleCheck : public Module { private: - cmd_check *mycommand; + CommandCheck *mycommand; public: - ModuleCheck(InspIRCd* Me) : Module::Module(Me) + ModuleCheck(InspIRCd* Me) : Module(Me) { - - mycommand = new cmd_check(ServerInstance); + + mycommand = new CommandCheck(ServerInstance); ServerInstance->AddCommand(mycommand); + } - + virtual ~ModuleCheck() { } - - virtual Version GetVersion() - { - return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); - } - void Implements(char* List) + virtual Version GetVersion() { - /* we don't hook anything, nothing required */ + return Version("$Id$", VF_VENDOR, API_VERSION); } - -}; - -class ModuleCheckFactory : public ModuleFactory -{ - public: - ModuleCheckFactory() - { - } - - ~ModuleCheckFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleCheck(Me); - } - }; -extern "C" void * init_module( void ) -{ - return new ModuleCheckFactory; -} - +MODULE_INIT(ModuleCheck)