X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=643af8e15d0d955713d2444acda716fe1944e554;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=92b6d64f010f73f14afdea708639f1113572eacb;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 92b6d64f0..643af8e15 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -2,45 +2,35 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - +#include "inspircd.h" #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 */ -extern user_hash clientlist; -extern bool match(const char *, const char *); - -static Server *Srv; - +/** Handle /CHECK + */ 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 = "|||"; } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { userrec *targuser; chanrec *targchan; @@ -53,8 +43,8 @@ class cmd_check : public command_t 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: @@ -72,27 +62,31 @@ 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) + + if (IS_AWAY(targuser)) { /* user is away */ 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)); } + if (IS_LOCAL(targuser)) { /* port information is only held for a local user! */ user->WriteServ(checkstr + " onport " + ConvToStr(targuser->GetPort())); } - chliststr = chlist(targuser, targuser); + chliststr = targuser->ChannelList(targuser); std::stringstream dump(chliststr); - Srv->DumpText(user,checkstr + " onchans ", dump); + ServerInstance->DumpText(user,checkstr + " onchans ", dump); } else if (targchan) { @@ -114,7 +108,7 @@ class cmd_check : public command_t user->WriteServ(checkstr + " topic_setat " + timebuf); } - user->WriteServ(checkstr + " modes " + chanmodes(targchan, true)); + user->WriteServ(checkstr + " modes " + targchan->ChanModes(true)); user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); /* now the ugly bit, spool current members of a channel. :| */ @@ -124,35 +118,12 @@ class cmd_check : public command_t /* 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 + * 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); + snprintf(tmpbuf, MAXBUF, "%lu %s%s (%s@%s) %s ", i->first->GlobalCloneCount(), targchan->GetAllPrefixChars(i->first), i->first->nick, i->first->ident, i->first->dhost, i->first->fullname); + user->WriteServ(checkstr + " member " + tmpbuf); } } else @@ -161,7 +132,7 @@ class cmd_check : public command_t long x = 0; /* hostname or other */ - for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++) + 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])) { @@ -169,7 +140,7 @@ class cmd_check : public command_t user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } /* IP address */ - else if (match(a->second->GetIPString(), parameters[0])) + else if (match(a->second->GetIPString(), parameters[0], true)) { /* same IP. */ user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); @@ -180,6 +151,8 @@ class cmd_check : public command_t } user->WriteServ(checkstr + " END " + std::string(parameters[0])); + + return CMD_LOCALONLY; } }; @@ -189,11 +162,11 @@ class ModuleCheck : public Module private: cmd_check *mycommand; public: - ModuleCheck(Server* Me) : Module::Module(Me) + ModuleCheck(InspIRCd* Me) : Module(Me) { - Srv = Me; - mycommand = new cmd_check(); - Srv->AddCommand(mycommand); + + mycommand = new cmd_check(ServerInstance); + ServerInstance->AddCommand(mycommand); } virtual ~ModuleCheck() @@ -202,7 +175,7 @@ class ModuleCheck : public Module virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_VENDOR); + return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); } void Implements(char* List) @@ -212,28 +185,4 @@ class ModuleCheck : public Module }; - - -class ModuleCheckFactory : public ModuleFactory -{ - public: - ModuleCheckFactory() - { - } - - ~ModuleCheckFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleCheck(Me); - } - -}; - -extern "C" void * init_module( void ) -{ - return new ModuleCheckFactory; -} - +MODULE_INIT(ModuleCheck)